mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only run the unit tests with postgresql if TEST_POSTGRES_URI env var is set

Browse Source 
Even if we built with postgresql’s support
This commit is contained in:
louiz’
2017-12-12 23:37:08 +01:00
parent c3313d0d41
commit 53fc926dc8
2 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
-11
View File
@@ -65,13 +65,11 @@ build:alpine:
build:1: build:1:
variables: variables:
BOTAN: "-DWITHOUT_BOTAN=1" BOTAN: "-DWITHOUT_BOTAN=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build <<: *fedora_build
build:2: build:2:
variables: variables:
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build <<: *fedora_build
build:3: build:3:
@@ -92,7 +90,6 @@ build:4:
build:5: build:5:
variables: variables:
SQLITE3: "-DWITHOUT_SQLITE3=1"
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
TEST_POSTGRES_URI: "postgres@postgres/postgres" TEST_POSTGRES_URI: "postgres@postgres/postgres"
services: services:
@@ -103,21 +100,13 @@ build:6:
variables: variables:
BOTAN: "-DWITHOUT_BOTAN=1" BOTAN: "-DWITHOUT_BOTAN=1"
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build <<: *fedora_build
build:7: build:7:
variables: variables:
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build <<: *fedora_build
build:8:
variables:
POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
<<: *fedora_build
# #
## Test jobs ## Test jobs
# #
tests/database.cpp
+3 -6
View File
@@ -16,13 +16,10 @@ TEST_CASE("Database")
std::string postgresql_uri{"postgresql://"}; std::string postgresql_uri{"postgresql://"};
const char* env_value = ::getenv("TEST_POSTGRES_URI"); const char* env_value = ::getenv("TEST_POSTGRES_URI");
if (env_value != nullptr) if (env_value != nullptr)
postgresql_uri += env_value; Database::open("postgresql://"s + env_value);
else else
postgresql_uri += "/test";
Database::open(postgresql_uri);
#else
Database::open(":memory:");
#endif #endif
Database::open(":memory:");
Database::raw_exec("DELETE FROM " + Database::irc_server_options.get_name()); Database::raw_exec("DELETE FROM " + Database::irc_server_options.get_name());
Database::raw_exec("DELETE FROM " + Database::irc_channel_options.get_name()); Database::raw_exec("DELETE FROM " + Database::irc_channel_options.get_name());
@@ -121,5 +118,5 @@ TEST_CASE("Database")
} }
Database::close(); Database::close();
#endif
} }
#endif