diff options
| author | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2018-06-15 11:24:08 +0200 |
|---|---|---|
| committer | Pawel Kowalski <p.kowalski2@partner.samsung.com> | 2018-06-15 11:26:09 +0200 |
| commit | 5c7e0aaf17a296535495e3431db6a86ad64064b3 (patch) | |
| tree | d7cca0250c60fbc69eb70a7039d0f9659f81b9d0 /tests/Makefile.am | |
| parent | 1701584f7841a79ae4e97699a8c4ac9f0a09c38f (diff) | |
| parent | e527f54afdf27ab8ce73a22d05d69e5482f5e92b (diff) | |
| download | libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.tar.gz libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.tar.bz2 libtasn1-5c7e0aaf17a296535495e3431db6a86ad64064b3.zip | |
Merge branch 'upstream' into tizensubmit/tizen_5.0/20181101.000007submit/tizen/20180615.093304accepted/tizen/unified/20180620.131427accepted/tizen/5.0/unified/20181102.030257
Change-Id: I254f6095d312777427a57af3ed346986a28f3aaa
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d637ce0..be10bbb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,10 +22,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I../gl AM_LDFLAGS = -no-install LDADD = ../lib/libtasn1.la ../gl/libgnu.la -EXTRA_DIST = Test_parser.asn Test_tree.asn Test_tree_asn1_tab.c \ +EXTRA_DIST = Test_parser.asn Test_tree.asn Test_tree_asn1_tab.c mscat.asn \ Test_encoding.asn pkix.asn TestIndef.p12 choice.asn coding-decoding2.asn \ TestIndef2.p12 TestIndef3.der TestCertOctetOverflow.der \ - libtasn1.supp ocsp-basic-response.der \ + cert-invalid-time.der \ + libtasn1.supp ocsp-basic-response.der spc_pe_image_data.der \ invalid-x509/id-000000.der invalid-x509/id-000001.der \ invalid-x509/id-000002.der invalid-x509/id-000003.der \ invalid-x509/id-000004.der invalid-x509/id-000005.der \ @@ -43,24 +44,30 @@ EXTRA_DIST = Test_parser.asn Test_tree.asn Test_tree_asn1_tab.c \ invalid-x509/id-000028.der invalid-x509/id-000029.der \ invalid-x509/id-000030.der invalid-x509/id-000031.der \ invalid-x509/id-000032.der invalid-x509/id-000033.der \ - invalid-x509/id-000034.der invalid-x509/id-000035.der + invalid-x509/id-000034.der invalid-x509/id-000035.der \ + invalid-pkcs7/id-000001.der invalid-pkcs7/id-000002.der \ + invalid-pkcs7/id-000003.der invalid-assignments1.txt \ + invalid-assignments2.txt # For crlf. EXTRA_DIST += crlf.cer crl.der ocsp.der -dist_check_SCRIPTS = crlf benchmark threadsafety decoding decoding-invalid-x509 +dist_check_SCRIPTS = crlf benchmark threadsafety decoding decoding-invalid-x509 \ + decoding-invalid-pkcs7 coding MOSTLYCLEANFILES = Test_parser_ERROR.asn check_PROGRAMS = Test_parser Test_tree Test_encoding Test_indefinite \ Test_errors Test_simple Test_overflow Test_strings Test_choice \ Test_encdec copynode coding-decoding2 strict-der Test_choice_ocsp \ - ocsp-basic-response octet-string + ocsp-basic-response octet-string coding-long-oid object-id-decoding \ + spc_pe_image_data TESTS = Test_parser Test_tree Test_encoding Test_indefinite \ Test_errors Test_simple Test_overflow crlf threadsafety \ Test_strings Test_choice Test_encdec copynode coding-decoding2 \ strict-der Test_choice_ocsp decoding decoding-invalid-x509 \ - ocsp-basic-response octet-string + ocsp-basic-response octet-string coding-long-oid object-id-decoding \ + spc_pe_image_data decoding-invalid-pkcs7 coding TESTS_ENVIRONMENT = \ ASN1PARSER=$(srcdir)/Test_parser.asn \ @@ -76,6 +83,9 @@ TESTS_ENVIRONMENT = \ ASN1CHOICE_OCSP=$(srcdir)/pkix.asn \ ASN1CHOICE_OCSP_DATA=$(srcdir)/ocsp.der \ ASN1_RESPONSE_OCSP_DATA=$(srcdir)/ocsp-basic-response.der \ + ASN1_MSCAT=$(srcdir)/mscat.asn \ + ASN1_SPC_PE_IMAGE_DATA=$(srcdir)/spc_pe_image_data.der \ + ASAN_OPTIONS="detect_leaks=0:exitcode=6" \ THREADSAFETY_FILES=`find $(top_srcdir)/lib -name \*.c` \ EXEEXT=$(EXEEXT) \ LSAN_OPTIONS=suppressions=libtasn1.supp \ |