aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorOndřej Čertík <ondrej@certik.us>2020-07-31 21:53:04 -0600
committerGitHub <noreply@github.com>2020-07-31 21:53:04 -0600
commit39fb22dcb92cf129de7b01acb7692c28efa9f981 (patch)
tree81ae9745783b5750b423f09a001d6088f57ccffb /ci
parentfcb7f675a8203f0ab518b20e9e11ee6dd49c3186 (diff)
parentd36859ab2742d1801266c538ab6d407cdaae9142 (diff)
downloadfpm-39fb22dcb92cf129de7b01acb7692c28efa9f981.tar.gz
fpm-39fb22dcb92cf129de7b01acb7692c28efa9f981.zip
Merge pull request #151 from everythingfunctional/refactor_for_command_line
Refactor to make it easier to start developing the command line aspects
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.bat7
-rwxr-xr-xci/run_tests.sh5
2 files changed, 4 insertions, 8 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index fc4e1f5..99d0296 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -9,16 +9,13 @@ if errorlevel 1 exit 1
fpm run
if errorlevel 1 exit 1
-fpm run --args build
-if errorlevel 1 exit 1
-
-.\fpm
+build\gfortran_debug\app\fpm
if errorlevel 1 exit 1
cd ..\test\example_packages\hello_world
if errorlevel 1 exit 1
-..\..\..\fpm\fpm build
+..\..\..\fpm\build\gfortran_debug\app\fpm build
if errorlevel 1 exit 1
.\hello_world
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index e8a37e6..59724d5 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -5,8 +5,7 @@ set -ex
cd fpm
fpm build
fpm run
-fpm run --args build
-./fpm
+build/gfortran_debug/app/fpm
cd ../test/example_packages/hello_world
-../../../fpm/fpm build
+../../../fpm/build/gfortran_debug/app/fpm build
./hello_world