From 3eb082def5c70d6566eb32cc9eea66aaf4832407 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Tue, 8 Sep 2015 11:34:27 -0400
Subject: Minor update for Xcode 6 unittesting wrapper

---
 UnitTesting/RunMacOSUnitTests.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'UnitTesting')

diff --git a/UnitTesting/RunMacOSUnitTests.sh b/UnitTesting/RunMacOSUnitTests.sh
index 14cb66c..2f72a12 100755
--- a/UnitTesting/RunMacOSUnitTests.sh
+++ b/UnitTesting/RunMacOSUnitTests.sh
@@ -25,6 +25,9 @@ set -o nounset
 # Uncomment the next line to trace execution.
 #set -o verbose
 
+# Required to make Xcode 6 actually run tests.
+export TEST_AFTER_BUILD=YES
+
 # Controlling environment variables:
 #
 # GTM_DISABLE_ZOMBIES -
@@ -237,7 +240,7 @@ RunTests() {
   VALID_ARCHS="${LEAK_TEST_ARCHS}"
   GTMXcodeNote ${LINENO} "Leak checking enabled for $ARCHS. Ignoring leaks from $GTM_LEAKS_SYMBOLS_TO_IGNORE."
   SetMemoryVariables
-  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests"
+  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunTargetUnitTests"
 
   # Running leaks on architectures that don't support leaks.
   unset MallocStackLogging
@@ -245,7 +248,7 @@ RunTests() {
   ARCHS="${NO_LEAK_TEST_ARCHS}"
   VALID_ARCHS="${NO_LEAK_TEST_ARCHS}"
   GTMXcodeNote ${LINENO} "Leak checking disabled for $ARCHS due to no support for leaks on platform".
-  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests"
+  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunTargetUnitTests"
 }
 
 if [ ! $GTM_DO_NOT_REMOVE_GCOV_DATA ]; then
@@ -269,5 +272,5 @@ if [ $GTM_ENABLE_LEAKS -ne 0 ]; then
 else
   GTMXcodeNote ${LINENO} "Leak checking disabled."
   SetMemoryVariables
-  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests"
+  MaybeFlock "${SYSTEM_DEVELOPER_DIR}/Tools/RunTargetUnitTests"
 fi
-- 
cgit v1.2.3