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

fix merge conflict in build-test.sh #19744

Merged
merged 1 commit into from
Aug 30, 2018
Merged

fix merge conflict in build-test.sh #19744

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix merge conflict in build-test.sh
  • Loading branch information
Sergey Andreenko committed Aug 29, 2018
commit 78cd9a9025c3c071ed55295a0840640b0f5ef632
2 changes: 1 addition & 1 deletion build-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ build_Tests()
# Always create the test wrappers and set the exclude file.
export __Exclude="$__TestDir/issues.targets"
echo "Exclude set to $__TestDir/issues.targets"
build_Tests_internal "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"
build_MSBuild_projects "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"

if [ $? -ne 0 ]; then
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"
Expand Down