From a16a8a852077b0c471cf12ef75dc5e8a41333533 Mon Sep 17 00:00:00 2001
From: Russ Keldorph <russ.keldorph@microsoft.com>
Date: Mon, 22 May 2017 11:24:09 -0700
Subject: Revert "Fixed tests build on Linux"

---
 tests/src/CLRTest.Execute.Bash.targets | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tests/src/CLRTest.Execute.Bash.targets')

diff --git a/tests/src/CLRTest.Execute.Bash.targets b/tests/src/CLRTest.Execute.Bash.targets
index 34965a4efc..f95408f512 100644
--- a/tests/src/CLRTest.Execute.Bash.targets
+++ b/tests/src/CLRTest.Execute.Bash.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 ***********************************************************************************************
 CLRTest.Execute.Bash.targets
@@ -84,7 +83,7 @@ fi
       ]]></BashCLRTestEnvironmentCompatibilityCheck>
       <BashCLRTestEnvironmentCompatibilityCheck Condition="'$(JitOptimizationSensitive)' == 'true'"><![CDATA[
 $(BashCLRTestEnvironmentCompatibilityCheck)
-if [[ ( ! -z "$COMPlus_JitStress" ) || ( ! -z "$COMPlus_JitStressRegs" ) || ( ! -z "$COMPlus_JITMinOpts" ) || ( ! -z "$COMPlus_TailcallStress" ) ]]
+if [ \( ! -z "$COMPlus_JitStress" \) -o \( ! -z "$COMPlus_JitStressRegs" \) -o \( ! -z "$COMPlus_JITMinOpts" \) -o \( ! -z "$COMPlus_TailcallStress" \) ]
 then
   echo "SKIPPING EXECUTION BECAUSE ONE OR MORE OF (COMPlus_JitStress, COMPlus_JitStressRegs, COMPlus_JITMinOpts, COMPlus_TailcallStress) IS SET"
   exit $(GCBashScriptExitCode)
@@ -134,7 +133,7 @@ fi
         <Command><![CDATA[        export _DebuggerFullPath="${i#*=}"
         if [ ! -f "$_DebuggerFullPath" ]
         then
-            echo "The Debugger FullPath %5C%22${_DebuggerFullPath}%5C%22 does not exist"
+            echo The Debugger FullPath \"$_DebuggerFullPath\" doesn\'t exist
             usage
         fi]]></Command>
         <Description>Run testcases under debugger.</Description>
@@ -291,6 +290,10 @@ CLRTestExpectedExitCode=0
     <!-- Raise an error if any value in _RequiredProperties is missing  -->
     <Error Condition=" '%(_RequiredProperties.Value)'=='' "
       Text="Missing required test property [%(_RequiredProperties.Identity)]. Something isn't plumbed through correctly.  Contact $(_CLRTestBuildSystemOwner)." />
+      <!-- TODO: this is weird.  Consider eliminating it. -->
+    <GenerateParamList ArgumentItems="@(BashCLRTestExecutionScriptArgument)">
+      <Output TaskParameter="ParamList" PropertyName="_CLRTestParamList"/>
+    </GenerateParamList>
     <PropertyGroup>
       <!--
       This generates the script portion to parse all of the command line arguments.
-- 
cgit v1.2.3