aboutsummaryrefslogtreecommitdiff
path: root/ci/run_tests.sh
diff options
context:
space:
mode:
authorLaurence Kedward <laurence.kedward@bristol.ac.uk>2021-03-22 11:25:25 +0000
committerGitHub <noreply@github.com>2021-03-22 11:25:25 +0000
commita28513074fb351693086fd9ffca6ebbf03ba9663 (patch)
tree03b5503a9590060fa3845f3dfb8abf30b7b4aad0 /ci/run_tests.sh
parent66862074deee76d0c62c00b00be4e78a1a5d6a3f (diff)
parent9842deb2db98fee60a6d895469be5cd08b26c574 (diff)
downloadfpm-a28513074fb351693086fd9ffca6ebbf03ba9663.tar.gz
fpm-a28513074fb351693086fd9ffca6ebbf03ba9663.zip
Merge branch 'master' into include-dir
Diffstat (limited to 'ci/run_tests.sh')
-rwxr-xr-xci/run_tests.sh40
1 files changed, 20 insertions, 20 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index b1f9a7f..647c57a 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -30,12 +30,12 @@ rm -rf ./*/build
cd hello_world
"${f_fpm_path}" build
-./build/gfortran_debug/app/hello_world
+"${f_fpm_path}" run --target hello_world
"${f_fpm_path}" run
cd ../hello_fpm
"${f_fpm_path}" build
-./build/gfortran_debug/app/hello_fpm
+"${f_fpm_path}" run --target hello_fpm
cd ../circular_test
"${f_fpm_path}" build
@@ -46,48 +46,48 @@ cd ../circular_example
cd ../hello_complex
"${f_fpm_path}" build
"${f_fpm_path}" test
-./build/gfortran_debug/app/say_Hello
-./build/gfortran_debug/app/say_goodbye
-./build/gfortran_debug/test/greet_test
-./build/gfortran_debug/test/farewell_test
+"${f_fpm_path}" run --target say_Hello
+"${f_fpm_path}" run --target say_goodbye
+"${f_fpm_path}" test --target greet_test
+"${f_fpm_path}" test --target farewell_test
cd ../hello_complex_2
"${f_fpm_path}" build
-./build/gfortran_debug/app/say_hello_world
-./build/gfortran_debug/app/say_goodbye
-./build/gfortran_debug/test/greet_test
-./build/gfortran_debug/test/farewell_test
+"${f_fpm_path}" run --target say_hello_world
+"${f_fpm_path}" run --target say_goodbye
+"${f_fpm_path}" test --target greet_test
+"${f_fpm_path}" test --target farewell_test
cd ../with_examples
"${f_fpm_path}" build
-./build/gfortran_debug/example/demo-prog
-./build/gfortran_debug/app/demo-prog
+"${f_fpm_path}" run --example --target demo-prog
+"${f_fpm_path}" run --target demo-prog
cd ../auto_discovery_off
"${f_fpm_path}" build
-./build/gfortran_debug/app/auto_discovery_off
-./build/gfortran_debug/test/my_test
-test ! -x ./build/gfortran_debug/app/unused
-test ! -x ./build/gfortran_debug/test/unused_test
+"${f_fpm_path}" run --target auto_discovery_off
+"${f_fpm_path}" test --target my_test
+test ! -x ./build/gfortran_*/app/unused
+test ! -x ./build/gfortran_*/test/unused_test
cd ../with_c
"${f_fpm_path}" build
-./build/gfortran_debug/app/with_c
+"${f_fpm_path}" run --target with_c
cd ../submodules
"${f_fpm_path}" build
cd ../program_with_module
"${f_fpm_path}" build
-./build/gfortran_debug/app/Program_with_module
+"${f_fpm_path}" run --target Program_with_module
cd ../link_external
"${f_fpm_path}" build
-./build/gfortran_debug/app/link_external
+"${f_fpm_path}" run --target link_external
cd ../link_executable
"${f_fpm_path}" build
-./build/gfortran_debug/app/gomp_test
+"${f_fpm_path}" run --target gomp_test
cd ../fortran_includes
"${f_fpm_path}" build