aboutsummaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorLKedward <laurence.kedward@bristol.ac.uk>2020-09-29 13:38:07 +0100
committerLKedward <laurence.kedward@bristol.ac.uk>2020-09-29 13:38:07 +0100
commitad02416e06e1cb9373fa69c6f61492fd498c87d2 (patch)
tree3e951aca1d01db2a9fbdcbf51c6f8d94098c184b /ci
parent1d0c99e6ee605f6a769fdc6c98a6a360c0e6f89a (diff)
downloadfpm-ad02416e06e1cb9373fa69c6f61492fd498c87d2.tar.gz
fpm-ad02416e06e1cb9373fa69c6f61492fd498c87d2.zip
Add: test package with auto-discovery disabled
Contains an app and a test that should be ignored by auto-discovery - this is checked in the CI scripts.
Diffstat (limited to 'ci')
-rwxr-xr-xci/run_tests.bat17
-rwxr-xr-xci/run_tests.sh7
2 files changed, 24 insertions, 0 deletions
diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index ce79618..76e5349 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -62,6 +62,23 @@ 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 ee46cac..adff2b3 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -26,6 +26,13 @@ cd ../hello_complex_2
./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