diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-11 20:39:01 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-10-11 20:39:01 (GMT) |
| commit | ff5f678aca1aa42d7971b9b5c537286714c805e3 (patch) | |
| tree | f9c2fd60561cb744c0924a85504ceb4dddbdadff /contrib | |
| parent | ef551cb937956e2c13570ab3f8f119c48fa5656e (diff) | |
| download | uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.zip uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.tar.gz uscxml-ff5f678aca1aa42d7971b9b5c537286714c805e3.tar.bz2 | |
Reactivated cotire and some bug-fixes
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ctest/common.ctest.inc | 4 | ||||
| -rw-r--r-- | contrib/ctest/hosts/epikur.local.ctest | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index beb8cf0..84544bb 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -46,6 +46,10 @@ if ("$ENV{USCXML_SOURCE_DIR}" STREQUAL "") message(FATAL_ERROR "ENV{USCXML_SOURCE_DIR} is emtpy") endif() +if ("$ENV{USCXML_PLUGIN_PATH}" STREQUAL "") + set(ENV{USCXML_PLUGIN_PATH} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +endif() + set(CTEST_SOURCE_DIRECTORY $ENV{USCXML_SOURCE_DIR}) set(CTEST_SUBMIT_TYPE $ENV{CTEST_SUBMIT_TYPE}) set(CTEST_BINARY_DIRECTORY "/tmp/build-uscxml-${CTEST_SUBMIT_TYPE}-${CTEST_SCRIPT_NAME}") diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest index 2eae8ce..f7d728d 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -4,6 +4,11 @@ set(CTEST_BUILD_CONFIGURATION "Debug") set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +include("tests/plugins.ctest") +include("common.ctest.inc") + +set(RETAIN_BUILD_DIR OFF) +set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/ecma.ctest") include("common.ctest.inc") @@ -11,3 +16,4 @@ set(RETAIN_BUILD_DIR OFF) set(CTEST_BUILD_NAME "darwin-x86_64 llvm") include("tests/xpath.ctest") include("common.ctest.inc") + |