diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-28 13:46:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-28 13:46:17 -0500 |
| commit | 2687745c39f6b4525ca45e8a272db56af7669965 (patch) | |
| tree | 15fe5d6d81a472e731775d093f405cef22d2e617 /ci | |
| parent | 5d122c2854dbec1470a660bf80cd0544a8806a78 (diff) | |
| parent | c5b80a3ce0503d12d3a9fea5b520ca9ab5ac0479 (diff) | |
| download | fpm-2687745c39f6b4525ca45e8a272db56af7669965.tar.gz fpm-2687745c39f6b4525ca45e8a272db56af7669965.zip | |
Merge branch 'master' into compiler_and_flags
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run_tests.bat | 2 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat index 2a68f53..0c0339c 100755 --- a/ci/run_tests.bat +++ b/ci/run_tests.bat @@ -9,8 +9,10 @@ if errorlevel 1 exit 1 fpm run if errorlevel 1 exit 1 +rmdir fpm_scratch_* /s /q fpm test if errorlevel 1 exit 1 +rmdir fpm_scratch_* /s /q for /f %%i in ('where /r build fpm.exe') do set fpm_path=%%i diff --git a/ci/run_tests.sh b/ci/run_tests.sh index df7fb24..625f37b 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -17,10 +17,11 @@ set -ex cd fpm fpm build fpm run +rm -rf fpm_scratch_*/ fpm test +rm -rf fpm_scratch_*/ f_fpm_path="$(get_abs_filename $(find build -regex 'build/.*/app/fpm'))" - "${f_fpm_path}" cd ../example_packages/hello_world |