aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSebastian Ehlert <28669218+awvwgk@users.noreply.github.com>2021-03-17 22:34:04 +0100
committerSebastian Ehlert <28669218+awvwgk@users.noreply.github.com>2021-03-18 09:23:22 +0100
commitbef08ccdf7053410825ade463221007ef7186062 (patch)
treee30431c429da53cf2bbad0547cb088f6c75bacf6 /ci
parentbfbd2db2a331469c960b423e013e0dd9212286c5 (diff)
downloadfpm-bef08ccdf7053410825ade463221007ef7186062.tar.gz
fpm-bef08ccdf7053410825ade463221007ef7186062.zip
Don't use explicit paths to targets in CI tests
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.bat38
-rwxr-xr-xci/run_tests.sh40
2 files changed, 39 insertions, 39 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index ae57da6..f5b57c1 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -39,7 +39,7 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\hello_world
+%fpm_path% run --target hello_world
if errorlevel 1 exit 1
%fpm_path% run
@@ -53,7 +53,7 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\hello_fpm
+%fpm_path% run --target hello_fpm
if errorlevel 1 exit 1
@@ -83,16 +83,16 @@ if errorlevel 1 exit 1
%fpm_path% test
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\say_Hello
+%fpm_path% run --target say_Hello
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\say_goodbye
+%fpm_path% run --target say_goodbye
if errorlevel 1 exit 1
-.\build\gfortran_debug\test\greet_test
+%fpm_path% test --target greet_test
if errorlevel 1 exit 1
-.\build\gfortran_debug\test\farewell_test
+%fpm_path% test --target farewell_test
if errorlevel 1 exit 1
@@ -103,16 +103,16 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\say_hello_world
+%fpm_path% run --target say_hello_world
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\say_goodbye
+%fpm_path% run --target say_goodbye
if errorlevel 1 exit 1
-.\build\gfortran_debug\test\greet_test
+%fpm_path% test --target greet_test
if errorlevel 1 exit 1
-.\build\gfortran_debug\test\farewell_test
+%fpm_path% test --target farewell_test
cd ..\with_examples
@@ -122,10 +122,10 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\example\demo-prog
+%fpm_path% run --example --target demo-prog
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\demo-prog
+%fpm_path% run --target demo-prog
if errorlevel 1 exit 1
@@ -136,15 +136,15 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\auto_discovery_off
+%fpm_path% run --target auto_discovery_off
if errorlevel 1 exit 1
-.\build\gfortran_debug\test\my_test
+%fpm_path% test --target my_test
if errorlevel 1 exit 1
-if exist .\build\gfortran_debug\app\unused exit /B 1
+if exist .\build\gfortran_*\app\unused exit /B 1
-if exist .\build\gfortran_debug\test\unused_test exit /B 1
+if exist .\build\gfortran_*\test\unused_test exit /B 1
cd ..\with_c
@@ -154,7 +154,7 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\with_c
+%fpm_path% run --target with_c
if errorlevel 1 exit 1
@@ -173,7 +173,7 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\Program_with_module
+%fpm_path% run --target Program_with_module
if errorlevel 1 exit 1
@@ -184,7 +184,7 @@ del /q /f build
%fpm_path% build
if errorlevel 1 exit 1
-.\build\gfortran_debug\app\gomp_test
+%fpm_path% run --target gomp_test
if errorlevel 1 exit 1
cd ..\..
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index f1c4dff..bca70cc 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
# Cleanup
rm -rf ./*/build