diff --git a/mpy-cross/mpy-cross.vcxproj b/mpy-cross/mpy-cross.vcxproj
new file mode 100644
index 0000000000..805580c783
--- /dev/null
+++ b/mpy-cross/mpy-cross.vcxproj
@@ -0,0 +1,103 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release
+ x64
+
+
+
+ {740F3A30-3B6C-4B59-9C50-AE4D5A4A9D12}
+ mpy-cross
+ True
+ $(MSBuildThisFileDirectory)build\
+ $(MSBuildThisFileDirectory)
+ $(MSBuildThisFileDirectory)
+ $(MSBuildThisFileDirectory)..\ports\windows\msvc\
+
+
+
+ Application
+ $(DefaultPlatformToolset)
+
+
+ Application
+ $(DefaultPlatformToolset)
+
+
+ Application
+ $(DefaultPlatformToolset)
+
+
+ Application
+ $(DefaultPlatformToolset)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ msvc/user.props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 795330eff0..2e0dbdea5d 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -14,15 +14,27 @@ platform:
- x86
- x64
+before_build:
+- ps: |
+ @"
+
+
+
+
+
+
+ "@ | Set-Content build.proj
+
build:
- project: ports/windows/micropython.vcxproj
+ project: build.proj
+ parallel: true
verbosity: normal
test_script:
-- cmd: >-
- cd tests
-
- %MICROPY_CPYTHON3% run-tests
+- ps: |
+ cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
+ & $env:MICROPY_CPYTHON3 run-tests
+ & $env:MICROPY_CPYTHON3 run-tests --via-mpy -d basics float micropython
# After the build/test phase for the MSVC build completes,
# build and test with mingw-w64, release versions only.
@@ -38,11 +50,27 @@ after_test:
if ($LASTEXITCODE -ne 0) {
throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
}
+ cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'mpy-cross')
+ # Building of mpy-cross hasn't been fixed across all possible windows/WSL/...
+ # variations and the STRIP step tries to strip mpy-cross whereas that should be
+ # mpy-cross.exe. Workaround for now by skipping actual strip and size commands.
+ C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 STRIP=echo SIZE=echo"
+ if ($LASTEXITCODE -ne 0) {
+ throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
+ }
cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
- & $env:MICROPY_CPYTHON3 run-tests -e math_fun -e float2int_double -e float_parse -e math_domain_special
+ $testArgs = @('run-tests')
+ foreach ($skipTest in @('math_fun', 'float2int_double', 'float_parse', 'math_domain_special')) {
+ $testArgs = $testArgs + '-e' + $skipTest
+ }
+ & $env:MICROPY_CPYTHON3 $testArgs
if ($LASTEXITCODE -ne 0) {
throw "$env:MSYSTEM tests exited with code $LASTEXITCODE"
}
+ & $env:MICROPY_CPYTHON3 ($testArgs + @('--via-mpy', '-d', 'basics', 'float', 'micropython'))
+ if ($LASTEXITCODE -ne 0) {
+ throw "$env:MSYSTEM mpy-cross tests exited with code $LASTEXITCODE"
+ }
skip_tags: true