Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71114
Change subject: Move test suite from debian/rules to autotools
......................................................................
Move test suite from debian/rules to autotools
Change-Id: Ibfb5e4d0d254a51e1463997f4a99722f5502e1d6
---
M Makefile.am
M configure.ac
M debian/rules
A tests/.gitignore
A tests/Makefile.am
A tests/testsuite.at
6 files changed, 65 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/14/71114/1
diff --git a/Makefile.am b/Makefile.am
index 3a64156..f7532e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = jobutils misctools src
+SUBDIRS = jobutils misctools src tests
diff --git a/configure.ac b/configure.ac
index 11af986..92d1b80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
AC_INIT([toollabs], [1.0.4dev], [mpellet...@wikimedia.org])
AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_TESTDIR([tests])
AM_INIT_AUTOMAKE([foreign no-dist silent-rules -Wall -Werror])
AC_PROG_INSTALL
@@ -11,6 +12,7 @@
jobutils/bin/Makefile
jobutils/man/Makefile
misctools/Makefile
- src/Makefile])
+ src/Makefile
+ tests/Makefile])
AC_OUTPUT
diff --git a/debian/rules b/debian/rules
index 29a6355..9abbdf3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,3 @@
override_dh_fixperms:
dh_fixperms
chmod u+s debian/misctools/usr/bin/take
-
-# Test that Perl scripts not have compilation errors.
-override_dh_auto_test:
- perl -cw jobutils/bin/job
- perl -cw jobutils/bin/jsub
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 0000000..6d95a17
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,6 @@
+/Makefile
+/Makefile.in
+/atconfig
+/package.m4
+/testsuite
+/testsuite.log
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000..431f129
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,35 @@
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ :;{ \
+ echo '# Signature of the current package.' && \
+ echo 'm4_define([AT_PACKAGE_NAME],' && \
+ echo ' [$(PACKAGE_NAME)])' && \
+ echo 'm4_define([AT_PACKAGE_TARNAME],' && \
+ echo ' [$(PACKAGE_TARNAME)])' && \
+ echo 'm4_define([AT_PACKAGE_VERSION],' && \
+ echo ' [$(PACKAGE_VERSION)])' && \
+ echo 'm4_define([AT_PACKAGE_STRING],' && \
+ echo ' [$(PACKAGE_STRING)])' && \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \
+ echo ' [$(PACKAGE_BUGREPORT)])'; \
+ echo 'm4_define([AT_PACKAGE_URL],' && \
+ echo ' [$(PACKAGE_URL)])'; \
+ } >'$(srcdir)/package.m4'
+
+TESTSUITE = $(srcdir)/testsuite
+
+check-local: atconfig $(TESTSUITE)
+ $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
+
+installcheck-local: atconfig $(TESTSUITE)
+ $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \
+ $(TESTSUITEFLAGS)
+
+clean-local:
+ test ! -f '$(TESTSUITE)' || \
+ $(SHELL) '$(TESTSUITE)' --clean
+
+AUTOM4TE = $(SHELL) $(top_srcdir)/build-aux/missing --run autom4te
+AUTOTEST = $(AUTOM4TE) --language=autotest
+$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4
+ $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
+ mv $@.tmp $@
diff --git a/tests/testsuite.at b/tests/testsuite.at
new file mode 100644
index 0000000..8c0cead
--- /dev/null
+++ b/tests/testsuite.at
@@ -0,0 +1,20 @@
+# Test suite for toollabs.
+
+# Initialize autotest.
+AT_INIT()
+AT_COLOR_TESTS()
+
+# AT_TOOLLABS_PERL_COMPILE(FILE)
+# ------------------------------
+# Test if FILE is compilable with "perl -cw". FILE is relative to the
+# top source directory.
+m4_define([AT_TOOLLABS_PERL_COMPILE],
+[AT_SETUP([Checking $1 for compilation errors])
+AT_CHECK_UNQUOTED([perl -cw $top_srcdir/$1], [0], [], [$top_srcdir/$1 syntax OK
+])
+AT_CLEANUP()
+])
+
+# Test that Perl scripts do not have compilation errors.
+AT_TOOLLABS_PERL_COMPILE([jobutils/bin/job])
+AT_TOOLLABS_PERL_COMPILE([jobutils/bin/jsub])
--
To view, visit https://gerrit.wikimedia.org/r/71114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfb5e4d0d254a51e1463997f4a99722f5502e1d6
Gerrit-PatchSet: 1
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
