From cc0d3d3f832cf643f55eb452df7b62c18a092731 Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Fri, 11 Oct 2013 22:57:23 +0200 Subject: Fixed plugin path when running tests --- contrib/ctest/common.ctest.inc | 8 ++++---- contrib/ctest/hosts/epikur.local.ctest | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc index 84544bb..39ffb30 100644 --- a/contrib/ctest/common.ctest.inc +++ b/contrib/ctest/common.ctest.inc @@ -46,14 +46,14 @@ 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}") +if ("$ENV{USCXML_PLUGIN_PATH}" STREQUAL "") + set(ENV{USCXML_PLUGIN_PATH} /tmp/build-uscxml-${CTEST_SUBMIT_TYPE}-${CTEST_SCRIPT_NAME}/lib) +endif() + set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 4194304) set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 4194304) diff --git a/contrib/ctest/hosts/epikur.local.ctest b/contrib/ctest/hosts/epikur.local.ctest index f7d728d..7b2a801 100644 --- a/contrib/ctest/hosts/epikur.local.ctest +++ b/contrib/ctest/hosts/epikur.local.ctest @@ -2,18 +2,18 @@ set(CTEST_CMAKE_GENERATOR "Unix Makefiles") set(CTEST_SITE "epikur.local") set(CTEST_BUILD_CONFIGURATION "Debug") -set(RETAIN_BUILD_DIR OFF) +set(RETAIN_BUILD_DIR ON) 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") - -set(RETAIN_BUILD_DIR OFF) -set(CTEST_BUILD_NAME "darwin-x86_64 llvm") -include("tests/xpath.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") +# +# set(RETAIN_BUILD_DIR OFF) +# set(CTEST_BUILD_NAME "darwin-x86_64 llvm") +# include("tests/xpath.ctest") +# include("common.ctest.inc") +# -- cgit v0.12