--- dyld/dyld-360.21/unit-tests/test-cases/restrict-executable_path/Makefile
+++ dyld/dyld-132.13/unit-tests/test-cases/restrict-executable_path/Makefile
@@ -20,17 +20,11 @@
 # 
 # @APPLE_LICENSE_HEADER_END@
 ##
-PWD = $(shell pwd)
-TESTROOT = $(PWD)/../..
+TESTROOT = ../..
 include ${TESTROOT}/include/common.makefile
 
 SHELL = bash # use bash shell so we can redirect just stderr
 
-ifeq "$(OS_NAME)" "iPhoneOS"
-	RUN_AS_USER = login -f -l mobile
-else
-	RUN_AS_USER = 
-endif
 
 #
 # Use of @exectuable_path in restricted binaries is not allowed
@@ -41,9 +35,10 @@
 all-check: all check
 
 check:
-	${RUN_AS_USER} ${PASS_IFF_FAILURE} "setuid-executable_path @executable_path" "setuid-executable_path @executable_path" $(PWD)/main_exe
-	${RUN_AS_USER} ${PASS_IFF_FAILURE} "setuid-executable_path @loader_path" "setuid-executable_path @loader_path" $(PWD)/main_loader
-	${RUN_AS_USER} ${PASS_IFF_FAILURE} "setuid-executable_path relative path" "setuid-executable_path relative path" $(PWD)/main_rel
+	${TESTROOT}/bin/exit-non-zero-pass.pl "restrict-executable_path @executable_path" "restrict-executable_path @executable_path" ./main_exe "restrict-executable_path"
+	${TESTROOT}/bin/exit-non-zero-pass.pl "restrict-executable_path @loader_path" "restrict-executable_path @loader_path" ./main_loader "restrict-executable_path"
+	${TESTROOT}/bin/exit-non-zero-pass.pl "restrict-executable_path relative path" "restrict-executable_path relative path" ./main_rel "restrict-executable_path"
+
 
 
 all: main_exe  main_loader main_rel