Selaa lähdekoodia

`catch-runner` isn't even a thing

default_compile_flags
vector-of-bool 5 vuotta sitten
vanhempi
commit
def2bad758
3 muutettua tiedostoa jossa 2 lisäystä ja 8 poistoa
  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 Näytä tiedosto



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


std::string fname; std::string fname;
if (test_driver == test_lib::catch_main) { if (test_driver == test_lib::catch_main) {
fname = "catch-main.cpp"; fname = "catch-main.cpp";
definition = "CATCH_CONFIG_MAIN"; definition = "CATCH_CONFIG_MAIN";
} else if (test_driver == test_lib::catch_runner) {
fname = "catch-runner.cpp";
definition = "CATCH_CONFIG_RUNNER";
} else { } else {
assert(false && "Impossible: Invalid `test_driver` for catch library"); assert(false && "Impossible: Invalid `test_driver` for catch library");
std::terminate(); std::terminate();
const package_manifest& man, const package_manifest& man,
build_env_ref env) { build_env_ref env) {
auto& test_driver = *man.test_driver; 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); prepare_catch2_driver(lib_params, test_driver, params, env);
} else { } else {
assert(false && "Unreachable"); assert(false && "Unreachable");

+ 0
- 2
src/dds/package_manifest.cpp Näytä tiedosto

auto& test_driver_str = *opt_test_driver; auto& test_driver_str = *opt_test_driver;
if (test_driver_str == "Catch-Main") { if (test_driver_str == "Catch-Main") {
ret.test_driver = test_lib::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") { } else if (test_driver_str == "Catch") {
ret.test_driver = test_lib::catch_; ret.test_driver = test_lib::catch_;
} else { } else {

+ 0
- 1
src/dds/package_manifest.hpp Näytä tiedosto

enum class test_lib { enum class test_lib {
catch_, catch_,
catch_main, catch_main,
catch_runner,
}; };


struct package_manifest { struct package_manifest {

Loading…
Peruuta
Tallenna