diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-03-08 14:48:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-08 14:48:28 +0300 |
| commit | 2c9e4379c9dd433375bb9bd9fc3aa4cf65f37a03 (patch) | |
| tree | 0db8d8fa9e99d6a019d074e0d4ea4b43608b34e1 /scripts | |
| parent | ed12a1d4da5c8a6224e2e25bb6b57e45e822352c (diff) | |
[ci] Check if X server is available before running WinForms tests (#4477)
This should hopefully "fix" the mass fails in the WinForms
tests we sometimes see in CI.
We're using the simplest WinForms code that invokes the XplatUI
and causes the X connection to be established, if this fails
then something is seriously wrong and we skip the WinForms tests.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ci/run-test-default.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/ci/run-test-default.sh b/scripts/ci/run-test-default.sh index 6fba7f19ca6..10184928fde 100755 --- a/scripts/ci/run-test-default.sh +++ b/scripts/ci/run-test-default.sh @@ -24,7 +24,10 @@ else ${TESTCMD} --label=System.Drawing --timeout=5m make -w -C mcs/class/System. fi if [[ ${label} == osx-* ]] || [[ ${label} == w* ]] then ${TESTCMD} --label=Windows.Forms --skip; -else ${TESTCMD} --label=Windows.Forms --timeout=5m make -w -C mcs/class/System.Windows.Forms run-test +else + if make -C mcs/class/System.Windows.Forms test-simple; + then ${TESTCMD} --label=Windows.Forms --timeout=5m make -w -C mcs/class/System.Windows.Forms run-test + else echo "The simple test failed (maybe because of missing X server), skipping test suite." && ${TESTCMD} --label=Windows.Forms --skip; fi fi ${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test if [[ ${label} == w* ]]; then ${TESTCMD} --label=Mono.Data.Sqlite --skip; else ${TESTCMD} --label=Mono.Data.Sqlite --timeout=5m make -w -C mcs/class/Mono.Data.Sqlite run-test; fi |