Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Treat CLRTestExecutionArguments as an array in generated Bash scripts #22435

Merged
merged 2 commits into from
Feb 7, 2019
Merged

Treat CLRTestExecutionArguments as an array in generated Bash scripts #22435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
213da95
Enable baseservices/threading/paramthreadstart/ThreadStartString_1
echesakov Feb 5, 2019
834e3fc
Treat $(CLRTestExecutionArguments) as an array in Bash
echesakov Feb 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@

<!-- All Unix targets -->
<ItemGroup Condition="'$(XunitTestBinBase)' != '' and '$(TargetsWindows)' != 'true'">
<ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartString_1/*">
<Issue>3627</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/PInvoke/MarshalStructAsLayoutExp/*">
<Issue>Issue building native components for the test.</Issue>
</ExcludeList>
Expand Down Expand Up @@ -1781,9 +1778,6 @@
<ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/mutex/openexisting/openmutexpos4/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/paramthreadstart/ThreadStartString_1/*">
<Issue>needs triage</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/baseservices/threading/readerwriterlockslim/ensurelockordering/*">
<Issue>needs triage</Issue>
</ExcludeList>
Expand Down
12 changes: 6 additions & 6 deletions tests/src/CLRTest.Execute.Bash.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ echo BEGIN EXECUTION]]>
</BashCLRTestExitCodePrep>

<BashCLRTestArgPrep Condition=" '$(CLRTestExecutionArguments)'!='' ">
<![CDATA[if [ -z ${CLRTestExecutionArguments+x} ]%3B then export CLRTestExecutionArguments='$(CLRTestExecutionArguments)'%3B fi]]>
<![CDATA[if [ -z ${CLRTestExecutionArguments+x} ]%3B then CLRTestExecutionArguments=($(CLRTestExecutionArguments))%3B fi]]>
</BashCLRTestArgPrep>

<!-- By default, be prepared to do a full check -->
Expand Down Expand Up @@ -271,8 +271,8 @@ else
LAUNCHER="$_DebuggerFullPath $(_CLRTestRunFile)"
fi

echo $LAUNCHER $ExePath $CLRTestExecutionArguments
$LAUNCHER $ExePath $CLRTestExecutionArguments
echo $LAUNCHER $ExePath %24(printf "'%s' " "${CLRTestExecutionArguments[@]}")
$LAUNCHER $ExePath "${CLRTestExecutionArguments[@]}"

CLRTestExitCode=$?
if [ ! -z ${RunCrossGen+x} ]%3B then
Expand All @@ -284,8 +284,8 @@ $(BashLinkerTestCleanupCmds)
$(BashCLRTestLaunchCmds)
echo export CDPATH="$%28dirname "$0")"
export CDPATH="$%28dirname "$0")"
echo /bin/sh $(InputAssemblyName)
/bin/sh $(InputAssemblyName)
echo /usr/bin/env bash $(InputAssemblyName) %24(printf "'%s' " "${CLRTestExecutionArguments[@]}")
/usr/bin/env bash $(InputAssemblyName) "${CLRTestExecutionArguments[@]}"
CLRTestExitCode=$?
CLRTestExpectedExitCode=0
]]></BashCLRTestLaunchCmds>
Expand Down Expand Up @@ -341,7 +341,7 @@ for i in "$@"
%(Command)
%3B%3B')
*)
CLRTestExecutionArguments="$CLRTestExecutionArguments $i"
CLRTestExecutionArguments+=("${i}")
esac
done

Expand Down
4 changes: 2 additions & 2 deletions tests/src/CLRTest.Jit.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ fi
<![CDATA[
if [ -z "$DoLink" -a ! -z "$RunningIlasmRoundTrip" ];
then
echo $(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments
$(_CLRTestRunFile) $(TargetAssemblyName) $CLRTestExecutionArguments
echo $(_CLRTestRunFile) $(TargetAssemblyName) %24(printf "'%s' " "${CLRTestExecutionArguments[@]}")
$(_CLRTestRunFile) $(TargetAssemblyName) "${CLRTestExecutionArguments[@]}"
if [ $? -ne $CLRTestExpectedExitCode ]
then
echo END EXECUTION OF IL{D}ASM BINARY - FAILED $? vs $CLRTestExpectedExitCode
Expand Down