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

Fix unix test build by removing unnecessary 'managed_test_build' semafore file #17725

Merged
merged 1 commit into from
Apr 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 5 additions & 14 deletions build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,13 @@ build_Tests()

echo "Starting the Managed Tests Build..."

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

if [ ! -f $__ManagedTestBuiltMarker ]; then

build_Tests_internal "Tests_Managed" "$__ProjectDir/tests/build.proj" "$__up" "Managed tests build (build tests)"

if [ $? -ne 0 ]; then
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
exit 1
else
echo "Tests have been built."
echo "Create marker \"${__ManagedTestBuiltMarker}\""
touch $__ManagedTestBuiltMarker
fi
if [ $? -ne 0 ]; then
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
exit 1
else
echo "Managed Tests had been built before."
echo "Managed tests build success!"
fi

if [ $__BuildTestWrappers -ne -0 ]; then
Expand Down
2 changes: 1 addition & 1 deletion tests/src/dirs.proj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</ItemGroup>

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