Browse Source

Upgraded to cpptest 2.0.0 compatibility - pre 2.0.0 cpptest will no longer compile! (There's no define to operate on for conditional compilation here, so I am just unilaterally upgrading, since the release is from January, and the previous release is more than 2 years old...

ENGINE-544
parent
commit
6aa94db8c6
2 changed files with 7 additions and 3 deletions
  1. +5
    -1
      test/src/SuiteMaker.cc
  2. +2
    -2
      test/src/TestDriver.cc

+ 5
- 1
test/src/SuiteMaker.cc View File

@ -67,6 +67,7 @@
#include "OwnKeysRetrieveTests.h"
#include "TrustManipulationTests.h"
#include "SyncTests.h"
#include "RevocationTests.h"
#include "AppleMailTests.h"
@ -126,11 +127,12 @@ const char* SuiteMaker::all_suites[] = {
"OwnKeysRetrieveTests",
"TrustManipulationTests",
"SyncTests",
"RevocationTests",
"AppleMailTests",
};
// This file is generated, so magic constants are ok.
int SuiteMaker::num_suites = 56;
int SuiteMaker::num_suites = 57;
void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
if (strcmp(test_class_name, "MimeTests") == 0)
@ -243,6 +245,8 @@ void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_
*test_suite = new TrustManipulationTests(test_class_name, test_home);
else if (strcmp(test_class_name, "SyncTests") == 0)
*test_suite = new SyncTests(test_class_name, test_home);
else if (strcmp(test_class_name, "RevocationTests") == 0)
*test_suite = new RevocationTests(test_class_name, test_home);
else if (strcmp(test_class_name, "AppleMailTests") == 0)
*test_suite = new AppleMailTests(test_class_name, test_home);
}


+ 2
- 2
test/src/TestDriver.cc View File

@ -65,8 +65,8 @@ int main(int argc, const char** argv) {
SuiteMaker::suitemaker_buildlist(&argv[1], argc - MIN_ARGC, common_test_home.c_str(), suites_to_run);
for (std::vector<Test::Suite*>::iterator it = suites_to_run.begin(); it != suites_to_run.end(); ++it) {
auto_ptr<Test::Suite> suite(*it);
test_runner->add(suite);
unique_ptr<Test::Suite> suite(*it);
test_runner->add(move(suite));
}
Test::Output* output = new Test::pEpTestOutput(); // blah


Loading…
Cancel
Save