Also disable gpg stuff for Sequoia sync
authorNeal H. Walfield <neal@pep.foundation>
Mon, 11 Mar 2019 15:40:48 +0100
branchsync
changeset 3333189b5a5eca19
parent 3332 1bdce679b688
child 3334 87d3aec0cf31
Also disable gpg stuff for Sequoia

- Leave commented, as for the USE_NETPGP case.
test/src/EngineTestSuite.cc
     1.1 --- a/test/src/EngineTestSuite.cc	Mon Mar 11 15:39:57 2019 +0100
     1.2 +++ b/test/src/EngineTestSuite.cc	Mon Mar 11 15:40:48 2019 +0100
     1.3 @@ -107,10 +107,12 @@
     1.4  
     1.5  // // FIXME
     1.6  // #ifndef USE_NETPGP
     1.7 +// #ifndef USE_SEQUOIA
     1.8  //     success = system("gpgconf --kill all");
     1.9  //     if (success != 0)
    1.10  //         throw std::runtime_error("SETUP: Error when executing 'gpgconf --kill all'.");    
    1.11  // #endif
    1.12 +// #endif
    1.13  
    1.14      if (stat(test_home.c_str(), &dirchk) == 0) {
    1.15          if (!S_ISDIR(dirchk.st_mode))
    1.16 @@ -222,11 +224,13 @@
    1.17  //    cout << "calling init()\n";
    1.18  //     PEP_STATUS status = init(&session, cached_messageToSend, cached_inject_sync_event);
    1.19  // #ifndef USE_NETPGP            
    1.20 +// #ifndef USE_SEQUOIA
    1.21  //     success = system("gpgconf --create-socketdir");
    1.22  //     if (success != 0)
    1.23  //         throw std::runtime_error("RESTORE: Error when executing 'gpgconf --create-socketdir'.");        
    1.24  //     system("gpg-connect-agent /bye");   // Just in case - otherwise, we die on MacOS sometimes. Is this enough??
    1.25  // #endif
    1.26 +// #endif
    1.27  
    1.28  //    assert(status == PEP_STATUS_OK);
    1.29  //    assert(session);
    1.30 @@ -249,6 +253,7 @@
    1.31      int success = 0;    
    1.32  
    1.33  // #ifndef USE_NETPGP        
    1.34 +// #ifndef USE_SEQUOIA
    1.35  //     success = system("gpgconf --kill all");
    1.36  //     if (success != 0)
    1.37  //         throw std::runtime_error("RESTORE: Error when executing 'gpgconf --kill all'.");
    1.38 @@ -256,6 +261,7 @@
    1.39  //     if (success != 0)
    1.40  //         throw std::runtime_error("RESTORE: Error when executing 'gpgconf --remove-socketdir'.");    
    1.41  // #endif
    1.42 +// #endif
    1.43  
    1.44      success = setenv("GNUPGHOME", prev_pgp_home.c_str(), 1);
    1.45      if (success != 0)