231018.130045.HKT create fortran/tests/tools to contain checktest…

…, `*lint`, and `*src`
libprima · Oct 18, 2023 · 5b31053 · 5b31053
1 parent c57e80c
commit 5b31053
Show file tree

Hide file tree

Showing 27 changed files with 29 additions and 28 deletions.
diff --git a/fortran/bobyqa/flint b/fortran/bobyqa/flint
@@ -1 +1 @@
-../common/flint
+../tests/tools/flint
diff --git a/fortran/bobyqa/mlint b/fortran/bobyqa/mlint
@@ -1 +1 @@
-../common/mlint
+../tests/tools/mlint
diff --git a/fortran/cobyla/flint b/fortran/cobyla/flint
@@ -1 +1 @@
-../common/flint
+../tests/tools/flint
diff --git a/fortran/cobyla/mlint b/fortran/cobyla/mlint
@@ -1 +1 @@
-../common/mlint
+../tests/tools/mlint
diff --git a/fortran/lincoa/flint b/fortran/lincoa/flint
@@ -1 +1 @@
-../common/flint
+../tests/tools/flint
diff --git a/fortran/lincoa/mlint b/fortran/lincoa/mlint
@@ -1 +1 @@
-../common/mlint
+../tests/tools/mlint
diff --git a/fortran/newuoa/flint b/fortran/newuoa/flint
@@ -1 +1 @@
-../common/flint
+../tests/tools/flint
diff --git a/fortran/newuoa/mlint b/fortran/newuoa/mlint
@@ -1 +1 @@
-../common/mlint
+../tests/tools/mlint
diff --git a/fortran/tests/makefiles/Makefile.common b/fortran/tests/makefiles/Makefile.common
@@ -134,6 +134,8 @@ TESTSUITE_DIR := $(TEST_DIR)/$(TESTSUITE)
 SRC_DIRS := $(COMMON_DIR) $(SOLVER_DIR) $(TESTSUITE_DIR)
 # Driver directory.
 DRIVER_DIR := $(TEST_DIR)
+# Tools directory
+TOOLS_DIR := $(TEST_DIR)/tools
 
 # Sources.
 COMMON_SRC := $(shell sed "s/^/\.\/common\//" $(COMMON_DIR)/ffiles.txt)
@@ -149,7 +151,7 @@ SRC_NO_TEST := $(COMMON_SRC) $(SOLVER_SRC)
 HEADERS := $(TEST_SOLVER_DIR)/$(COMMON)/*.h
 
 # The checktest script.
-CHCKTST := $(TEST_DIR)/checktest
+CHCKTST := $(TOOLS_DIR)/checktest
 
 # Define the tests.
 ######################################################################################
@@ -972,23 +974,23 @@ source_%: $(SRC_DIRS)
 	# https://github.com/zequipe/test_compiler/blob/master/test_solve.f90
 	@if echo $@ | grep -q "gtest" && echo $(FFLAGS) | grep -q "fast"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../gsrc ./ ; \
+		bash $(TOOLS_DIR)/gsrc ./ ; \
 	fi
 	@if echo $@ | grep -q "ftest\|rtest\|dtest"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../frdsrc ./ ; \
+		bash $(TOOLS_DIR)/frdsrc ./ ; \
 	fi
 	@if echo $@ | grep -q "stest"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../sunsrc ./ ; \
+		bash $(TOOLS_DIR)/sunsrc ./ ; \
 	fi
 	@if echo $@ | grep -q "9test"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../9src ./ ; \
+		bash $(TOOLS_DIR)/9src ./ ; \
 	fi
 	@if echo $@ | grep -q "atest\|9test"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../a9src ./ ; \
+		bash $(TOOLS_DIR)/a9src ./ ; \
 	fi
 	@printf "Done.\n"
 

diff --git a/fortran/tests/test_cobyla.f90 b/fortran/tests/test_cobyla.f90
@@ -41,7 +41,7 @@ module test_solver_mod
 !
 ! Started: September 2021
 !
-! Last Modified: Thursday, September 28, 2023 PM05:19:01
+! Last Modified: Wednesday, October 18, 2023 PM12:58:20
 !--------------------------------------------------------------------------------------------------!
 
 implicit none

diff --git a/fortran/tests/9src → fortran/tests/tools/9src b/fortran/tests/9src → fortran/tests/tools/9src
diff --git a/fortran/tests/a9src → fortran/tests/tools/a9src b/fortran/tests/a9src → fortran/tests/tools/a9src
diff --git a/fortran/tests/checktest → fortran/tests/tools/checktest b/fortran/tests/checktest → fortran/tests/tools/checktest
diff --git a/fortran/common/flint → fortran/tests/tools/flint b/fortran/common/flint → fortran/tests/tools/flint
@@ -106,7 +106,7 @@ FTEST_SOLVER_DIR="$FTEST_DIR"/test."$SOLVER"
 TEST_LOG_DIR="$FTEST_SOLVER_DIR"/log
 
 # The checktest script
-CHCKTST="$FTEST_DIR"/checktest
+CHCKTST="$FTEST_DIR"/tools/checktest
 
 # Remove the old logs.
 mkdir -p "$SOLVER_LOG_DIR"

diff --git a/fortran/tests/frdsrc → fortran/tests/tools/frdsrc b/fortran/tests/frdsrc → fortran/tests/tools/frdsrc
diff --git a/fortran/tests/gsrc → fortran/tests/tools/gsrc b/fortran/tests/gsrc → fortran/tests/tools/gsrc
diff --git a/fortran/common/mlint → fortran/tests/tools/mlint b/fortran/common/mlint → fortran/tests/tools/mlint
@@ -111,7 +111,7 @@ MTEST_SOLVER_DIR="$MTEST_DIR"/test."$SOLVER"
 TEST_LOG_DIR="$MTEST_SOLVER_DIR"/log
 
 # The checktest script
-CHCKTST="$MTEST_DIR"/checktest
+CHCKTST="$MTEST_DIR"/tools/checktest
 
 # Remove the old logs.
 mkdir -p "$SOLVER_LOG_DIR"

diff --git a/matlab/mex_gateways/tests/s9src → fortran/tests/tools/s9src b/matlab/mex_gateways/tests/s9src → fortran/tests/tools/s9src
diff --git a/fortran/tests/sunsrc → fortran/tests/tools/sunsrc b/fortran/tests/sunsrc → fortran/tests/tools/sunsrc
diff --git a/fortran/uobyqa/flint b/fortran/uobyqa/flint
@@ -1 +1 @@
-../common/flint
+../tests/tools/flint
diff --git a/fortran/uobyqa/mlint b/fortran/uobyqa/mlint
@@ -1 +1 @@
-../common/mlint
+../tests/tools/mlint
diff --git a/matlab/mex_gateways/tests/9src b/matlab/mex_gateways/tests/9src
diff --git a/matlab/mex_gateways/tests/a9src b/matlab/mex_gateways/tests/a9src
diff --git a/matlab/mex_gateways/tests/checktest b/matlab/mex_gateways/tests/checktest
diff --git a/matlab/mex_gateways/tests/makefiles/Makefile.common b/matlab/mex_gateways/tests/makefiles/Makefile.common
@@ -79,6 +79,8 @@ SOLVER_DIR := $(FORTRAN_DIR)/$(SOLVER)
 MEXGATE_DIR := $(TEST_DIR)/..
 # Source directories.
 SRC_DIRS := $(COMMON_DIR) $(SOLVER_DIR)
+# Tools directory
+TOOLS_DIR := $(TEST_DIR)/tools
 
 # MEX_DEBUGF90 is the name of the MEX file that defines `debug_mod`, which has a common version
 # named CMN_DEBUGF90. We should use the MEX version in place of the common one when testing the MEX
@@ -101,7 +103,7 @@ SRC := $(COMMON_SRC) $(SOLVER_SRC) $(MEXGATE_SRC)
 HEADERS := $(TEST_SOLVER_DIR)/$(COMMON)/*.h
 
 # The checktest script.
-CHCKTST := $(TEST_DIR)/checktest
+CHCKTST := $(TOOLS_DIR)/checktest
 
 # Define the tests.
 ######################################################################################
@@ -611,19 +613,19 @@ source_%: $(SRC_DIRS)
 		\) -exec rm {} \;  # Cleaning up; important!!!
 	@if echo $@ | grep -q "stest"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../sunsrc ./ ; \
+		bash $(TOOLS_DIR)/sunsrc ./ ; \
 	fi
 	@if echo $@ | grep -q "9test"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../9src ./ ; \
+		bash $(TOOLS_DIR)/9src ./ ; \
 	fi
 	@if echo $@ | grep -q "atest\|9test"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../a9src ./ ; \
+		bash $(TOOLS_DIR)/a9src ./ ; \
 	fi
 	@if echo $@ | grep -q "stest\|9test"; then \
 		printf "\nPreparing the source code for $@.\n" ; \
-		bash ../s9src ./ ; \
+		bash $(TOOLS_DIR)/s9src ./ ; \
 	fi
 	@printf "Done.\n"
 

diff --git a/matlab/mex_gateways/tests/sunsrc b/matlab/mex_gateways/tests/sunsrc
diff --git a/matlab/mex_gateways/tests/tools b/matlab/mex_gateways/tests/tools
@@ -0,0 +1 @@
+../../../fortran/tests/tools/