From 0275aacac6835b2ee0b1b579e93963691ab9e8bd Mon Sep 17 00:00:00 2001
From: Özgür Kesim <oec-taler@kesim.org>
Date: Tue, 23 Jan 2024 08:59:03 +0100
Subject: [ci] fixing CI testing, down to 4 out of 15 failing, WIP

---
 contrib/ci/jobs/2-test/test.sh             |  3 ++-
 src/backenddb/plugin_merchantdb_postgres.c | 10 ----------
 src/testing/test.conf                      |  2 ++
 src/testing/test_kyc_api.conf              |  3 +++
 src/testing/test_merchant_api.conf         |  3 +++
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
index 121c12f8..68adb1b7 100755
--- a/contrib/ci/jobs/2-test/test.sh
+++ b/contrib/ci/jobs/2-test/test.sh
@@ -6,6 +6,7 @@ apt-get upgrade -yqq
 
 ./bootstrap
 ./configure CFLAGS="-ggdb -O0" \
+	    --prefix=/usr \
 	    --enable-logging=verbose \
 	    --disable-doc
 make -j install
@@ -18,7 +19,7 @@ sudo -u postgres createdb -p 5432 -O root talercheck
 check_command()
 {
 	# Set LD_LIBRARY_PATH so tests can find the installed libs
-	LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib/taler PGPORT=5432 make check
+	LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/taler:/usr/lib/taler PGPORT=5432 make check
 }
 
 print_logs()
diff --git a/src/backenddb/plugin_merchantdb_postgres.c b/src/backenddb/plugin_merchantdb_postgres.c
index 96b7ac5f..40fb1d19 100644
--- a/src/backenddb/plugin_merchantdb_postgres.c
+++ b/src/backenddb/plugin_merchantdb_postgres.c
@@ -202,9 +202,6 @@ postgres_create_tables (void *cls)
     GNUNET_PQ_make_try_execute ("SET search_path TO merchant;"),
     GNUNET_PQ_EXECUTE_STATEMENT_END
   };
-  struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_end
-  };
   enum GNUNET_GenericReturnValue ret;
 
   conn = GNUNET_PQ_connect_with_cfg (pc->cfg,
@@ -214,13 +211,6 @@ postgres_create_tables (void *cls)
                                      NULL);
   if (NULL == conn)
     return GNUNET_SYSERR;
-#if WTF_OEC
-  if (0 >
-      GNUNET_PQ_eval_prepared_non_select (conn,
-                                          "create_tables",
-                                          params))
-    ret = GNUNET_SYSERR;
-#endif
   ret = GNUNET_PQ_exec_sql (conn,
                             "procedures");
   GNUNET_PQ_disconnect (conn);
diff --git a/src/testing/test.conf b/src/testing/test.conf
index 4e91d594..a338e22e 100644
--- a/src/testing/test.conf
+++ b/src/testing/test.conf
@@ -40,6 +40,7 @@ HTTP_PORT = 8082
 
 # Which port do we run the backend on? (HTTP server)
 PORT = 8080
+SERVE = http
 
 # Which plugin (backend) do we use for the DB.
 DB = postgres
@@ -47,6 +48,7 @@ DB = postgres
 # This specifies which database the postgres backend uses.
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
+SQL_DIR = $DATADIR/sql/merchant/
 
 # Sections starting with "merchant-exchange-" specify trusted exchanges
 # (by the merchant)
diff --git a/src/testing/test_kyc_api.conf b/src/testing/test_kyc_api.conf
index cc0a3824..ce5151a2 100644
--- a/src/testing/test_kyc_api.conf
+++ b/src/testing/test_kyc_api.conf
@@ -19,10 +19,13 @@ HTTP_PORT = 8082
 
 [merchant]
 PORT = 8080
+SERVE = http
+DB = postgres
 
 # This specifies which database the postgres backend uses.
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
+SQL_DIR = $DATADIR/sql/merchant/
 
 [merchant-exchange-test]
 MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
diff --git a/src/testing/test_merchant_api.conf b/src/testing/test_merchant_api.conf
index a676c87e..c09bafe0 100644
--- a/src/testing/test_merchant_api.conf
+++ b/src/testing/test_merchant_api.conf
@@ -32,9 +32,12 @@ PORT = 8082
 
 [merchant]
 PORT = 8080
+SERVE = http
+DB = postgres
 
 [merchantdb-postgres]
 CONFIG = postgres:///talercheck
+SQL_DIR = $DATADIR/sql/merchant/
 
 [merchant-exchange-test]
 MASTER_KEY = NKX42KSCQHDQK7CF1PC6X9DMQPXW6KHXKGD3DPQJMP32FKXSWYK0
-- 
cgit v1.2.3