diff options
author | Håvard Pettersen <havardpe@oath.com> | 2017-10-04 09:52:51 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2017-10-04 09:52:51 +0000 |
commit | 93e84ebb1fde1f6b5776dfe1a40df6f67cbf111b (patch) | |
tree | 25e73a146302794f6cd1a87daa21f6b43ce59b53 /eval/src/tests | |
parent | 38e1daf1c98882a1f75a345bcf5eca84c222fa89 (diff) |
avoid using source tree location to locate binaries
Diffstat (limited to 'eval/src/tests')
-rw-r--r-- | eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp index ad21a50cf1d..ec9fc396f0c 100644 --- a/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp +++ b/eval/src/tests/tensor/tensor_conformance/tensor_conformance_test.cpp @@ -10,34 +10,34 @@ using vespalib::eval::test::TensorConformance; using vespalib::tensor::DefaultTensorEngine; using vespalib::make_string; -vespalib::string module_path(TEST_PATH("../../../../")); - +vespalib::string module_src_path(TEST_PATH("../../../../")); +vespalib::string module_build_path("../../../../"); TEST("require that reference tensor implementation passes all conformance tests") { - TEST_DO(TensorConformance::run_tests(module_path, SimpleTensorEngine::ref())); + TEST_DO(TensorConformance::run_tests(module_src_path, SimpleTensorEngine::ref())); } TEST("require that production tensor implementation passes all conformance tests") { - TEST_DO(TensorConformance::run_tests(module_path, DefaultTensorEngine::ref())); + TEST_DO(TensorConformance::run_tests(module_src_path, DefaultTensorEngine::ref())); } TEST("require that tensor serialization test spec can be generated") { - vespalib::string spec = module_path + "src/apps/make_tensor_binary_format_test_spec/test_spec.json"; - vespalib::string binary = module_path + "src/apps/make_tensor_binary_format_test_spec/eval_make_tensor_binary_format_test_spec_app"; + vespalib::string spec = module_src_path + "src/apps/make_tensor_binary_format_test_spec/test_spec.json"; + vespalib::string binary = module_build_path + "src/apps/make_tensor_binary_format_test_spec/eval_make_tensor_binary_format_test_spec_app"; EXPECT_EQUAL(system(make_string("%s > binary_test_spec.json", binary.c_str()).c_str()), 0); EXPECT_EQUAL(system(make_string("diff -u %s binary_test_spec.json", spec.c_str()).c_str()), 0); } TEST("require that cross-language tensor conformance test spec can be generated") { - vespalib::string spec = module_path + "src/apps/tensor_conformance/test_spec.json"; - vespalib::string binary = module_path + "src/apps/tensor_conformance/vespa-tensor-conformance"; + vespalib::string spec = module_src_path + "src/apps/tensor_conformance/test_spec.json"; + vespalib::string binary = module_build_path + "src/apps/tensor_conformance/vespa-tensor-conformance"; EXPECT_EQUAL(system(make_string("%s generate > conformance_test_spec.json", binary.c_str()).c_str()), 0); EXPECT_EQUAL(system(make_string("diff -u %s conformance_test_spec.json", spec.c_str()).c_str()), 0); } TEST("require that cross-language tensor conformance tests pass with production C++ expression evaluation") { - vespalib::string spec = module_path + "src/apps/tensor_conformance/test_spec.json"; - vespalib::string binary = module_path + "src/apps/tensor_conformance/vespa-tensor-conformance"; + vespalib::string spec = module_src_path + "src/apps/tensor_conformance/test_spec.json"; + vespalib::string binary = module_build_path + "src/apps/tensor_conformance/vespa-tensor-conformance"; EXPECT_EQUAL(system(make_string("cat %s | %s evaluate | %s verify", spec.c_str(), binary.c_str(), binary.c_str()).c_str()), 0); } |