From 78b95b337ee64f7cb46efee5ac9b7e7831141294 Mon Sep 17 00:00:00 2001
From: Adriano dos Santos Fernandes <adrianosf@gmail.com>
Date: Tue, 19 Jul 2022 21:44:42 -0300
Subject: [PATCH] Move tests directory to avoid problem with non-system shared
 libraries.

---
 builds/posix/make.defaults | 6 +++---
 configure.ac               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index 5c6b0affe8..7056e8ac61 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -53,7 +53,6 @@ RE2_BUILD_FLG=@RE2_BUILD@
 SYSTEM_BOOST_FLG=@SYSTEM_BOOST@
 
 FB_BUILD=$(GEN_ROOT)/$(TARGET)/firebird
-FB_TEST_BUILD=$(GEN_ROOT)/$(TARGET)/tests
 
 ifeq ($(IsCross), Y)
   FIREBIRD=$(GEN_ROOT)/Native/firebird
@@ -73,6 +72,7 @@ LIB=$(FB_BUILD)/lib
 BIN=$(FB_BUILD)/bin
 PLUGINS=$(FB_BUILD)/plugins
 RBIN=$(FIREBIRD)/bin
+FB_TESTS_DIR=$(FB_BUILD)/tests
 
 # This picks up the current directory and maps it to the equivalent module
 # in the src and gen area.
@@ -255,7 +255,7 @@ LIBFIREBIRD_BASENAME = $(LIB)/$(LibrarySoName)
 EngineFileName=libEngine${OdsVersion}
 EngineSoName=$(EngineFileName).${SHRLIB_EXT}
 ENGINE_SONAME = $(PLUGINS)/$(EngineSoName)
-ENGINE_TEST = $(FB_TEST_BUILD)/$(EngineFileName)_test$(EXEC_EXT)
+ENGINE_TEST = $(FB_TESTS_DIR)/$(EngineFileName)_test$(EXEC_EXT)
 
 # intl will load dynamically, and having the whole soname set with version
 # confuses the dynamic load process.  So we only have the .$(SHRLIB_EXT) file
@@ -389,7 +389,7 @@ LINK_PLUG_LIBS = -L$(LIB) $(SO_LINK_LIBS)
 # Pay attention - we place common library into obj, not lib dir
 # It's just a set of object files, prepared to be used by ld, not an output library
 COMMON_LIB	= $(OBJ)/common.a
-COMMON_TEST = $(FB_TEST_BUILD)/common_test$(EXEC_EXT)
+COMMON_TEST = $(FB_TESTS_DIR)/common_test$(EXEC_EXT)
 
 # From utilities
 CREATE_DB	= $(RBIN)/create_db$(EXEC_EXT)
diff --git a/configure.ac b/configure.ac
index bae40d2366..af7f404b12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1311,7 +1311,7 @@ dnl # output
 	mkdir -p gen/\$fb_tgt/firebird/include/firebird/impl
 	mkdir -p gen/\$fb_tgt/firebird/lib
 	mkdir -p gen/\$fb_tgt/firebird/misc
-	mkdir -p gen/\$fb_tgt/tests
+	mkdir -p gen/\$fb_tgt/firebird/tests
 
 dnl ### TEMP ### directories for generated .cpp, .o and .d by module name
 	for src_dir in `cd src; ls -R -1 * | grep : | tr -d : | tr "\n" " "; cd ..`; do