From 76ae11e09dec419fb20f7c1bb4778a612a2d5bce Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 25 Jul 2015 16:57:18 +0200 Subject: [PATCH] move the tesh.pl with its friend --- buildtools/Cmake/DefinePackages.cmake | 1 - buildtools/jenkins/build.sh | 2 +- tools/tesh/CMakeLists.txt | 3 ++- {buildtools/Cmake/Scripts => tools/tesh}/tesh.pl | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {buildtools/Cmake/Scripts => tools/tesh}/tesh.pl (100%) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 1053381469..dcb025e62e 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1216,7 +1216,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/my_valgrind.pl buildtools/Cmake/Scripts/postinstall.sh buildtools/Cmake/Scripts/preinstall.sh - buildtools/Cmake/Scripts/tesh.pl buildtools/Cmake/Scripts/update_tesh.pl buildtools/Cmake/UnitTesting.cmake buildtools/Cmake/src/internal_config.h.in diff --git a/buildtools/jenkins/build.sh b/buildtools/jenkins/build.sh index 7226a67a2f..7dbdcaea0f 100755 --- a/buildtools/jenkins/build.sh +++ b/buildtools/jenkins/build.sh @@ -70,7 +70,7 @@ cd `cat VERSION` TRES=0 -ctest -T test --no-compress-output || true +ctest -T test --output-on-failure --no-compress-output || true if [ -f Testing/TAG ] ; then xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml mv CTestResults.xml $WORKSPACE diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index a2096fc8e8..decd859b28 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) -configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" +configure_file("${CMAKE_HOME_DIRECTORY}/tools/tesh/tesh.pl" "${CMAKE_BINARY_DIR}/bin/tesh" @ONLY IMMEDIATE) file(COPY ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Diff.pm @@ -37,6 +37,7 @@ set(xml_files ) set(bin_files ${bin_files} + ${CMAKE_CURRENT_SOURCE_DIR}/tesh.pl ${CMAKE_CURRENT_SOURCE_DIR}/colorize.pl ${CMAKE_CURRENT_SOURCE_DIR}/generate_tesh PARENT_SCOPE diff --git a/buildtools/Cmake/Scripts/tesh.pl b/tools/tesh/tesh.pl similarity index 100% rename from buildtools/Cmake/Scripts/tesh.pl rename to tools/tesh/tesh.pl -- 2.20.1