diff options
| author | Haavard <havardpe@yahoo-inc.com> | 2016-06-27 10:52:29 +0000 |
|---|---|---|
| committer | Haavard <havardpe@yahoo-inc.com> | 2016-06-27 10:52:29 +0000 |
| commit | 6d33da4d31e1c54353c3b286e8fda0ee7a8e8330 (patch) | |
| tree | cd6ffa7ef42e4f6f1dbb146f68a3f2742b313567 /vespalib | |
| parent | 86eb163482bea451125b759f2c604f342faaafb8 (diff) | |
update shell scripts
Diffstat (limited to 'vespalib')
| -rwxr-xr-x | vespalib/src/tests/testkit-subset/testkit-subset_test.sh | 6 | ||||
| -rwxr-xr-x | vespalib/src/tests/tutorial/make_example.sh | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vespalib/src/tests/testkit-subset/testkit-subset_test.sh b/vespalib/src/tests/testkit-subset/testkit-subset_test.sh index 8d6556f30a8..44c4f5251b4 100755 --- a/vespalib/src/tests/testkit-subset/testkit-subset_test.sh +++ b/vespalib/src/tests/testkit-subset/testkit-subset_test.sh @@ -1,7 +1,9 @@ #!/bin/bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/" + +set -e + TEST_SUBSET=pass $VALGRIND ./vespalib_testkit-subset_test_app 2> out.txt TEST_SUBSET="extra\.cpp:.*pass.*" $VALGRIND ./vespalib_testkit-subset_test_app 2>> out.txt -cat out.txt | grep "\.cpp: " | sed "s~$DIR~~g" > out.relpath.txt +cat out.txt | grep "\.cpp: " > out.relpath.txt cmp -s out.relpath.txt out.ref.2.txt && exit 0 diff -u out.relpath.txt out.ref.txt diff --git a/vespalib/src/tests/tutorial/make_example.sh b/vespalib/src/tests/tutorial/make_example.sh index b5919254bc9..6e7df5e2ac4 100755 --- a/vespalib/src/tests/tutorial/make_example.sh +++ b/vespalib/src/tests/tutorial/make_example.sh @@ -2,8 +2,6 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. dirname=`dirname $1` filename=`basename $1` -unset MAKELEVEL -unset MAKEFLAGS unset VALGRIND unset TEST_SUBSET @@ -13,7 +11,6 @@ echo "<pre class=\"prettyprint linenums\">" (cd $dirname && cat $filename) | ./vespalib_xml_escape_app echo "</pre>" echo "<pre class=\"output\">" -DIRNAME=`(cd $dirname && /bin/pwd)` -(cd $dirname && ./vespalib_${filename%.cpp}_app 2>&1) | perl -pe "s{$DIRNAME/}{}g" | ./vespalib_xml_escape_app +(cd $dirname && ./vespalib_${filename%.cpp}_app 2>&1) | ./vespalib_xml_escape_app echo "</pre>" echo "</div>" |