summaryrefslogtreecommitdiff
path: root/build-test.sh
diff options
context:
space:
mode:
authorSergey Andreenko <seandree@microsoft.com>2018-08-30 02:54:42 (GMT)
committerGitHub <noreply@github.com>2018-08-30 02:54:42 (GMT)
commitd42cdd01992aa5328320c7d4bf5eca41fbc8ff02 (patch)
tree7f7263f94085be29aea64bcd481da59ec277bac1 /build-test.sh
parent398caa5c90173f90bcfc8275670a1fcaa7ad6e41 (diff)
downloadcoreclr-d42cdd01992aa5328320c7d4bf5eca41fbc8ff02.zip
coreclr-d42cdd01992aa5328320c7d4bf5eca41fbc8ff02.tar.gz
coreclr-d42cdd01992aa5328320c7d4bf5eca41fbc8ff02.tar.bz2
fix merge conflict in build-test.sh (#19744)
Diffstat (limited to 'build-test.sh')
-rwxr-xr-xbuild-test.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-test.sh b/build-test.sh
index c2428f5..7ae045b 100755
--- a/build-test.sh
+++ b/build-test.sh
@@ -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)"