From 04fd3870fb8cbb6014a197b26b71f6e3021ccba1 Mon Sep 17 00:00:00 2001
From: LKedward <laurence.kedward@bristol.ac.uk>
Date: Sat, 26 Sep 2020 11:11:01 +0100
Subject: Add: example package with program discovery

---
 ci/run_tests.bat | 18 ++++++++++++++++++
 ci/run_tests.sh  |  9 ++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 92b3cd6..ce79618 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -44,6 +44,24 @@ 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 ..\with_c
 if errorlevel 1 exit 1
 
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 418fcf2..ee46cac 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -19,6 +19,13 @@ 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 ../with_c
 ../../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/with_c
@@ -28,4 +35,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
-- 
cgit v1.2.3


From ad02416e06e1cb9373fa69c6f61492fd498c87d2 Mon Sep 17 00:00:00 2001
From: LKedward <laurence.kedward@bristol.ac.uk>
Date: Tue, 29 Sep 2020 13:38:07 +0100
Subject: 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.
---
 ci/run_tests.bat | 17 +++++++++++++++++
 ci/run_tests.sh  |  7 +++++++
 2 files changed, 24 insertions(+)

(limited to 'ci')

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
-- 
cgit v1.2.3