summaryrefslogtreecommitdiffstats
path: root/tests/auto/runautotests.py
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@digia.com>2012-10-10 15:36:19 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-12 10:05:02 +0200
commitd9d910711d354c89aac7001711081b542d79da36 (patch)
tree6d84ddc5bf0e6f4c71b8dbae2851be8aa0e25000 /tests/auto/runautotests.py
parentc64d7ce2a27e449dd7d0095b62ecc4f9495604e3 (diff)
Enable the auto test script to run on OS X
Only a few test could be run on OS X because they were not stored in an application bundle. Now on OS X we check for the application bundle for a test in the runautotests.py script. Change-Id: If9e3f343f5005ecfe4a83d8282564d1309b4379e Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Jason Barron <jason.barron@digia.com>
Diffstat (limited to 'tests/auto/runautotests.py')
-rwxr-xr-xtests/auto/runautotests.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/runautotests.py b/tests/auto/runautotests.py
index fbb273a71..7aba65213 100755
--- a/tests/auto/runautotests.py
+++ b/tests/auto/runautotests.py
@@ -149,6 +149,11 @@ def runAllTests(test):
#Set path to this if on Windows
if(os.name=="nt"):
exePath = test+"\\"+filename+"\\debug\\tst_"+filename+".exe"
+ #Set path on OS X
+ if(sys.platform=="darwin"):
+ exePath = test +"/"+filename+"/tst_"+filename
+ if not (os.path.exists(exePath)):
+ exePath = test + "/"+filename+"/tst_"+filename+".app/Contents/MacOS/tst_"+filename
#Set path to this if on Unix
else:
exePath = test +"/"+filename+"/tst_"+filename