diff options
| author | Jonathan Miller <jonmill@microsoft.com> | 2016-03-02 02:34:10 +0300 |
|---|---|---|
| committer | Jonathan Miller <jonmill@microsoft.com> | 2016-03-31 20:46:26 +0300 |
| commit | 752599494fce80b5d0059a9090fdc010d8c7f45b (patch) | |
| tree | 815e7565201c8a29c444b0234a3f2380a338723c /run-test.sh | |
| parent | 814247f119357f1efc620043d514769100e4f41f (diff) | |
Adding builds files for the test projects
Diffstat (limited to 'run-test.sh')
| -rwxr-xr-x | run-test.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/run-test.sh b/run-test.sh index 3bd4fa1be1..b25d773446 100755 --- a/run-test.sh +++ b/run-test.sh @@ -83,7 +83,6 @@ esac # Misc defaults TestSelection=".*" TestsFailed=0 -OverlayDir="$ProjectRoot/bin/tests/$OS.AnyCPU.$ConfigurationGroup/TestOverlay/" create_test_overlay() { @@ -163,8 +162,16 @@ runtest() if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ] then - echo "error: Did not find corresponding test dll for $testProject at $dirName/$testDllName" - exit 1 + dirName="$AnyOsTestDir/$fileNameWithoutExtension/dnxcore50" + if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ] + then + dirName="$UnixTestDir/$fileNameWithoutExtension/dnxcore50" + if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ] + then + echo "error: Did not find corresponding test dll for $testProject" + exit 1 + fi + fi fi copy_test_overlay $dirName @@ -303,6 +310,10 @@ do shift done +OverlayDir="$ProjectRoot/bin/tests/$OS.AnyCPU.$ConfigurationGroup/TestOverlay/" +AnyOsTestDir="$ProjectRoot/bin/tests/AnyOS.AnyCPU.$ConfigurationGroup" +UnixTestDir="$ProjectRoot/bin/tests/Unix.AnyCPU.$ConfigurationGroup" + # Compute paths to the binaries if they haven't already been computed if [ "$CoreClrBins" == "" ] |