From 15603c617e9e8261c321a8af1a8bab7f471137b5 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 18 Aug 2015 11:56:56 -0400 Subject: [PATCH] jenkins: name command test results with `cmd` instead of `run` Signed-off-by: Jean Privat --- misc/jenkins/check_contrib.sh | 4 ++-- misc/jenkins/nitester-wrapper.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/jenkins/check_contrib.sh b/misc/jenkins/check_contrib.sh index d43f7f5..320dac8 100755 --- a/misc/jenkins/check_contrib.sh +++ b/misc/jenkins/check_contrib.sh @@ -25,11 +25,11 @@ for p in $projects; do dir=`dirname "$p"` name=`basename "$dir"` echo "*** make $dir ***" - if misc/jenkins/unitrun.sh "run-$name-make" make -C "$dir"; then + if misc/jenkins/unitrun.sh "cmd-$name-make" make -C "$dir"; then # Make OK, is there a `check` rule? make -C "$dir" check -n 2>/dev/null || continue echo "*** makecheck $dir ***" - if misc/jenkins/unitrun.sh "run-$name-makecheck" make -C "$dir" check; then + if misc/jenkins/unitrun.sh "cmd-$name-makecheck" make -C "$dir" check; then : else failed="$failed $name-check" diff --git a/misc/jenkins/nitester-wrapper.sh b/misc/jenkins/nitester-wrapper.sh index 902cd4a..70f086b 100755 --- a/misc/jenkins/nitester-wrapper.sh +++ b/misc/jenkins/nitester-wrapper.sh @@ -35,14 +35,14 @@ if ! git checkout $hash; then fi # Make basic bootstrap -$tools_dir/unitrun.sh "run-make-csrc" make -C c_src -$tools_dir/unitrun.sh "run-make-version" src/git-gen-version.sh -$tools_dir/unitrun.sh "run-make-nitc_0" c_src/nitc -o bin/nitc_0 src/nitc.nit -$tools_dir/unitrun.sh "run-make-nitc" bin/nitc_0 --dir bin/ src/nitc.nit -$tools_dir/unitrun.sh "run-make-nit-and-nitvm" bin/nitc --dir bin/ src/nit.nit src/nitvm.nit +$tools_dir/unitrun.sh "cmd-make-csrc" make -C c_src +$tools_dir/unitrun.sh "cmd-make-version" src/git-gen-version.sh +$tools_dir/unitrun.sh "cmd-make-nitc_0" c_src/nitc -o bin/nitc_0 src/nitc.nit +$tools_dir/unitrun.sh "cmd-make-nitc" bin/nitc_0 --dir bin/ src/nitc.nit +$tools_dir/unitrun.sh "cmd-make-nit-and-nitvm" bin/nitc --dir bin/ src/nit.nit src/nitvm.nit # Make nitester -$tools_dir/unitrun.sh "run-make-nitester" make -C contrib/nitester/ +$tools_dir/unitrun.sh "cmd-make-nitester" make -C contrib/nitester/ # Run tests cd tests -- 1.7.9.5