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 /lowercasing_test | |
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 'lowercasing_test')
4 files changed, 22 insertions, 9 deletions
diff --git a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt index cfcc932a35a..fcef0151729 100644 --- a/lowercasing_test/src/tests/lowercasing/CMakeLists.txt +++ b/lowercasing_test/src/tests/lowercasing/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(lowercasing_test_casingvariants_fastlib_app TEST casingvariants_fastlib.cpp DEPENDS ) -vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND sh lowercasing_test.sh) +vespa_add_test(NAME lowercasing_test_lowrcasing NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lowercasing_test.sh) vespa_add_executable(lowercasing_test_casingvariants_vespalib_app TEST SOURCES casingvariants_vespalib.cpp diff --git a/lowercasing_test/src/tests/lowercasing/CasingVariants.java b/lowercasing_test/src/tests/lowercasing/CasingVariants.java index aa1bf8fcf4d..7c8fd314ce9 100644 --- a/lowercasing_test/src/tests/lowercasing/CasingVariants.java +++ b/lowercasing_test/src/tests/lowercasing/CasingVariants.java @@ -17,7 +17,11 @@ public class CasingVariants { int read = 0; char[] buffer = new char[5000]; String raw; - File f = new File("./letters"); + String srcDir = System.getenv("SOURCE_DIRECTORY"); + if (srcDir == null) { + srcDir = "."; + } + File f = new File(srcDir + "/letters"); StringBuilder s = new StringBuilder(); InputStream in = new FileInputStream(f); diff --git a/lowercasing_test/src/tests/lowercasing/dotest.sh b/lowercasing_test/src/tests/lowercasing/dotest.sh index 943f35cee67..189bf939ff6 100755 --- a/lowercasing_test/src/tests/lowercasing/dotest.sh +++ b/lowercasing_test/src/tests/lowercasing/dotest.sh @@ -2,25 +2,29 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. set -e +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + . ../../binref/env.sh ver="java8u20" $BINREF/runjava CasingVariants > out.txt -./lowercasing_test_casingvariants_fastlib_app ./letters ref.txt.$ver > out.fastlib.txt -./lowercasing_test_casingvariants_vespalib_app ./letters ref.txt.$ver > out.vespalib.txt +./lowercasing_test_casingvariants_fastlib_app $SOURCE_DIRECTORY/letters $SOURCE_DIRECTORY/ref.txt.$ver > out.fastlib.txt +./lowercasing_test_casingvariants_vespalib_app $SOURCE_DIRECTORY/letters $SOURCE_DIRECTORY/ref.txt.$ver > out.vespalib.txt echo "Verify Java" -if ! diff -u out.txt ref.txt.$ver; then +if ! diff -u out.txt $SOURCE_DIRECTORY/ref.txt.$ver; then exit 1 fi echo "Verify fastlib" -if ! diff -u out.fastlib.txt ref.fastlib.txt.$ver; then +if ! diff -u out.fastlib.txt $SOURCE_DIRECTORY/ref.fastlib.txt.$ver; then exit 1 fi echo "Verify vespalib" -if ! diff -u out.vespalib.txt ref.vespalib.txt.$ver; then +if ! diff -u out.vespalib.txt $SOURCE_DIRECTORY/ref.vespalib.txt.$ver; then exit 1 fi diff --git a/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh b/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh index 4985f6f86f7..d14b867f3db 100755 --- a/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh +++ b/lowercasing_test/src/tests/lowercasing/lowercasing_test.sh @@ -1,6 +1,11 @@ #!/bin/bash set -e + +if [ -z "$SOURCE_DIRECTORY" ]; then + SOURCE_DIRECTORY="." +fi + . ../../binref/env.sh -$BINREF/compilejava CasingVariants.java -bash -e dotest.sh +$BINREF/compilejava -d . $SOURCE_DIRECTORY/CasingVariants.java +bash -e $SOURCE_DIRECTORY/dotest.sh |