aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xci/run_tests.sh37
-rw-r--r--example_packages/auto_discovery_off/.gitignore1
-rw-r--r--example_packages/program_with_module/.gitignore1
-rw-r--r--example_packages/with_c/.gitignore1
4 files changed, 29 insertions, 11 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index a42653b..df7fb24 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -1,55 +1,70 @@
#!/bin/bash
+get_abs_filename() {
+ # $1 : relative filename
+ filename=$1
+ parentdir=$(dirname "${filename}")
+
+ if [ -d "${filename}" ]; then
+ echo "$(cd "${filename}" && pwd)"
+ elif [ -d "${parentdir}" ]; then
+ echo "$(cd "${parentdir}" && pwd)/$(basename "${filename}")"
+ fi
+}
+
set -ex
cd fpm
fpm build
fpm run
fpm test
-build/gfortran_debug/app/fpm
+
+f_fpm_path="$(get_abs_filename $(find build -regex 'build/.*/app/fpm'))"
+
+"${f_fpm_path}"
cd ../example_packages/hello_world
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
./build/gfortran_debug/app/hello_world
cd ../hello_fpm
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
./build/gfortran_debug/app/hello_fpm
cd ../circular_test
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
cd ../circular_example
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
cd ../hello_complex
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" 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
+"${f_fpm_path}" 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
+"${f_fpm_path}" 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
+"${f_fpm_path}" build
./build/gfortran_debug/app/with_c
cd ../submodules
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
cd ../program_with_module
-../../fpm/build/gfortran_debug/app/fpm build
+"${f_fpm_path}" build
./build/gfortran_debug/app/Program_with_module
diff --git a/example_packages/auto_discovery_off/.gitignore b/example_packages/auto_discovery_off/.gitignore
new file mode 100644
index 0000000..a007fea
--- /dev/null
+++ b/example_packages/auto_discovery_off/.gitignore
@@ -0,0 +1 @@
+build/*
diff --git a/example_packages/program_with_module/.gitignore b/example_packages/program_with_module/.gitignore
new file mode 100644
index 0000000..a007fea
--- /dev/null
+++ b/example_packages/program_with_module/.gitignore
@@ -0,0 +1 @@
+build/*
diff --git a/example_packages/with_c/.gitignore b/example_packages/with_c/.gitignore
new file mode 100644
index 0000000..a007fea
--- /dev/null
+++ b/example_packages/with_c/.gitignore
@@ -0,0 +1 @@
+build/*