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/make_fixture_macros | |
| 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/make_fixture_macros')
| -rw-r--r-- | vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp b/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp index 3c2b9455fe8..5718592203a 100644 --- a/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp +++ b/vespalib/src/tests/make_fixture_macros/make_fixture_macros_test.cpp @@ -1,6 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/fastos/fastos.h> #include <vespa/vespalib/testkit/test_kit.h> +#include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/util/slaveproc.h> using namespace vespalib; @@ -15,7 +16,11 @@ bool runPrint(const char *cmd) { TEST("make fixture macros") { EXPECT_FALSE(runPrint("../../apps/make_fixture_macros/vespalib_make_fixture_macros_app")); EXPECT_TRUE(runPrint("../../apps/make_fixture_macros/vespalib_make_fixture_macros_app 9 > macros.tmp")); - EXPECT_TRUE(runPrint("diff -u ../../vespa/vespalib/testkit/generated_fixture_macros.h macros.tmp")); + + std::string diffCmd("diff -u "); + diffCmd += vespalib::TestApp::GetSourceDirectory(); + diffCmd += "../../vespa/vespalib/testkit/generated_fixture_macros.h macros.tmp"; + EXPECT_TRUE(runPrint(diffCmd.c_str())); } TEST_MAIN_WITH_PROCESS_PROXY() { TEST_RUN_ALL(); } |