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

Commit 6db4217

Browse files
author
Jarret Shook
committed
Merge pull request #17725 from dotnetrt/FixNixTestBuild
Fix unix test build by removing unnecessary 'managed_test_build' semafore file
1 parent f6a4f58 commit 6db4217

File tree

2 files changed

+6
-15
lines changed

2 files changed

+6
-15
lines changed

build-test.sh

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -238,22 +238,13 @@ build_Tests()
238238

239239
echo "Starting the Managed Tests Build..."
240240

241-
__ManagedTestBuiltMarker=${__TestBinDir}/managed_test_build
241+
build_Tests_internal "Tests_Managed" "$__ProjectDir/tests/build.proj" "$__up" "Managed tests build (build tests)"
242242

243-
if [ ! -f $__ManagedTestBuiltMarker ]; then
244-
245-
build_Tests_internal "Tests_Managed" "$__ProjectDir/tests/build.proj" "$__up" "Managed tests build (build tests)"
246-
247-
if [ $? -ne 0 ]; then
248-
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
249-
exit 1
250-
else
251-
echo "Tests have been built."
252-
echo "Create marker \"${__ManagedTestBuiltMarker}\""
253-
touch $__ManagedTestBuiltMarker
254-
fi
243+
if [ $? -ne 0 ]; then
244+
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
245+
exit 1
255246
else
256-
echo "Managed Tests had been built before."
247+
echo "Managed tests build success!"
257248
fi
258249

259250
if [ $__BuildTestWrappers -ne -0 ]; then

tests/src/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<!-- Unix builds do not support subgroups -->
37-
<ItemGroup Condition="$(__BuildOS) != 'Windows_NT' And $(__TestGroupToBuild) == '1' And $(TestBuildSlice) == '1'">
37+
<ItemGroup Condition="$(__BuildOS) != 'Windows_NT'" >
3838
<Project Include="*\**\*.csproj" Exclude="@(DisabledProjects)">
3939
<AdditionalProperties>OSGroup=$(OSGroup)</AdditionalProperties>
4040
</Project>

0 commit comments

Comments
 (0)