build-sys: Update the dejagnu stuff

diff --git a/.gitignore b/.gitignore
index 5dca292a8443035ba0ec0c27667134fdb433c544..422c9a1cbb434a8410b09ac589709a6b83a1474f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@
 *.swp
 .version
 autom4te.cache/
-config/
+^/config/
 cov-int/
 m4/
 ABOUT-NLS

diff --git a/configure.ac b/configure.ac
index 72e8ea2aea18f43bb51663038df8ad70386607d5..182a0dfd0d80dd455c6f754b98803618ccb1e314 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_INIT([psmisc],
        m4_esyscmd([misc/git-version-gen .tarball-version]),
        ,,,[https://www.gitlab.com/psmisc/psmisc])
-AM_INIT_AUTOMAKE([foreign 1.11 dejagnu subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
-AM_SILENT_RULES([no])
+AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
+AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR([src/comm.h])
 AC_CONFIG_HEADERS([config.h])
 

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 696a44a0dc9d142302bc1f20e19ff3d3ca76f072..207f6459b5a9b1bac9afbb9257a2905b5cf869b5 100644 (file)
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -10,4 +10,8 @@ if WANT_FUSER
 endif
 
 
-EXTRA_DIST =
+EXTRA_DIST = \
+    config/unix.exp \
+    fuser.test/fuser.exp \
+    pslog.test/pslog.exp \
+    killall.test/killall.exp

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index cd446c833d5c2ab8e6e0abdb8892c0a94186e3a3..82cffabba505db96f60adbb1f4d7a9a9e655791d 100644 (file)
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -3,6 +3,18 @@
 regexp "(.*\/)testsuite" $objdir objdir topdir
 
 
+proc psmisc_v_version { tool } {
+    global topdir
+    set toolpath ${topdir}src/${tool}
+    set tmp [ exec $toolpath -V 2>@1 ]
+    regexp {\(PSmisc\) ([0-9a-z.-]+)} $tmp dummy version
+    clone_output "$toolpath version $version\n"
+}
+
+proc fuser_version {} { psmisc_v_version fuser }
+proc killall_version {} { psmisc_v_version killall }
+proc pslog_version {} { psmisc_v_version pslog }
+
 proc expect_pass { testname reg } {
     expect {
         -re "$reg" { pass "$testname" }