summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2019-12-30 00:46:17 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2019-12-30 00:46:17 (GMT)
commit7a24dab5d4fffccd5e596962ff119c3353279b7a (patch)
tree5602ff196de324e9d5b02fa9dc671442da406d50
parentb61f24e775b688f06e37f05158a873b1d6a65d10 (diff)
downloadSCons-7a24dab5d4fffccd5e596962ff119c3353279b7a.zip
SCons-7a24dab5d4fffccd5e596962ff119c3353279b7a.tar.gz
SCons-7a24dab5d4fffccd5e596962ff119c3353279b7a.tar.bz2
Fix py35 hang due to bad VS2010 install on VS2015 appveyor image.
-rw-r--r--.appveyor.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml
index 070587f..0287df9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -186,12 +186,14 @@ build_script:
$coveragercFile|Set-Content "$($env:COVERAGE_PROCESS_START)";
}
- # Create exclude_list.txt (was used to exclude some failing tests due to appveyor issues)
+ # exclude VS 10.0 because it hangs the testing until this is resolved:
+ # https://help.appveyor.com/discussions/problems/19283-visual-studio-2010-trial-license-has-expired
- ps: |
New-Item -Name exclude_list.txt -ItemType File
- # Remove-Item -Path 'all_tests.txt'
- # New-Item -Name all_tests.txt -ItemType File
- # Add-Content -Path 'all_tests.txt' -Value 'test\option\taskmastertrace.py'
+ $workaround_image = "Visual Studio 2015"
+ if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq $workaround_image) {
+ Add-Content -Path 'exclude_list.txt' -Value 'test\MSVS\vs-10.0-exec.py'
+ }
# setup portion of tests for this build job (1-4)
- ps: |