diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-03-02 15:36:53 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-03-02 16:08:54 +0100 |
| commit | 61f7dd7284e47981794e3a28ca821c3ca539704c (patch) | |
| tree | 4bac8c17be20a481352e3355d27404626000425d | |
| parent | 045de51888aa7b2f1da3c3221e0d6305b9da2f57 (diff) | |
tests: fix "tools/run-nm-test.sh" to build test first
./tools/run-nm-test.sh -m src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
makes the test before running it. However, that failed if the
test didn't exist already. Reorder the code so that we always
try to make the test before trying to run it.
| -rwxr-xr-x | tools/run-nm-test.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 7159ad8a1..b631c7642 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -138,6 +138,14 @@ else fi +if _is_true "$NMTST_MAKE_FIRST" 0; then + git_dir="$(readlink -f "$(git rev-parse --show-toplevel)")" + rel_path="$(realpath --relative-to="$git_dir" -m "$TEST" 2>/dev/null)" || die "cannot resolve test-name \"$TEST\". Did you call the script properly?" + cd "$git_dir" + make -j5 "$rel_path" || die "make of $TEST failed ($git_dir / $rel_path)" + cd - 1>/dev/null +fi + [ -x "$TEST" ] || die "Test \"$TEST\" does not exist" TEST_PATH="$(readlink -f "$(dirname "$TEST")")" TEST_NAME="${TEST##*/}" @@ -151,14 +159,6 @@ if [ -z "${NMTST_LAUNCH_DBUS}" ]; then fi fi -if _is_true "$NMTST_MAKE_FIRST" 0; then - git_dir="$(readlink -f "$(git rev-parse --show-toplevel)")" - rel_path="${TEST_PATH/#$(printf '%s/' "$git_dir")}/$TEST_NAME" - cd "$git_dir" - make -j5 "$rel_path" || die "make of $TEST failed ($git_dir / $rel_path)" - cd - 1>/dev/null -fi - # if the user wishes, change first into the directory of the test if _is_true "$NMTST_CHANGE_DIRECTORY" 0; then cd "$TEST_PATH" |