[test-suite] r181499 - Fix use of EXECUTION_ENVIRONMENT_OVERRIDES.

[Daniel Dunbar]

Author: ddunbar
Date: Wed May  8 20:15:27 2013
New Revision: 181499

URL: http://llvm.org/viewvc/llvm-project?rev=181499&view=rev
Log:
Fix use of EXECUTION_ENVIRONMENT_OVERRIDES.

Modified:
    test-suite/trunk/Makefile.programs

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=181499&r1=181498&r2=181499&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Wed May  8 20:15:27 2013
@@ -112,6 +112,13 @@ endif
 
 ifdef RUNUNDER
 RUNSAFELY := $(RUNSAFELY) -u $(RUNUNDER)
+ifdef EXECUTION_ENVIRONMENT_OVERRIDES
+$(error "cannot use both RUNUNDER and EXECUTION_ENVIRONMENT_OVERRIDES")
+endif
+else
+ifdef EXECUTION_ENVIRONMENT_OVERRIDES
+RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)'
+endif
 endif
 
 RUNSAFELY := $(RUNSAFELY) -t "$(TIMEIT_TARGET)"
@@ -124,10 +131,6 @@ endif
 RUNSAFELY := $(RUNSAFELY) $(RUNTIMELIMIT)
 RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) $(RUNTIMELIMIT)
 
-ifdef EXECUTION_ENVIRONMENT_OVERRIDES
-RUNSAFELY := $(RUNSAFELY) -u 'env $(EXECUTION_ENVIRONMENT_OVERRIDES)' $(RUNSAFELY)
-endif
-
 ifndef STDIN_FILENAME
 STDIN_FILENAME := /dev/null
 endif