From 6d32747c18c7c9b9c7395212c7092a38062bb6fa Mon Sep 17 00:00:00 2001
From: Brad Richardson <brichardson@structint.com>
Date: Fri, 31 Jul 2020 13:18:26 -0700
Subject: Don't have fpm try to build itself

---
 ci/run_tests.bat | 3 ---
 ci/run_tests.sh  | 1 -
 2 files changed, 4 deletions(-)

(limited to 'ci')

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index fc4e1f5..0d0be99 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -9,9 +9,6 @@ if errorlevel 1 exit 1
 fpm run
 if errorlevel 1 exit 1
 
-fpm run --args build
-if errorlevel 1 exit 1
-
 .\fpm
 if errorlevel 1 exit 1
 
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index e8a37e6..e71d883 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -5,7 +5,6 @@ set -ex
 cd fpm
 fpm build
 fpm run
-fpm run --args build
 ./fpm
 cd ../test/example_packages/hello_world
 ../../../fpm/fpm build
-- 
cgit v1.2.3


From d36859ab2742d1801266c538ab6d407cdaae9142 Mon Sep 17 00:00:00 2001
From: Brad Richardson <brichardson@structint.com>
Date: Fri, 31 Jul 2020 14:43:00 -0700
Subject: Fix the CI scripts

---
 ci/run_tests.bat | 4 ++--
 ci/run_tests.sh  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ci')

diff --git a/ci/run_tests.bat b/ci/run_tests.bat
index 0d0be99..99d0296 100755
--- a/ci/run_tests.bat
+++ b/ci/run_tests.bat
@@ -9,13 +9,13 @@ if errorlevel 1 exit 1
 fpm run
 if errorlevel 1 exit 1
 
-.\fpm
+build\gfortran_debug\app\fpm
 if errorlevel 1 exit 1
 
 cd ..\test\example_packages\hello_world
 if errorlevel 1 exit 1
 
-..\..\..\fpm\fpm build
+..\..\..\fpm\build\gfortran_debug\app\fpm build
 if errorlevel 1 exit 1
 
 .\hello_world
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index e71d883..59724d5 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -5,7 +5,7 @@ set -ex
 cd fpm
 fpm build
 fpm run
-./fpm
+build/gfortran_debug/app/fpm
 cd ../test/example_packages/hello_world
-../../../fpm/fpm build
+../../../fpm/build/gfortran_debug/app/fpm build
 ./hello_world
-- 
cgit v1.2.3