testing
authorVolker Birk <vb@pep.foundation>
Wed, 23 Nov 2016 13:19:27 +0100
changeset 1422860391e5e5b9
parent 1421 eab02fe87a52
child 1423 c0c813c8849d
testing
Makefile.conf
src/Makefile
test/0x6FF00E97.asc
test/0x70DCF575.asc
test/0xC9C2EE39.asc
test/6FF00E97_sec.asc
test/70DCF575_sec.asc
test/C9C2EE39_sec.asc
test/Makefile
     1.1 --- a/Makefile.conf	Wed Nov 23 11:45:32 2016 +0100
     1.2 +++ b/Makefile.conf	Wed Nov 23 13:19:27 2016 +0100
     1.3 @@ -11,7 +11,7 @@
     1.4  YML_PATH=$(HOME)/yml2
     1.5  ASN1C=asn1c
     1.6  ASN1C_INCLUDE=/opt/local/share/asn1c
     1.7 -LIBGPGME=/opt/local/lib/libgpgme-pthread.11.dylib
     1.8 +#LIBGPGME=/opt/local/lib/libgpgme-pthread.11.dylib
     1.9  
    1.10  # C makros (not environment variables) to overwrite:
    1.11  #
     2.1 --- a/src/Makefile	Wed Nov 23 11:45:32 2016 +0100
     2.2 +++ b/src/Makefile	Wed Nov 23 13:19:27 2016 +0100
     2.3 @@ -43,7 +43,7 @@
     2.4  ifeq ("$(OPENPGP)","GPG")
     2.5  	NO_SOURCE=pgp_netpgp.c
     2.6  	CFLAGS+= -DUSE_GPG
     2.7 -	LDFLAGS+= -lgpgme-pthread 
     2.8 +	LDFLAGS+= -lgpgme
     2.9  else ifeq ("$(OPENPGP)","NETPGP")
    2.10  	NO_SOURCE=pgp_gpg.c
    2.11  	CFLAGS+= -DUSE_NETPGP
     3.1 --- a/test/0x6FF00E97.asc	Wed Nov 23 11:45:32 2016 +0100
     3.2 +++ b/test/0x6FF00E97.asc	Wed Nov 23 13:19:27 2016 +0100
     3.3 @@ -1,5 +1,4 @@
     3.4  -----BEGIN PGP PUBLIC KEY BLOCK-----
     3.5 -Version: GnuPG v1
     3.6  
     3.7  mQENBFV4PbEBCADTmjGDsoti/VPoZ3w2oCjLBNq1jWIGMkbiUgCGUQjVsNrSZ80U
     3.8  7RmA3Pcu3hhiVQNBGA32vL6NPhSJPanVd77s6XVZg+Gq7llbGGkuIxSkJvVrWzYc
     4.1 --- a/test/0x70DCF575.asc	Wed Nov 23 11:45:32 2016 +0100
     4.2 +++ b/test/0x70DCF575.asc	Wed Nov 23 13:19:27 2016 +0100
     4.3 @@ -1,5 +1,4 @@
     4.4  -----BEGIN PGP PUBLIC KEY BLOCK-----
     4.5 -Version: GnuPG v1
     4.6  
     4.7  mQENBFV4PvYBCADR7kaFLsLFDuGE11u3q2K6eTspAkczU1ahPnSXaVGOIbCQGuL6
     4.8  MiDET4vXAY/y1picqJ8OuIe2k0S8eDRIYIHF8arhgTkZQny6Cfy7nheWNnxSZBIo
     5.1 --- a/test/0xC9C2EE39.asc	Wed Nov 23 11:45:32 2016 +0100
     5.2 +++ b/test/0xC9C2EE39.asc	Wed Nov 23 13:19:27 2016 +0100
     5.3 @@ -1,5 +1,4 @@
     5.4  -----BEGIN PGP PUBLIC KEY BLOCK-----
     5.5 -Version: GnuPG v1
     5.6  
     5.7  mQENBFV4Pl8BCACuukQLwsHftH5jkVsSL7COFhamNsEE8lZ8MG1f1Rx5ztPuZTna
     5.8  YXyWODgpj2Bxz0TcP+Q17GbLKse7TWD1k9i1RzLWz8ZSCLYq2TtjLWPleVuGGWeq
     6.1 --- a/test/6FF00E97_sec.asc	Wed Nov 23 11:45:32 2016 +0100
     6.2 +++ b/test/6FF00E97_sec.asc	Wed Nov 23 13:19:27 2016 +0100
     6.3 @@ -1,5 +1,4 @@
     6.4  -----BEGIN PGP PRIVATE KEY BLOCK-----
     6.5 -Version: GnuPG v1
     6.6  
     6.7  lQOYBFV4PbEBCADTmjGDsoti/VPoZ3w2oCjLBNq1jWIGMkbiUgCGUQjVsNrSZ80U
     6.8  7RmA3Pcu3hhiVQNBGA32vL6NPhSJPanVd77s6XVZg+Gq7llbGGkuIxSkJvVrWzYc
     7.1 --- a/test/70DCF575_sec.asc	Wed Nov 23 11:45:32 2016 +0100
     7.2 +++ b/test/70DCF575_sec.asc	Wed Nov 23 13:19:27 2016 +0100
     7.3 @@ -1,5 +1,4 @@
     7.4  -----BEGIN PGP PRIVATE KEY BLOCK-----
     7.5 -Version: GnuPG v1
     7.6  
     7.7  lQOYBFV4PvYBCADR7kaFLsLFDuGE11u3q2K6eTspAkczU1ahPnSXaVGOIbCQGuL6
     7.8  MiDET4vXAY/y1picqJ8OuIe2k0S8eDRIYIHF8arhgTkZQny6Cfy7nheWNnxSZBIo
     8.1 --- a/test/C9C2EE39_sec.asc	Wed Nov 23 11:45:32 2016 +0100
     8.2 +++ b/test/C9C2EE39_sec.asc	Wed Nov 23 13:19:27 2016 +0100
     8.3 @@ -1,5 +1,4 @@
     8.4  -----BEGIN PGP PRIVATE KEY BLOCK-----
     8.5 -Version: GnuPG v1
     8.6  
     8.7  lQOYBFV4Pl8BCACuukQLwsHftH5jkVsSL7COFhamNsEE8lZ8MG1f1Rx5ztPuZTna
     8.8  YXyWODgpj2Bxz0TcP+Q17GbLKse7TWD1k9i1RzLWz8ZSCLYq2TtjLWPleVuGGWeq
     9.1 --- a/test/Makefile	Wed Nov 23 11:45:32 2016 +0100
     9.2 +++ b/test/Makefile	Wed Nov 23 13:19:27 2016 +0100
     9.3 @@ -1,5 +1,7 @@
     9.4  include ../Makefile.conf
     9.5  
     9.6 +export GNUPGHOME=.
     9.7 +
     9.8  CC?=g++ -std=gnu++11 -pthread
     9.9  CXX?=g++ -std=gnu++11 -pthread
    9.10  LD?=$(CXX)
    9.11 @@ -27,9 +29,13 @@
    9.12  
    9.13  clean:
    9.14  	rm -f *.o $(TARGET) *.a *~ $(UNIT_TESTS) pep_Dokument_Titel.pdf msg4.asc
    9.15 -	rm -Rf *.dSYM
    9.16 +	rm -Rf *.dSYM .imported pubring.gpg secring.gpg random_seed *.conf trustdb.gpg
    9.17  
    9.18 -test: pEpEngineTest
    9.19 +.imported:
    9.20 +	-cat 0x*.asc *_sec.asc | gpg2 --import
    9.21 +	touch .imported
    9.22 +
    9.23 +test: pEpEngineTest .imported
    9.24  	LD_LIBRARY_PATH=~/lib:../src ./pEpEngineTest
    9.25  
    9.26  %_test_run : %_test