Changed enum vals to match sync branch before pushing 1.3.0-RC-default
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Wed, 06 Feb 2019 13:47:13 +0100
changeset 32719425e2da65e4
parent 3269 165e254eebd6
child 3277 fe1e94372261
child 3278 98f201d173cf
Changed enum vals to match sync branch before pushing
src/pEpEngine.h
test/Makefile
test/src/SuiteMaker.cc
     1.1 --- a/src/pEpEngine.h	Tue Feb 05 16:30:18 2019 +0100
     1.2 +++ b/src/pEpEngine.h	Wed Feb 06 13:47:13 2019 +0100
     1.3 @@ -53,9 +53,9 @@
     1.4      PEP_CANNOT_EDIT_KEY                             = 0x0205,
     1.5      PEP_KEY_UNSUITABLE                              = 0x0206,
     1.6  
     1.7 -    PEP_KEY_IMPORTED                                = 0x0210,
     1.8 -    PEP_NO_KEY_IMPORTED                             = 0x0211,
     1.9 -    PEP_KEY_IMPORT_STATUS_UNKNOWN                   = 0x0212,
    1.10 +    PEP_KEY_IMPORTED                                = 0x0220,
    1.11 +    PEP_NO_KEY_IMPORTED                             = 0x0221,
    1.12 +    PEP_KEY_IMPORT_STATUS_UNKNOWN                   = 0x0222,
    1.13      
    1.14      PEP_CANNOT_FIND_IDENTITY                        = 0x0301,
    1.15      PEP_CANNOT_SET_PERSON                           = 0x0381,
     2.1 --- a/test/Makefile	Tue Feb 05 16:30:18 2019 +0100
     2.2 +++ b/test/Makefile	Wed Feb 06 13:47:13 2019 +0100
     2.3 @@ -34,7 +34,7 @@
     2.4  endif
     2.5  
     2.6  ifeq ($(OPENPGP),NETPGP)
     2.7 -	LDLIBS+= -lnetpgp
     2.8 +	LDLIBS+= -lnetpgp -lcrypto
     2.9  	CFLAGS+= -DUSE_NETPGP
    2.10  ifeq ($(BUILD_FOR),Linux)
    2.11  	LDLIBS+= -ltre
     3.1 --- a/test/src/SuiteMaker.cc	Tue Feb 05 16:30:18 2019 +0100
     3.2 +++ b/test/src/SuiteMaker.cc	Wed Feb 06 13:47:13 2019 +0100
     3.3 @@ -29,7 +29,6 @@
     3.4  #include "PgpListKeysTests.h"
     3.5  #include "MessageApiTests.h"
     3.6  #include "EncryptMissingPrivateKeyTests.h"
     3.7 -#include "NetPGPPlaygroundTests.h"
     3.8  #include "CaseAndDotAddressTests.h"
     3.9  #include "UserIDAliasTests.h"
    3.10  #include "BCCTests.h"
    3.11 @@ -80,7 +79,6 @@
    3.12      "PgpListKeysTests",
    3.13      "MessageApiTests",
    3.14      "EncryptMissingPrivateKeyTests",
    3.15 -    "NetPGPPlaygroundTests",
    3.16      "CaseAndDotAddressTests",
    3.17      "UserIDAliasTests",
    3.18      "BCCTests",
    3.19 @@ -114,7 +112,7 @@
    3.20  };
    3.21  
    3.22  // This file is generated, so magic constants are ok.
    3.23 -int SuiteMaker::num_suites = 48;
    3.24 +int SuiteMaker::num_suites = 47;
    3.25  
    3.26  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
    3.27      if (strcmp(test_class_name, "MimeTests") == 0)
    3.28 @@ -151,8 +149,6 @@
    3.29          *test_suite = new MessageApiTests(test_class_name, test_home);
    3.30      else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
    3.31          *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
    3.32 -    else if (strcmp(test_class_name, "NetPGPPlaygroundTests") == 0)
    3.33 -        *test_suite = new NetPGPPlaygroundTests(test_class_name, test_home);
    3.34      else if (strcmp(test_class_name, "CaseAndDotAddressTests") == 0)
    3.35          *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
    3.36      else if (strcmp(test_class_name, "UserIDAliasTests") == 0)