adding path for GPGME includes
authorVolker Birk <vb@pep.foundation>
Fri, 15 Jun 2018 20:32:23 +0200
changeset 2749147e3b5d461f
parent 2748 a8db3d62c2fd
child 2750 ce57ed3d1f52
adding path for GPGME includes
test/Makefile
test/src/SuiteMaker.cc
     1.1 --- a/test/Makefile	Fri Jun 15 20:18:13 2018 +0200
     1.2 +++ b/test/Makefile	Fri Jun 15 20:32:23 2018 +0200
     1.3 @@ -17,8 +17,8 @@
     1.4  OBJS := $(addsuffix .o,$(basename $(SRCS)))
     1.5  DEPS := $(OBJS:.o=.d)
     1.6  
     1.7 -INC_DIRS := ./include /usr/local/include  
     1.8 -INC_FLAGS := $(addprefix -I,$(INC_DIRS))
     1.9 +INC_DIRS := ./include /usr/local/include 
    1.10 +INC_FLAGS := $(addprefix -I,$(INC_DIRS)) $(GPGME_INC)
    1.11  
    1.12  LDFLAGS += -L/usr/local/lib
    1.13  
     2.1 --- a/test/src/SuiteMaker.cc	Fri Jun 15 20:18:13 2018 +0200
     2.2 +++ b/test/src/SuiteMaker.cc	Fri Jun 15 20:32:23 2018 +0200
     2.3 @@ -12,159 +12,159 @@
     2.4  #include "SuiteMaker.h"
     2.5  
     2.6  // Begin where we generate stuff
     2.7 -#include "MapAsn1Tests.h"
     2.8 -#include "DecorateTests.h"
     2.9 -#include "EncryptMissingPrivateKeyTests.h"
    2.10 -#include "KeyeditTests.h"
    2.11 -#include "BlacklistAcceptNewKeyTests.h"
    2.12 -#include "DecryptAttachPrivateKeyUntrustedTests.h"
    2.13 -#include "AppleMailTests.h"
    2.14 -#include "CaseAndDotAddressTests.h"
    2.15 -#include "SequenceTests.h"
    2.16 -#include "BCCTests.h"
    2.17 -#include "MessageApiTests.h"
    2.18 -#include "I18nTests.h"
    2.19 -#include "CrashdumpTests.h"
    2.20 -#include "PgpBinaryTests.h"
    2.21 -#include "RevokeRegenAttachTests.h"
    2.22 -#include "BlacklistTests.h"
    2.23 -#include "LeastCommonDenomColorTests.h"
    2.24 -#include "PepSubjectReceivedTests.h"
    2.25 -#include "MistrustUndoTests.h"
    2.26 -#include "StringpairListTests.h"
    2.27 -#include "PgpListKeysTests.h"
    2.28 -#include "ReencryptPlusExtraKeysTests.h"
    2.29  #include "MimeTests.h"
    2.30  #include "BloblistTests.h"
    2.31  #include "NewUpdateIdAndMyselfTests.h"
    2.32 +#include "I18nTests.h"
    2.33 +#include "IdentityListTests.h"
    2.34 +#include "PgpBinaryTests.h"
    2.35 +#include "MistrustUndoTests.h"
    2.36 +#include "LeastCommonDenomColorTests.h"
    2.37  #include "StringlistTests.h"
    2.38 +#include "PgpListKeysTests.h"
    2.39 +#include "MessageApiTests.h"
    2.40 +#include "EncryptMissingPrivateKeyTests.h"
    2.41 +#include "CaseAndDotAddressTests.h"
    2.42 +#include "UserIDAliasTests.h"
    2.43 +#include "BCCTests.h"
    2.44 +#include "BlacklistAcceptNewKeyTests.h"
    2.45 +#include "DecryptAttachPrivateKeyUntrustedTests.h"
    2.46 +#include "BlacklistTests.h"
    2.47 +#include "RevokeRegenAttachTests.h"
    2.48 +#include "PepSubjectReceivedTests.h"
    2.49 +#include "SequenceTests.h"
    2.50 +#include "EncryptAttachPrivateKeyTests.h"
    2.51 +#include "ExternalRevokeTests.h"
    2.52 +#include "KeyeditTests.h"
    2.53  #include "LeastColorGroupTests.h"
    2.54 -#include "ExternalRevokeTests.h"
    2.55 +#include "DecryptAttachPrivateKeyTrustedTests.h"
    2.56 +#include "TrustwordsTests.h"
    2.57 +#include "ReencryptPlusExtraKeysTests.h"
    2.58 +#include "MapAsn1Tests.h"
    2.59 +#include "DecorateTests.h"
    2.60 +#include "MessageTwoPointOhTests.h"
    2.61 +#include "CrashdumpTests.h"
    2.62 +#include "StringpairListTests.h"
    2.63  #include "EncryptForIdentityTests.h"
    2.64 -#include "TrustwordsTests.h"
    2.65  #include "TrustManipulationTests.h"
    2.66 -#include "MessageTwoPointOhTests.h"
    2.67 -#include "EncryptAttachPrivateKeyTests.h"
    2.68 -#include "DecryptAttachPrivateKeyTrustedTests.h"
    2.69 -#include "IdentityListTests.h"
    2.70 -#include "UserIDAliasTests.h"
    2.71 +#include "AppleMailTests.h"
    2.72  
    2.73  
    2.74  const char* SuiteMaker::all_suites[] = {
    2.75 -    "MapAsn1Tests",
    2.76 -    "DecorateTests",
    2.77 -    "EncryptMissingPrivateKeyTests",
    2.78 -    "KeyeditTests",
    2.79 -    "BlacklistAcceptNewKeyTests",
    2.80 -    "DecryptAttachPrivateKeyUntrustedTests",
    2.81 -    "AppleMailTests",
    2.82 -    "CaseAndDotAddressTests",
    2.83 -    "SequenceTests",
    2.84 -    "BCCTests",
    2.85 -    "MessageApiTests",
    2.86 -    "I18nTests",
    2.87 -    "CrashdumpTests",
    2.88 -    "PgpBinaryTests",
    2.89 -    "RevokeRegenAttachTests",
    2.90 -    "BlacklistTests",
    2.91 -    "LeastCommonDenomColorTests",
    2.92 -    "PepSubjectReceivedTests",
    2.93 -    "MistrustUndoTests",
    2.94 -    "StringpairListTests",
    2.95 -    "PgpListKeysTests",
    2.96 -    "ReencryptPlusExtraKeysTests",
    2.97      "MimeTests",
    2.98      "BloblistTests",
    2.99      "NewUpdateIdAndMyselfTests",
   2.100 +    "I18nTests",
   2.101 +    "IdentityListTests",
   2.102 +    "PgpBinaryTests",
   2.103 +    "MistrustUndoTests",
   2.104 +    "LeastCommonDenomColorTests",
   2.105      "StringlistTests",
   2.106 +    "PgpListKeysTests",
   2.107 +    "MessageApiTests",
   2.108 +    "EncryptMissingPrivateKeyTests",
   2.109 +    "CaseAndDotAddressTests",
   2.110 +    "UserIDAliasTests",
   2.111 +    "BCCTests",
   2.112 +    "BlacklistAcceptNewKeyTests",
   2.113 +    "DecryptAttachPrivateKeyUntrustedTests",
   2.114 +    "BlacklistTests",
   2.115 +    "RevokeRegenAttachTests",
   2.116 +    "PepSubjectReceivedTests",
   2.117 +    "SequenceTests",
   2.118 +    "EncryptAttachPrivateKeyTests",
   2.119 +    "ExternalRevokeTests",
   2.120 +    "KeyeditTests",
   2.121      "LeastColorGroupTests",
   2.122 -    "ExternalRevokeTests",
   2.123 +    "DecryptAttachPrivateKeyTrustedTests",
   2.124 +    "TrustwordsTests",
   2.125 +    "ReencryptPlusExtraKeysTests",
   2.126 +    "MapAsn1Tests",
   2.127 +    "DecorateTests",
   2.128 +    "MessageTwoPointOhTests",
   2.129 +    "CrashdumpTests",
   2.130 +    "StringpairListTests",
   2.131      "EncryptForIdentityTests",
   2.132 -    "TrustwordsTests",
   2.133      "TrustManipulationTests",
   2.134 -    "MessageTwoPointOhTests",
   2.135 -    "EncryptAttachPrivateKeyTests",
   2.136 -    "DecryptAttachPrivateKeyTrustedTests",
   2.137 -    "IdentityListTests",
   2.138 -    "UserIDAliasTests",
   2.139 +    "AppleMailTests",
   2.140  };
   2.141  
   2.142  // This file is generated, so magic constants are ok.
   2.143  int SuiteMaker::num_suites = 36;
   2.144  
   2.145  void SuiteMaker::suitemaker_build(const char* test_class_name, const char* test_home, Test::Suite** test_suite) {
   2.146 -    if (strcmp(test_class_name, "MapAsn1Tests") == 0)
   2.147 -        *test_suite = new MapAsn1Tests(test_class_name, test_home);
   2.148 -    else if (strcmp(test_class_name, "DecorateTests") == 0)
   2.149 -        *test_suite = new DecorateTests(test_class_name, test_home);
   2.150 -    else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
   2.151 -        *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
   2.152 -    else if (strcmp(test_class_name, "KeyeditTests") == 0)
   2.153 -        *test_suite = new KeyeditTests(test_class_name, test_home);
   2.154 -    else if (strcmp(test_class_name, "BlacklistAcceptNewKeyTests") == 0)
   2.155 -        *test_suite = new BlacklistAcceptNewKeyTests(test_class_name, test_home);
   2.156 -    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyUntrustedTests") == 0)
   2.157 -        *test_suite = new DecryptAttachPrivateKeyUntrustedTests(test_class_name, test_home);
   2.158 -    else if (strcmp(test_class_name, "AppleMailTests") == 0)
   2.159 -        *test_suite = new AppleMailTests(test_class_name, test_home);
   2.160 -    else if (strcmp(test_class_name, "CaseAndDotAddressTests") == 0)
   2.161 -        *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
   2.162 -    else if (strcmp(test_class_name, "SequenceTests") == 0)
   2.163 -        *test_suite = new SequenceTests(test_class_name, test_home);
   2.164 -    else if (strcmp(test_class_name, "BCCTests") == 0)
   2.165 -        *test_suite = new BCCTests(test_class_name, test_home);
   2.166 -    else if (strcmp(test_class_name, "MessageApiTests") == 0)
   2.167 -        *test_suite = new MessageApiTests(test_class_name, test_home);
   2.168 -    else if (strcmp(test_class_name, "I18nTests") == 0)
   2.169 -        *test_suite = new I18nTests(test_class_name, test_home);
   2.170 -    else if (strcmp(test_class_name, "CrashdumpTests") == 0)
   2.171 -        *test_suite = new CrashdumpTests(test_class_name, test_home);
   2.172 -    else if (strcmp(test_class_name, "PgpBinaryTests") == 0)
   2.173 -        *test_suite = new PgpBinaryTests(test_class_name, test_home);
   2.174 -    else if (strcmp(test_class_name, "RevokeRegenAttachTests") == 0)
   2.175 -        *test_suite = new RevokeRegenAttachTests(test_class_name, test_home);
   2.176 -    else if (strcmp(test_class_name, "BlacklistTests") == 0)
   2.177 -        *test_suite = new BlacklistTests(test_class_name, test_home);
   2.178 -    else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)
   2.179 -        *test_suite = new LeastCommonDenomColorTests(test_class_name, test_home);
   2.180 -    else if (strcmp(test_class_name, "PepSubjectReceivedTests") == 0)
   2.181 -        *test_suite = new PepSubjectReceivedTests(test_class_name, test_home);
   2.182 -    else if (strcmp(test_class_name, "MistrustUndoTests") == 0)
   2.183 -        *test_suite = new MistrustUndoTests(test_class_name, test_home);
   2.184 -    else if (strcmp(test_class_name, "StringpairListTests") == 0)
   2.185 -        *test_suite = new StringpairListTests(test_class_name, test_home);
   2.186 -    else if (strcmp(test_class_name, "PgpListKeysTests") == 0)
   2.187 -        *test_suite = new PgpListKeysTests(test_class_name, test_home);
   2.188 -    else if (strcmp(test_class_name, "ReencryptPlusExtraKeysTests") == 0)
   2.189 -        *test_suite = new ReencryptPlusExtraKeysTests(test_class_name, test_home);
   2.190 -    else if (strcmp(test_class_name, "MimeTests") == 0)
   2.191 +    if (strcmp(test_class_name, "MimeTests") == 0)
   2.192          *test_suite = new MimeTests(test_class_name, test_home);
   2.193      else if (strcmp(test_class_name, "BloblistTests") == 0)
   2.194          *test_suite = new BloblistTests(test_class_name, test_home);
   2.195      else if (strcmp(test_class_name, "NewUpdateIdAndMyselfTests") == 0)
   2.196          *test_suite = new NewUpdateIdAndMyselfTests(test_class_name, test_home);
   2.197 +    else if (strcmp(test_class_name, "I18nTests") == 0)
   2.198 +        *test_suite = new I18nTests(test_class_name, test_home);
   2.199 +    else if (strcmp(test_class_name, "IdentityListTests") == 0)
   2.200 +        *test_suite = new IdentityListTests(test_class_name, test_home);
   2.201 +    else if (strcmp(test_class_name, "PgpBinaryTests") == 0)
   2.202 +        *test_suite = new PgpBinaryTests(test_class_name, test_home);
   2.203 +    else if (strcmp(test_class_name, "MistrustUndoTests") == 0)
   2.204 +        *test_suite = new MistrustUndoTests(test_class_name, test_home);
   2.205 +    else if (strcmp(test_class_name, "LeastCommonDenomColorTests") == 0)
   2.206 +        *test_suite = new LeastCommonDenomColorTests(test_class_name, test_home);
   2.207      else if (strcmp(test_class_name, "StringlistTests") == 0)
   2.208          *test_suite = new StringlistTests(test_class_name, test_home);
   2.209 +    else if (strcmp(test_class_name, "PgpListKeysTests") == 0)
   2.210 +        *test_suite = new PgpListKeysTests(test_class_name, test_home);
   2.211 +    else if (strcmp(test_class_name, "MessageApiTests") == 0)
   2.212 +        *test_suite = new MessageApiTests(test_class_name, test_home);
   2.213 +    else if (strcmp(test_class_name, "EncryptMissingPrivateKeyTests") == 0)
   2.214 +        *test_suite = new EncryptMissingPrivateKeyTests(test_class_name, test_home);
   2.215 +    else if (strcmp(test_class_name, "CaseAndDotAddressTests") == 0)
   2.216 +        *test_suite = new CaseAndDotAddressTests(test_class_name, test_home);
   2.217 +    else if (strcmp(test_class_name, "UserIDAliasTests") == 0)
   2.218 +        *test_suite = new UserIDAliasTests(test_class_name, test_home);
   2.219 +    else if (strcmp(test_class_name, "BCCTests") == 0)
   2.220 +        *test_suite = new BCCTests(test_class_name, test_home);
   2.221 +    else if (strcmp(test_class_name, "BlacklistAcceptNewKeyTests") == 0)
   2.222 +        *test_suite = new BlacklistAcceptNewKeyTests(test_class_name, test_home);
   2.223 +    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyUntrustedTests") == 0)
   2.224 +        *test_suite = new DecryptAttachPrivateKeyUntrustedTests(test_class_name, test_home);
   2.225 +    else if (strcmp(test_class_name, "BlacklistTests") == 0)
   2.226 +        *test_suite = new BlacklistTests(test_class_name, test_home);
   2.227 +    else if (strcmp(test_class_name, "RevokeRegenAttachTests") == 0)
   2.228 +        *test_suite = new RevokeRegenAttachTests(test_class_name, test_home);
   2.229 +    else if (strcmp(test_class_name, "PepSubjectReceivedTests") == 0)
   2.230 +        *test_suite = new PepSubjectReceivedTests(test_class_name, test_home);
   2.231 +    else if (strcmp(test_class_name, "SequenceTests") == 0)
   2.232 +        *test_suite = new SequenceTests(test_class_name, test_home);
   2.233 +    else if (strcmp(test_class_name, "EncryptAttachPrivateKeyTests") == 0)
   2.234 +        *test_suite = new EncryptAttachPrivateKeyTests(test_class_name, test_home);
   2.235 +    else if (strcmp(test_class_name, "ExternalRevokeTests") == 0)
   2.236 +        *test_suite = new ExternalRevokeTests(test_class_name, test_home);
   2.237 +    else if (strcmp(test_class_name, "KeyeditTests") == 0)
   2.238 +        *test_suite = new KeyeditTests(test_class_name, test_home);
   2.239      else if (strcmp(test_class_name, "LeastColorGroupTests") == 0)
   2.240          *test_suite = new LeastColorGroupTests(test_class_name, test_home);
   2.241 -    else if (strcmp(test_class_name, "ExternalRevokeTests") == 0)
   2.242 -        *test_suite = new ExternalRevokeTests(test_class_name, test_home);
   2.243 +    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyTrustedTests") == 0)
   2.244 +        *test_suite = new DecryptAttachPrivateKeyTrustedTests(test_class_name, test_home);
   2.245 +    else if (strcmp(test_class_name, "TrustwordsTests") == 0)
   2.246 +        *test_suite = new TrustwordsTests(test_class_name, test_home);
   2.247 +    else if (strcmp(test_class_name, "ReencryptPlusExtraKeysTests") == 0)
   2.248 +        *test_suite = new ReencryptPlusExtraKeysTests(test_class_name, test_home);
   2.249 +    else if (strcmp(test_class_name, "MapAsn1Tests") == 0)
   2.250 +        *test_suite = new MapAsn1Tests(test_class_name, test_home);
   2.251 +    else if (strcmp(test_class_name, "DecorateTests") == 0)
   2.252 +        *test_suite = new DecorateTests(test_class_name, test_home);
   2.253 +    else if (strcmp(test_class_name, "MessageTwoPointOhTests") == 0)
   2.254 +        *test_suite = new MessageTwoPointOhTests(test_class_name, test_home);
   2.255 +    else if (strcmp(test_class_name, "CrashdumpTests") == 0)
   2.256 +        *test_suite = new CrashdumpTests(test_class_name, test_home);
   2.257 +    else if (strcmp(test_class_name, "StringpairListTests") == 0)
   2.258 +        *test_suite = new StringpairListTests(test_class_name, test_home);
   2.259      else if (strcmp(test_class_name, "EncryptForIdentityTests") == 0)
   2.260          *test_suite = new EncryptForIdentityTests(test_class_name, test_home);
   2.261 -    else if (strcmp(test_class_name, "TrustwordsTests") == 0)
   2.262 -        *test_suite = new TrustwordsTests(test_class_name, test_home);
   2.263      else if (strcmp(test_class_name, "TrustManipulationTests") == 0)
   2.264          *test_suite = new TrustManipulationTests(test_class_name, test_home);
   2.265 -    else if (strcmp(test_class_name, "MessageTwoPointOhTests") == 0)
   2.266 -        *test_suite = new MessageTwoPointOhTests(test_class_name, test_home);
   2.267 -    else if (strcmp(test_class_name, "EncryptAttachPrivateKeyTests") == 0)
   2.268 -        *test_suite = new EncryptAttachPrivateKeyTests(test_class_name, test_home);
   2.269 -    else if (strcmp(test_class_name, "DecryptAttachPrivateKeyTrustedTests") == 0)
   2.270 -        *test_suite = new DecryptAttachPrivateKeyTrustedTests(test_class_name, test_home);
   2.271 -    else if (strcmp(test_class_name, "IdentityListTests") == 0)
   2.272 -        *test_suite = new IdentityListTests(test_class_name, test_home);
   2.273 -    else if (strcmp(test_class_name, "UserIDAliasTests") == 0)
   2.274 -        *test_suite = new UserIDAliasTests(test_class_name, test_home);
   2.275 +    else if (strcmp(test_class_name, "AppleMailTests") == 0)
   2.276 +        *test_suite = new AppleMailTests(test_class_name, test_home);
   2.277  }
   2.278  
   2.279  void SuiteMaker::suitemaker_buildlist(const char** test_class_names, int num_to_run, const char* test_home, std::vector<Test::Suite*>& test_suites) {