From 7dcea6cd12ff0d0041ca35e3372376d5ee424fde Mon Sep 17 00:00:00 2001 From: bert hubert Date: Wed, 30 Sep 2015 15:50:51 +0200 Subject: [PATCH] skip ghost-1 and ghost-2 for now, disable some remotebackend checks that take 20 minutes, reenable most other tests --- .travis.yml | 28 +++++++++++++------------- modules/remotebackend/Makefile.am | 20 +++++++++--------- regression-tests.recursor/ghost-1/skip | 0 regression-tests.recursor/ghost-2/skip | 0 4 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 regression-tests.recursor/ghost-1/skip create mode 100644 regression-tests.recursor/ghost-2/skip diff --git a/.travis.yml b/.travis.yml index 38ca0453c2..93f291a0bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,27 +149,27 @@ script: - ./timestamp ./start-test-stop 5300 bind-both - ./timestamp ./start-test-stop 5300 bind-dnssec-both - ./timestamp ./start-test-stop 5300 bind-dnssec-pkcs11 -# - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both -# - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-optout-both -# - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-narrow + - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both + - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-optout-both + - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-narrow - ./timestamp ./start-test-stop 5300 bind-hybrid-nsec3 - ./timestamp ./start-test-stop 5300 geoipbackend - ./timestamp ./start-test-stop 5300 geoipbackend-nsec3-narrow -# - ./timestamp ./start-test-stop 5300 gmysql-nodnssec-both -# - ./timestamp ./start-test-stop 5300 gmysql-both -# - ./timestamp ./start-test-stop 5300 gmysql-nsec3-both + - ./timestamp ./start-test-stop 5300 gmysql-nodnssec-both + - ./timestamp ./start-test-stop 5300 gmysql-both + - ./timestamp ./start-test-stop 5300 gmysql-nsec3-both - ./timestamp ./start-test-stop 5300 gmysql-nsec3-optout-both - ./timestamp ./start-test-stop 5300 gmysql-nsec3-narrow -# - ./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both -# - ./timestamp ./start-test-stop 5300 gpgsql-both -# - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-both -# - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-optout-both + - ./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both + - ./timestamp ./start-test-stop 5300 gpgsql-both + - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-both + - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-optout-both - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-narrow -# - ./timestamp ./start-test-stop 5300 gsqlite3-nodnssec-both -# - ./timestamp ./start-test-stop 5300 gsqlite3-both -# - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-both + - ./timestamp ./start-test-stop 5300 gsqlite3-nodnssec-both + - ./timestamp ./start-test-stop 5300 gsqlite3-both + - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-both - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both -# - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow + - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow #DNSName - ./timestamp ./start-test-stop 5300 lmdb-nodnssec - ./timestamp ./start-test-stop 5300 mydns - ./timestamp ./start-test-stop 5300 opendbx-sqlite3 diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am index b0acfac22d..ebee121fd3 100644 --- a/modules/remotebackend/Makefile.am +++ b/modules/remotebackend/Makefile.am @@ -75,16 +75,16 @@ remotebackend_post.log: remotebackend_http.log remotebackend_json.log: remotebackend_http.log remotebackend_post.log -if UNIT_TESTS -TESTS = \ - remotebackend_pipe.test \ - remotebackend_unix.test \ - remotebackend_http.test \ - remotebackend_post.test \ - remotebackend_json.test \ - remotebackend_zeromq.test - -endif +#if UNIT_TESTS +#TESTS = \ +# remotebackend_pipe.test \ +# remotebackend_unix.test \ +# remotebackend_http.test \ +# remotebackend_post.test \ +# remotebackend_json.test \ +# remotebackend_zeromq.test +# +#endif BUILT_SOURCES = ../../pdns/dnslabeltext.cc diff --git a/regression-tests.recursor/ghost-1/skip b/regression-tests.recursor/ghost-1/skip new file mode 100644 index 0000000000..e69de29bb2 diff --git a/regression-tests.recursor/ghost-2/skip b/regression-tests.recursor/ghost-2/skip new file mode 100644 index 0000000000..e69de29bb2 -- 2.47.2