Taken from upstream. From b0cd77e588620465b78f7c017d3f240e13936aa3 Mon Sep 17 00:00:00 2001 From: Pavlo Solntsev Date: Sun, 19 Sep 2021 22:51:38 -0500 Subject: [PATCH] Test: Skip test if no server available Two variables will be checked. If they set and provide all needed information the test will be executed. If they are not set, the test will return TRUE and will terminate with termination status EXIT_SUCCESS. --- tests/db/check-db-catalog-postgresql.c | 16 ++++++++++++++++ tests/test-server-operation-postgresql.c | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/tests/db/check-db-catalog-postgresql.c b/tests/db/check-db-catalog-postgresql.c index 5b8e9395c..bf9a8942c 100644 --- a/tests/db/check-db-catalog-postgresql.c +++ b/tests/db/check-db-catalog-postgresql.c @@ -25,6 +25,9 @@ #include #include "../test-cnc-utils.h" +#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS" +#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS" + typedef struct { GdaDbCatalog *catalog; GdaConnection *cnc; @@ -359,6 +362,19 @@ main (gint argc, { setlocale (LC_ALL,""); + const gchar *db_create_str; + const gchar *cnc_params; + + db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS); + cnc_params = g_getenv (PROVIDER_CNC_PARAMS); + + if (!db_create_str || !cnc_params) { + g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable" + "with dbname, host, user and port (usually 5432)\n"); + g_print ("Test will not be performed\n"); + return EXIT_SUCCESS; + } + g_test_init (&argc,&argv,NULL); g_test_add ("/test-db-postgresql/meta-tables", diff --git a/tests/test-server-operation-postgresql.c b/tests/test-server-operation-postgresql.c index 37796c4be..860f41a18 100644 --- a/tests/test-server-operation-postgresql.c +++ b/tests/test-server-operation-postgresql.c @@ -38,9 +38,12 @@ #include #include #include +/*#include */ #include "test-cnc-utils.h" #define PROVIDER_NAME "PostgreSQL" +#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS" +#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS" #define GDA_PGSQL_ERROR_HANDLE(e) (g_print("Error: %s: %s\n", G_STRLOC, e && e->message ? e->message : "No default")); @@ -1335,6 +1338,19 @@ main(gint argc, gchar *argv[]) { setlocale (LC_ALL,""); + const gchar *db_create_str; + const gchar *cnc_params; + + db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS); + cnc_params = g_getenv (PROVIDER_CNC_PARAMS); + + if (!db_create_str || !cnc_params) { + g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable" + "with dbname, host, user and port (usually 5432)\n"); + g_print ("Test will not be performed\n"); + return EXIT_SUCCESS; + } + g_test_init (&argc,&argv,NULL); g_test_add ("/test-server-operation-sqlite/old-so-module", -- GitLab e to 2023.09.4. [arguments]: Skip testConrec test in check phase. [native-inputs]: Replace catch2 with catch2-3. * gnu/packages/patches/rdkit-unbundle-external-dependencies.patch: Adjust patch. [supported-systems]: New field. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: freesasa: Fix memerr tests....* gnu/packages/chemistry.scm (freesasa)[arguments]: Add "CFLAGS=-fno-builtin-malloc" to #:configure-flags. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: avalon-toolkit: Update to 2.0.5a....The bug freeing static memory and the makefile have been improved upstream, so we don't have to work around them anymore. Now, two static libraries are built instead. * gnu/packages/chemistry.scm (avalon-toolkit): Update to 2.0.5a. [source]: Switch to git reference from GitHub. Adjust snippet. Add patch from the RDKit fork. [arguments]: Remove 'dont-free-static-memory phase. Use provided makefile. Adjust 'install phase. * gnu/packages/patches/avalon-toolkit-rdkit-fixes.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: yaehmop: Update to 2023.03.1....* gnu/packages/chemistry.scm (yaehmop): Update to 2023.03.1. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: coordgenlibs: Update to 3.0.2....* gnu/packages/chemistry.scm (coordgenlibs): Update to 3.0.2. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: maeparser: Update to 1.3.1....* gnu/packages/chemistry.scm (maeparser): Update to 1.3.1. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-02-13gnu: gemmi: Update to 0.6.4....* gnu/packages/chemistry.scm (gemmi): Update to 0.6.4. [arguments]: Adjust include/gemmi/sprintf.hpp -> src/sprintf.cpp. (freesasa)[arguments]: Link to gemmi_cpp explicitly. Signed-off-by: Christopher Baines <mail@cbaines.net> David Elsing 2024-01-09gnu: msgpack: Deprecate with msgpack-c....* gnu/packages/serialization.scm (msgpack-c): New variable. (msgpack-cxx): New variable. (msgpack): Rename to... (msgpack-3): ... this, and inherit from msgpack-c. * gnu/packages/vim.scm (eovim) [arguments]: Add help-cmake-find-msgpack-c phase. [inputs]: Replace msgpack with msgpack-c. * gnu/packages/terminals.scm (tmate) [inputs]: Replace msgpack with msgpack-3. * gnu/packages/networking.scm (opendht) [propagated-inputs]: Replace msgpack with msgpack-cxx. * gnu/packages/chemistry.scm (mmtf-cpp) [propagated-inputs]: Likewise. Maxim Cournoyer