Browse Source

`catch-runner` isn't even a thing

default_compile_flags
vector-of-bool 5 years ago
parent
commit
def2bad758
3 changed files with 2 additions and 8 deletions
  1. +2
    -5
      src/dds/build.cpp
  2. +0
    -2
      src/dds/package_manifest.cpp
  3. +0
    -1
      src/dds/package_manifest.hpp

+ 2
- 5
src/dds/build.cpp View File

@@ -133,6 +133,7 @@ void prepare_catch2_driver(library_build_params& lib_params,

if (test_driver == test_lib::catch_) {
// Don't generate a test library helper
return;
}

std::string fname;
@@ -141,9 +142,6 @@ void prepare_catch2_driver(library_build_params& lib_params,
if (test_driver == test_lib::catch_main) {
fname = "catch-main.cpp";
definition = "CATCH_CONFIG_MAIN";
} else if (test_driver == test_lib::catch_runner) {
fname = "catch-runner.cpp";
definition = "CATCH_CONFIG_RUNNER";
} else {
assert(false && "Impossible: Invalid `test_driver` for catch library");
std::terminate();
@@ -179,8 +177,7 @@ void prepare_test_driver(library_build_params& lib_params,
const package_manifest& man,
build_env_ref env) {
auto& test_driver = *man.test_driver;
if (test_driver == test_lib::catch_ || test_driver == test_lib::catch_main
|| test_driver == test_lib::catch_runner) {
if (test_driver == test_lib::catch_ || test_driver == test_lib::catch_main) {
prepare_catch2_driver(lib_params, test_driver, params, env);
} else {
assert(false && "Unreachable");

+ 0
- 2
src/dds/package_manifest.cpp View File

@@ -37,8 +37,6 @@ package_manifest package_manifest::load_from_file(const fs::path& fpath) {
auto& test_driver_str = *opt_test_driver;
if (test_driver_str == "Catch-Main") {
ret.test_driver = test_lib::catch_main;
} else if (test_driver_str == "Catch-Runner") {
ret.test_driver = test_lib::catch_runner;
} else if (test_driver_str == "Catch") {
ret.test_driver = test_lib::catch_;
} else {

+ 0
- 1
src/dds/package_manifest.hpp View File

@@ -13,7 +13,6 @@ namespace dds {
enum class test_lib {
catch_,
catch_main,
catch_runner,
};

struct package_manifest {

Loading…
Cancel
Save