diff options
| author |  Jeremie Guichard <djebrest@gmail.com> | 2017-02-24 13:52:07 +0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-24 01:10:22 -0800 |
| commit | 1e2580c3fd73d5b1ca06ecc870f38c43dfc4abe8 (patch) | |
| tree | 393fe706bb12c962915726ee624fdf1718e48789 /tests/testmerge.cpp | |
| parent | 5b8bde8e1e97ea597c28e52e88fbc9475e6ea294 (diff) | |
| download | subsurface-1e2580c3fd73d5b1ca06ecc870f38c43dfc4abe8.tar.gz | |
Use SUBSURFACE_TEST_DATA definition to point to test data dir
Update tests with a (compile time) option SUBSURFACE_TEST_DATA,
pointing to test data base path. It is needed for cross compilation cases.
SUBSURFACE_TEST_DATA is set to SUBSURFACE_SOURCE by default,
or configurable via cmake option -DSUBSURFACE_TEST_DATA="...".
Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
Diffstat (limited to 'tests/testmerge.cpp')
| -rw-r--r-- | tests/testmerge.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/testmerge.cpp b/tests/testmerge.cpp index 05c88a88e..6661880d1 100644 --- a/tests/testmerge.cpp +++ b/tests/testmerge.cpp @@ -15,12 +15,12 @@ void TestMerge::testMergeEmpty() /* * check that we correctly merge mixed cylinder dives */ - QCOMPARE(parse_file(SUBSURFACE_SOURCE "/dives/test47.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml"), 0); process_dives(true, false); - QCOMPARE(parse_file(SUBSURFACE_SOURCE "/dives/test48.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml"), 0); process_dives(true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); - QFile org(SUBSURFACE_SOURCE "/dives/test47+48.xml"); + QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); QFile out("./testmerge47+48.ssrf"); out.open(QFile::ReadOnly); @@ -39,12 +39,12 @@ void TestMerge::testMergeBackwards() /* * check that we correctly merge mixed cylinder dives */ - QCOMPARE(parse_file(SUBSURFACE_SOURCE "/dives/test48.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test48.xml"), 0); process_dives(true, false); - QCOMPARE(parse_file(SUBSURFACE_SOURCE "/dives/test47.xml"), 0); + QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test47.xml"), 0); process_dives(true, false); QCOMPARE(save_dives("./testmerge47+48.ssrf"), 0); - QFile org(SUBSURFACE_SOURCE "/dives/test47+48.xml"); + QFile org(SUBSURFACE_TEST_DATA "/dives/test47+48.xml"); org.open(QFile::ReadOnly); QFile out("./testmerge47+48.ssrf"); out.open(QFile::ReadOnly); |