From 02c97cd0f7c4d630f1a90f9f2626746e47a28c09 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 5 Feb 2017 15:45:26 +0100 Subject: Updated Catch to latest (nw) --- 3rdparty/catch/scripts/scriptCommon.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to '3rdparty/catch/scripts/scriptCommon.py') diff --git a/3rdparty/catch/scripts/scriptCommon.py b/3rdparty/catch/scripts/scriptCommon.py index 6ac381adcb6..9adadb6ddcf 100644 --- a/3rdparty/catch/scripts/scriptCommon.py +++ b/3rdparty/catch/scripts/scriptCommon.py @@ -2,8 +2,13 @@ import os import sys import subprocess + catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0]))) +def getBuildExecutable(): + dir = os.environ.get('CATCH_DEV_OUT_DIR', "cmake-build-debug/SelfTest") + return dir + def runAndCapture( args ): child = subprocess.Popen(" ".join( args ), shell=True, stdout=subprocess.PIPE) lines = [] @@ -18,4 +23,4 @@ def runAndCapture( args ): line = "" else: line = line + out - return lines \ No newline at end of file + return lines -- cgit v1.2.3-70-g09d2