diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2016-08-23 15:10:36 +0200 |
|---|---|---|
| committer | Vegard Sjonfjell <vegardsjo@gmail.com> | 2016-08-23 15:10:36 +0200 |
| commit | 55e5a91901109161186e05d3a6e959e06958bbba (patch) | |
| tree | f312bab2c60207ee305dbcfa047fcc4fa8fd2dc1 /vespalib/src/tests/testkit-subset | |
| parent | d337a29392fb752dc725e4aea5efa0cc0df5f17a (diff) | |
Aressem/cmake more out of source tests (#441)
* vespalib tests run out of source.
* staging_vespalib run tests out of source.
* fastos tests run out of source.
* Fixed storage tests out of source.
* Fixed some of the config tests.
* config* tests run out of source.
* document_* tests run out of source.
* documentapi_ tests run out of source.
* Fixed fsa out of source tests.
* Fix jrt_test out of source.
* More tests run out of source.
* Fix some slobrok and messagebus tests.
* More fixes for out of source tests.
* Done with first pass of regular tests out of source.
* Only use SOURCE_DIRECTORY in a limited set of places.
* Fix some remaining tests.
* Some cleanups.
* No need for extra slash.
Diffstat (limited to 'vespalib/src/tests/testkit-subset')
| -rw-r--r-- | vespalib/src/tests/testkit-subset/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | vespalib/src/tests/testkit-subset/testkit-subset_test.sh | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vespalib/src/tests/testkit-subset/CMakeLists.txt b/vespalib/src/tests/testkit-subset/CMakeLists.txt index cde1a0c5cc1..d6d278a6628 100644 --- a/vespalib/src/tests/testkit-subset/CMakeLists.txt +++ b/vespalib/src/tests/testkit-subset/CMakeLists.txt @@ -6,4 +6,4 @@ vespa_add_executable(vespalib_testkit-subset_test_app TEST DEPENDS vespalib ) -vespa_add_test(NAME vespalib_testkit-subset_test_app COMMAND sh testkit-subset_test.sh) +vespa_add_test(NAME vespalib_testkit-subset_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testkit-subset_test.sh) diff --git a/vespalib/src/tests/testkit-subset/testkit-subset_test.sh b/vespalib/src/tests/testkit-subset/testkit-subset_test.sh index 44c4f5251b4..12f5a9e63fc 100755 --- a/vespalib/src/tests/testkit-subset/testkit-subset_test.sh +++ b/vespalib/src/tests/testkit-subset/testkit-subset_test.sh @@ -1,9 +1,12 @@ #!/bin/bash - set -e +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + 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: " > out.relpath.txt -cmp -s out.relpath.txt out.ref.2.txt && exit 0 -diff -u out.relpath.txt out.ref.txt +cmp -s out.relpath.txt $SOURCE_DIRECTORY/out.ref.2.txt && exit 0 +diff -u out.relpath.txt $SOURCE_DIRECTORY/out.ref.txt |