aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorMilan Curcic <caomaco@gmail.com>2020-10-02 15:49:47 -0400
committerGitHub <noreply@github.com>2020-10-02 15:49:47 -0400
commit75c1da54b337a08f8205db19e49606e30b4ce2bb (patch)
tree5a945ac788a8abcfaaf6c5675ddff4507e3e7ebf /ci
parent0c35749e0d90b5de43a7a90eb47677695e5c81e2 (diff)
parent0fe14b81507be3fe1cd6beda4b960384e813732d (diff)
downloadfpm-75c1da54b337a08f8205db19e49606e30b4ce2bb.tar.gz
fpm-75c1da54b337a08f8205db19e49606e30b4ce2bb.zip
Merge pull request #190 from LKedward/auto-discovery
Auto discovery of executables
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.bat35
-rwxr-xr-xci/run_tests.sh16
2 files changed, 50 insertions, 1 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 92b3cd6..76e5349 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -44,6 +44,41 @@ if errorlevel 1 exit 1
if errorlevel 1 exit 1
+cd ..\hello_complex_2
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\say_hello_world
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\say_goodbye
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\greet_test
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\farewell_test
+
+
+cd ..\auto_discovery_off
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\auto_discovery_off
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\test\my_test
+if errorlevel 1 exit 1
+
+if exist .\build\gfortran_debug\app\unused exit /B 1
+
+if exist .\build\gfortran_debug\test\unused_test exit /B 1
+
+
cd ..\with_c
if errorlevel 1 exit 1
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 418fcf2..adff2b3 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -19,6 +19,20 @@ cd ../hello_complex
./build/gfortran_debug/test/greet_test
./build/gfortran_debug/test/farewell_test
+cd ../hello_complex_2
+../../../fpm/build/gfortran_debug/app/fpm 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
+
+cd ../auto_discovery_off
+../../../fpm/build/gfortran_debug/app/fpm 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
+
cd ../with_c
../../../fpm/build/gfortran_debug/app/fpm build
./build/gfortran_debug/app/with_c
@@ -28,4 +42,4 @@ cd ../submodules
cd ../program_with_module
../../../fpm/build/gfortran_debug/app/fpm build
-./build/gfortran_debug/app/Program_with_module \ No newline at end of file
+./build/gfortran_debug/app/Program_with_module