From 357172f4409c74d7a2ac963290fc70c7ae10e3b1 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 20 Jul 2018 14:35:28 +0200 Subject: Switch to bash build2 module --- tests/manifest-parser/buildfile | 4 +++- tests/manifest-parser/driver | 31 ------------------------------- tests/manifest-parser/driver.in | 20 ++++++++++++++++++++ tests/manifest-parser/libbutl | 1 - 4 files changed, 23 insertions(+), 33 deletions(-) delete mode 100755 tests/manifest-parser/driver create mode 100644 tests/manifest-parser/driver.in delete mode 120000 tests/manifest-parser/libbutl (limited to 'tests/manifest-parser') diff --git a/tests/manifest-parser/buildfile b/tests/manifest-parser/buildfile index 1dfe0d3..c572f3a 100644 --- a/tests/manifest-parser/buildfile +++ b/tests/manifest-parser/buildfile @@ -2,4 +2,6 @@ # copyright : Copyright (c) 2014-2018 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -exe{driver}: testscript +import mods = libbutl.bash%bash{manifest-parser} + +exe{driver}: in{driver} $mods testscript diff --git a/tests/manifest-parser/driver b/tests/manifest-parser/driver deleted file mode 100755 index 4cbea3e..0000000 --- a/tests/manifest-parser/driver +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -function import () -{ - # Here we don't assume the errors are trapped. If all goes well, our exit - # code is that of source (which fails if the file is not found). - # - local e; if ! e="$(realpath ${BASH_SOURCE[0]})"; then return 1; fi - local d; if ! d="$(dirname "$e")"; then return 1; fi - source "$d/$1.bash" -} - -trap "{ exit 1; }" ERR -set -o errtrace # Trap ERR in functions. - -import libbutl/manifest-parser - -# @@ parse_manifest failure ignored -# -# @@ what would be equivalent serialization interface? Just serialize one -# name/value in manifest format (so explicit version). -# -while IFS=': ' read -r -d '' n v; do - if [ -z "$n" ]; then - echo "$v" - else - echo # Extra newline after first pair. - echo "$n" - echo "$v" - fi -done < <(parse_manifest) diff --git a/tests/manifest-parser/driver.in b/tests/manifest-parser/driver.in new file mode 100644 index 0000000..90dc0e3 --- /dev/null +++ b/tests/manifest-parser/driver.in @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# file : tests/manifest-parser/driver.in +# copyright : Copyright (c) 2014-2018 Code Synthesis Ltd +# license : MIT; see accompanying LICENSE file + +trap "{ exit 1; }" ERR +set -o errtrace # Trap ERR in functions. + +@import libbutl/manifest-parser@ + +while IFS=: read -r -d '' n v; do + if [ -z "$n" ]; then + echo "$v" + else + echo # Extra newline after first pair. + echo "$n" + echo "$v" + fi +done < <(butl_parse_manifest) diff --git a/tests/manifest-parser/libbutl b/tests/manifest-parser/libbutl deleted file mode 120000 index 6d1c4c0..0000000 --- a/tests/manifest-parser/libbutl +++ /dev/null @@ -1 +0,0 @@ -../../libbutl \ No newline at end of file -- cgit v1.1