Merge pull request #213 from everythingfunctional/bootstrap_submodule_support

Bootstrap submodule support

2 files changed, 23 insertions, 24 deletions

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 645fd49..7d0b178 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -15,11 +15,10 @@ if errorlevel 1 exit 1
 build\gfortran_debug\app\fpm
 if errorlevel 1 exit 1
 
-
-cd ..\test\example_packages\hello_world
+cd ..\example_packages\hello_world
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\hello_world
@@ -29,7 +28,7 @@ if errorlevel 1 exit 1
 cd ..\hello_fpm
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\hello_fpm
@@ -39,21 +38,21 @@ if errorlevel 1 exit 1
 cd ..\circular_test
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\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
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 
 cd ..\hello_complex
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\say_Hello
@@ -72,7 +71,7 @@ if errorlevel 1 exit 1
 cd ..\hello_complex_2
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\say_hello_world
@@ -90,7 +89,7 @@ if errorlevel 1 exit 1
 cd ..\auto_discovery_off
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\auto_discovery_off
@@ -107,7 +106,7 @@ if exist .\build\gfortran_debug\test\unused_test exit /B 1
 cd ..\with_c
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\with_c
@@ -117,15 +116,15 @@ if errorlevel 1 exit 1
 cd ..\submodules
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 
 cd ..\program_with_module
 if errorlevel 1 exit 1
 
-..\..\..\fpm\build\gfortran_debug\app\fpm build
+..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\build\gfortran_debug\app\Program_with_module
-if errorlevel 1 exit 1
\ No newline at end of file
+if errorlevel 1 exit 1
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 7ca33d8..a42653b 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -8,48 +8,48 @@ fpm run
 fpm test
 build/gfortran_debug/app/fpm
 
-cd ../test/example_packages/hello_world
-../../../fpm/build/gfortran_debug/app/fpm build
+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
+../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/hello_fpm
 
 cd ../circular_test
-../../../fpm/build/gfortran_debug/app/fpm build
+../../fpm/build/gfortran_debug/app/fpm build
 
 cd ../circular_example
-../../../fpm/build/gfortran_debug/app/fpm build
+../../fpm/build/gfortran_debug/app/fpm build
 
 cd ../hello_complex
-../../../fpm/build/gfortran_debug/app/fpm build
+../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/say_Hello
 ./build/gfortran_debug/app/say_goodbye
 ./build/gfortran_debug/test/greet_test
 ./build/gfortran_debug/test/farewell_test
 
 cd ../hello_complex_2
-../../../fpm/build/gfortran_debug/app/fpm build
+../../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
+../../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
+../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/with_c
 
 cd ../submodules
-../../../fpm/build/gfortran_debug/app/fpm build
+../../fpm/build/gfortran_debug/app/fpm build
 
 cd ../program_with_module
-../../../fpm/build/gfortran_debug/app/fpm build
+../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/Program_with_module