diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-01-18 16:30:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-06-13 17:29:47 +0100 |
| commit | 88992f4def66b4ee7c20c56cdc03a80512fd7bef (patch) | |
| tree | 309b46dba22d1121a455d8e28bc3d9c1cae9b645 | |
| parent | Use slicer and metadata for performing merges (diff) | |
| download | p2pvr-88992f4def66b4ee7c20c56cdc03a80512fd7bef.tar.bz2 p2pvr-88992f4def66b4ee7c20c56cdc03a80512fd7bef.tar.xz p2pvr-88992f4def66b4ee7c20c56cdc03a80512fd7bef.zip | |
Move embedding test in with other tests
| -rw-r--r-- | p2pvr/daemon/Jamfile.jam | 10 | ||||
| -rw-r--r-- | p2pvr/daemon/unittests/Jamfile.jam | 9 | ||||
| -rw-r--r-- | p2pvr/daemon/unittests/dummySelect.sql (renamed from p2pvr/daemon/test/dummySelect.sql) | 0 | ||||
| -rw-r--r-- | p2pvr/daemon/unittests/testEmbedding.cpp (renamed from p2pvr/daemon/testEmbedding.cpp) | 0 |
4 files changed, 9 insertions, 10 deletions
diff --git a/p2pvr/daemon/Jamfile.jam b/p2pvr/daemon/Jamfile.jam index 5913af1..d5d5b1d 100644 --- a/p2pvr/daemon/Jamfile.jam +++ b/p2pvr/daemon/Jamfile.jam @@ -1,4 +1,3 @@ -import testing ; lib slicer : : <name>slicer : : <include>/usr/include/slicer ; cpp-pch pch : pch.hpp : @@ -29,14 +28,5 @@ lib p2pvrdaemon : <library>slicer ; -unit-test testEmbedding : - testEmbedding.cpp - test/dummySelect.sql - : - <define>BOOST_TEST_DYN_LINK - <library>..//boost_utf - <library>../lib//p2pvrlib - ; - build-project unittests ; diff --git a/p2pvr/daemon/unittests/Jamfile.jam b/p2pvr/daemon/unittests/Jamfile.jam index c9ebc5a..0bc5ce0 100644 --- a/p2pvr/daemon/unittests/Jamfile.jam +++ b/p2pvr/daemon/unittests/Jamfile.jam @@ -7,6 +7,15 @@ lib Ice ; path-constant me : . ; +unit-test testEmbedding : + testEmbedding.cpp + dummySelect.sql + : + <define>BOOST_TEST_DYN_LINK + <library>../..//boost_utf + <library>../../lib//p2pvrlib + ; + unit-test testp2ice : testp2ice.cpp : diff --git a/p2pvr/daemon/test/dummySelect.sql b/p2pvr/daemon/unittests/dummySelect.sql index 3f9397b..3f9397b 100644 --- a/p2pvr/daemon/test/dummySelect.sql +++ b/p2pvr/daemon/unittests/dummySelect.sql diff --git a/p2pvr/daemon/testEmbedding.cpp b/p2pvr/daemon/unittests/testEmbedding.cpp index b0e01f1..b0e01f1 100644 --- a/p2pvr/daemon/testEmbedding.cpp +++ b/p2pvr/daemon/unittests/testEmbedding.cpp |