merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Tue, 09 Jul 2019 12:53:33 +0200
branchsync
changeset 3921f8d3301d3c5e
parent 3920 3c80ba77d6f2
child 3922 a2ebf83845c9
merge
test/src/SuiteMaker.cc
     1.1 --- a/test/src/SuiteMaker.cc	Tue Jul 09 12:50:59 2019 +0200
     1.2 +++ b/test/src/SuiteMaker.cc	Tue Jul 09 12:53:33 2019 +0200
     1.3 @@ -21,6 +21,7 @@
     1.4  #include "Engine463Tests.h"
     1.5  #include "IOS1664Tests.h"
     1.6  #include "BloblistTests.h"
     1.7 +#include "KeyImportAndRetrieveTests.h"
     1.8  #include "NewUpdateIdAndMyselfTests.h"
     1.9  #include "NoOwnIdentWritesOnDecryptTests.h"
    1.10  #include "LiteralFilenameTests.h"
    1.11 @@ -29,6 +30,7 @@
    1.12  #include "PgpBinaryTests.h"
    1.13  #include "SubkeyRatingEvalTests.h"
    1.14  #include "MessageNullFromTests.h"
    1.15 +#include "Engine587Tests.h"
    1.16  #include "ExportKeyTests.h"
    1.17  #include "LeastCommonDenomColorTests.h"
    1.18  #include "StringlistTests.h"
    1.19 @@ -87,6 +89,7 @@
    1.20      "Engine463Tests",
    1.21      "IOS1664Tests",
    1.22      "BloblistTests",
    1.23 +    "KeyImportAndRetrieveTests",
    1.24      "NewUpdateIdAndMyselfTests",
    1.25      "NoOwnIdentWritesOnDecryptTests",
    1.26      "LiteralFilenameTests",
    1.27 @@ -95,6 +98,7 @@
    1.28      "PgpBinaryTests",
    1.29      "SubkeyRatingEvalTests",
    1.30      "MessageNullFromTests",
    1.31 +    "Engine587Tests",
    1.32      "ExportKeyTests",
    1.33      "LeastCommonDenomColorTests",
    1.34      "StringlistTests",
    1.35 @@ -144,7 +148,7 @@
    1.36  };
    1.37  
    1.38  // This file is generated, so magic constants are ok.
    1.39 -int SuiteMaker::num_suites = 63;
    1.40 +int SuiteMaker::num_suites = 65;
    1.41  
    1.42  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    1.43      if (strcmp(test_class_name, "URIAddressTests") == 0)
    1.44 @@ -165,6 +169,8 @@
    1.45          *test_suite = new IOS1664Tests(test_class_name, test_home);
    1.46      else if (strcmp(test_class_name, "BloblistTests") == 0)
    1.47          *test_suite = new BloblistTests(test_class_name, test_home);
    1.48 +    else if (strcmp(test_class_name, "KeyImportAndRetrieveTests") == 0)
    1.49 +        *test_suite = new KeyImportAndRetrieveTests(test_class_name, test_home);
    1.50      else if (strcmp(test_class_name, "NewUpdateIdAndMyselfTests") == 0)
    1.51          *test_suite = new NewUpdateIdAndMyselfTests(test_class_name, test_home);
    1.52      else if (strcmp(test_class_name, "NoOwnIdentWritesOnDecryptTests") == 0)
    1.53 @@ -181,6 +187,8 @@
    1.54          *test_suite = new SubkeyRatingEvalTests(test_class_name, test_home);
    1.55      else if (strcmp(test_class_name, "MessageNullFromTests") == 0)
    1.56          *test_suite = new MessageNullFromTests(test_class_name, test_home);
    1.57 +    else if (strcmp(test_class_name, "Engine587Tests") == 0)
    1.58 +        *test_suite = new Engine587Tests(test_class_name, test_home);
    1.59      else if (strcmp(test_class_name, "ExportKeyTests") == 0)
    1.60          *test_suite = new ExportKeyTests(test_class_name, test_home);
    1.61      else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)