From c4863842c86d0daa578d2a616e1db8ee0a2d4852 Mon Sep 17 00:00:00 2001 From: Kosta Date: Mon, 5 Aug 2013 13:29:42 +0200 Subject: [PATCH] more approval tests script debugging --- .travis.yml | 3 +-- projects/CMake/CMakeLists.txt | 2 +- scripts/approvalTests.py | 7 +------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index ca651c50..cda2ad27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,5 +16,4 @@ install: script: - cd Build - - ./SelfTest - - ctest -VV + - ctest -V diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index c79059bf..39e3e4f1 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -33,4 +33,4 @@ add_executable(SelfTest ${SOURCES}) # configure unit tests via ctest enable_testing() -add_test(NAME SelfTest_run COMMAND python ${SCRIPTS_DIR}/approvalTests.py "${CATCH_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/SelfTest") +add_test(NAME SelfTest_run COMMAND python ${SCRIPTS_DIR}/approvalTests.py "${CMAKE_CURRENT_BINARY_DIR}/SelfTest") diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py index f4fa0164..0eda5933 100644 --- a/scripts/approvalTests.py +++ b/scripts/approvalTests.py @@ -15,12 +15,7 @@ baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedRe rawResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/_rawResults.tmp' ) filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/unapprovedResults.txt' ) -print "len(sys.argv) = " + str(len(sys.argv)) -print "sys.argv[0] = |" + sys.argv[0] + "|" -print "sys.argv[1] = |" + sys.argv[1] + "|" -print "sys.argv[2] = |" + sys.argv[2] + "|" - -if len(sys.argv) == 2: +if len(sys.argv) >= 2: cmdPath = sys.argv[1] else: cmdPath = os.path.join( catchPath, 'projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest' )