Просмотр исходного кода

build: Use the perl TAP::Harness for the C test suite

The automake TAP driver only appeared once the parallel test runner
allowed custom drivers after 1.11, which we were not requesting in
the AM_INIT_AUTOMAKE call.

But simply requesting a later version is not good enough, as Debian
stable (wheezy) is still only shipping automake 1.11. Instead just switch
to use the perl TAP::Harness infrastructure for the C test suite too.

Regression introduced in commit d9833ac0b6b66e9dfaff272f6d0a25373bfff091.
Guillem Jover лет назад: 12
Родитель
Сommit
b029a83ea6
3 измененных файлов с 8 добавлено и 3 удалено
  1. 0 1
      configure.ac
  2. 3 0
      debian/changelog
  3. 5 2
      lib/dpkg/test/Makefile.am

+ 0 - 1
configure.ac

@@ -7,7 +7,6 @@ AC_INIT([dpkg], m4_esyscmd([./get-version]), [debian-dpkg@lists.debian.org])
 AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
-AC_REQUIRE_AUX_FILE([tap-driver.pl])
 
 AC_USE_SYSTEM_EXTENSIONS
 

+ 3 - 0
debian/changelog

@@ -12,6 +12,9 @@ dpkg (1.17.8) UNRELEASED; urgency=low
   * Improve wording for «dpkg --verify» and --verify-format in the man page.
     Closes: #733057
   * Switch test runner from Test::Harness to TAP::Harness.
+  * Use the perl TAP::Harness for the C test suite instead of the automake
+    tap-driver, to avoid requiring automake >= 1.12, currently not present
+    in stable.
 
   [ Updated programs translations ]
   * German (Sven Joachim).

+ 5 - 2
lib/dpkg/test/Makefile.am

@@ -34,5 +34,8 @@ check_PROGRAMS = \
 	t-trigger \
 	t-mod-db
 
-LOG_DRIVER = $(PERL) $(top_srcdir)/build-aux/tap-driver.pl
-TESTS = $(check_PROGRAMS)
+TEST_PREFIX = $(builddir)
+
+test_cases = $(check_PROGRAMS)
+
+include $(top_srcdir)/check.am