aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2011-09-08 22:00:30 +0000
committerGravatar gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2011-09-08 22:00:30 +0000
commite4c73da9b59d0b558d96c31968cd0787622c2ef6 (patch)
treeefd853a3828fec21a6313ad85aa82ab3301fb8c6
parent4d910f9dc6b4625506cacdb4e5aaf58a2e08011b (diff)
[Author: aharper]
Fix comparison for parallel tests and add logging so its clear which mode was selected. R=thomasvl APPROVED=thomasvl
-rwxr-xr-xUnitTesting/RunMacOSUnitTests.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/UnitTesting/RunMacOSUnitTests.sh b/UnitTesting/RunMacOSUnitTests.sh
index c5cafe4..14cb66c 100755
--- a/UnitTesting/RunMacOSUnitTests.sh
+++ b/UnitTesting/RunMacOSUnitTests.sh
@@ -81,12 +81,14 @@ GTMXcodeNote() {
# Helper that works like the linux flock util, so you can run something, but
# have only one run at a time.
MaybeFlock() {
- if [ $GTM_ONE_TEST_AT_A_TIME ]; then
+ if [ $GTM_ONE_TEST_AT_A_TIME -ne 0 ]; then
+ GTMXcodeNote ${LINENO} "Serializing test execution."
python -c "import fcntl, subprocess, sys
file = open('$TMPDIR/GTM_one_test_at_a_time', 'a')
fcntl.flock(file.fileno(), fcntl.LOCK_EX)
sys.exit(subprocess.call(sys.argv[1:]))" "${@}"
else
+ GTMXcodeNote ${LINENO} "Allowing parallel test execution."
"${@}"
fi
}