summaryrefslogtreecommitdiff
path: root/slicer/test/preprocessor.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'slicer/test/preprocessor.cpp')
-rw-r--r--slicer/test/preprocessor.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/slicer/test/preprocessor.cpp b/slicer/test/preprocessor.cpp
index 3eb50f6..b715d50 100644
--- a/slicer/test/preprocessor.cpp
+++ b/slicer/test/preprocessor.cpp
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE( slicer_test_ice )
BOOST_TEST_CHECKPOINT("cpp: " << cpp);
fs::remove(cpp);
const std::string doslice = stringbf(
- "%s -I%s %s %s",
+ "%s -I%s --headerPrefix='\"\"' %s %s",
root.parent_path() / "tool" / bjamout / "slicer",
included,
slice, cpp);
@@ -78,11 +78,13 @@ BOOST_AUTO_TEST_CASE( slicer_test_ice )
const fs::path obj = fs::change_extension(tmp / base, ".o");
const std::string compile = stringbf(
- "g++ -Os -fPIC -c -std=c++1y -fvisibility=hidden -I tmp -I /usr/include/adhocutil -I /usr/include/Ice -I /usr/include/IceUtil -I %s -I %s -I %s -I %s %s -o %s",
+ "g++ -Os -fPIC -c -std=c++1y -fvisibility=hidden -I%s -I tmp -I /usr/include/adhocutil -I /usr/include/Ice -I /usr/include/IceUtil -I %s -I %s -I %s -I %s -I %s %s -o %s",
+ root.parent_path() / "slicer",
root / bjamout,
root,
included / bjamout,
- root / "..",
+ root.parent_path(),
+ root.parent_path() / "slicer" / bjamout,
cpp, obj);
BOOST_TEST_CHECKPOINT("compile: " << compile);
system(compile);