~singpolyma/biboumi

53fc926dc847af55a13a6ac9ea852658b0b0ba4d — louiz’ 5 years ago c3313d0
Only run the unit tests with postgresql if TEST_POSTGRES_URI env var is set

Even if we built with postgresql’s support
2 files changed, 3 insertions(+), 17 deletions(-)

M .gitlab-ci.yml
M tests/database.cpp
M .gitlab-ci.yml => .gitlab-ci.yml +0 -11
@@ 65,13 65,11 @@ build:alpine:
build:1:
  variables:
    BOTAN: "-DWITHOUT_BOTAN=1"
    POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
  <<: *fedora_build

build:2:
  variables:
    UDNS: "-DWITHOUT_UDNS=1"
    POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
  <<: *fedora_build

build:3:


@@ 92,7 90,6 @@ build:4:

build:5:
  variables:
    SQLITE3: "-DWITHOUT_SQLITE3=1"
    UDNS: "-DWITHOUT_UDNS=1"
    TEST_POSTGRES_URI: "postgres@postgres/postgres"
  services:


@@ 103,21 100,13 @@ build:6:
  variables:
    BOTAN: "-DWITHOUT_BOTAN=1"
    UDNS: "-DWITHOUT_UDNS=1"
    POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
  <<: *fedora_build

build:7:
  variables:
    UDNS: "-DWITHOUT_UDNS=1"
    POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
  <<: *fedora_build

build:8:
  variables:
    POSTGRESQL: "-DWITHOUT_POSTGRESQL=1"
  <<: *fedora_build


#
## Test jobs
#

M tests/database.cpp => tests/database.cpp +3 -6
@@ 16,13 16,10 @@ TEST_CASE("Database")
  std::string postgresql_uri{"postgresql://"};
  const char* env_value = ::getenv("TEST_POSTGRES_URI");
  if (env_value != nullptr)
    postgresql_uri += env_value;
    Database::open("postgresql://"s + env_value);
  else
    postgresql_uri += "/test";
  Database::open(postgresql_uri);
#else
  Database::open(":memory:");
#endif
    Database::open(":memory:");

  Database::raw_exec("DELETE FROM " + Database::irc_server_options.get_name());
  Database::raw_exec("DELETE FROM " + Database::irc_channel_options.get_name());


@@ 121,5 118,5 @@ TEST_CASE("Database")
    }

  Database::close();
#endif
}
#endif