Merge branch 'master' into bootstrap_submodule_support

2 files changed, 34 insertions, 0 deletions

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 4136924..517ff06 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -25,6 +25,30 @@ if errorlevel 1 exit 1
 if errorlevel 1 exit 1
 
 
+cd ..\hello_fpm
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\hello_fpm
+if errorlevel 1 exit 1
+
+
+cd ..\circular_test
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+
+cd ..\circular_example
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+
 cd ..\hello_complex
 if errorlevel 1 exit 1
 
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index cde5645..4ba590a 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -12,6 +12,16 @@ cd ../example_packages/hello_world
 ../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/hello_world
 
+cd ../hello_fpm
+../../../fpm/build/gfortran_debug/app/fpm build
+./build/gfortran_debug/app/hello_fpm
+
+cd ../circular_test
+../../../fpm/build/gfortran_debug/app/fpm build
+
+cd ../circular_example
+../../../fpm/build/gfortran_debug/app/fpm build
+
 cd ../hello_complex
 ../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/say_Hello