[PATCH] tests: update testing framework to work with upcoming automake-1.12

Jim Meyering meyering at redhat.com
Fri Jan 6 11:21:48 UTC 2012


* t/Makefile.am (TESTS_ENVIRONMENT): Update to work with
upcoming automake-1.12.
* t/auto: Make executable.
* t/basic: Likewise.
* t/delete-missing: Likewise.
* t/oauth: Likewise.
* t/provider: Likewise.
* t/registration: Likewise.
* t/replication: Likewise.
---
 t/Makefile.am |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 t/auto
 mode change 100644 => 100755 t/basic
 mode change 100644 => 100755 t/delete-missing
 mode change 100644 => 100755 t/oauth
 mode change 100644 => 100755 t/provider
 mode change 100644 => 100755 t/registration
 mode change 100644 => 100755 t/replication

diff --git a/t/Makefile.am b/t/Makefile.am
index 529e188..1f0e404 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -55,21 +55,6 @@ EXTRA_DIST =					\
 TESTS_ENVIRONMENT =				\
   tmp__=$$TMPDIR; test -d "$$tmp__" || tmp__=.; \
   TMPDIR=$$tmp__; export TMPDIR;		\
-  shell_or_perl_() {				\
-    if grep '^\#!/usr/bin/perl' "$$1" > /dev/null; then			\
-      if $(PERL) -e 'use warnings' > /dev/null 2>&1; then		\
-	grep '^\#!/usr/bin/perl -T' "$$1" > /dev/null && T_=T || T_=;	\
-	$(PERL) -w$$T_ -I$(srcdir) -MCoreutils				\
-	      -M"CuTmpdir qw($$f)" -- "$$1";	\
-      else					\
-	echo 1>&2 "$$tst: configure did not find a usable version of Perl," \
-	  "so skipping this test";		\
-	(exit 77);				\
-      fi;					\
-    else					\
-      $(SHELL) "$$1";				\
-    fi;						\
-  };						\
   export					\
   LC_ALL=C					\
   VERSION=$(VERSION)				\
@@ -88,4 +73,4 @@ TESTS_ENVIRONMENT =				\
   PERL='$(PERL)'				\
   SHELL='$(SHELL)'				\
   PATH='$(abs_top_builddir)$(PATH_SEPARATOR)'"$$PATH" \
-  ; shell_or_perl_ 9>&2
+  ; 9>&2
diff --git a/t/auto b/t/auto
old mode 100644
new mode 100755
diff --git a/t/basic b/t/basic
old mode 100644
new mode 100755
diff --git a/t/delete-missing b/t/delete-missing
old mode 100644
new mode 100755
diff --git a/t/oauth b/t/oauth
old mode 100644
new mode 100755
diff --git a/t/provider b/t/provider
old mode 100644
new mode 100755
diff --git a/t/registration b/t/registration
old mode 100644
new mode 100755
diff --git a/t/replication b/t/replication
old mode 100644
new mode 100755
--
1.7.8.2.334.gd4e886


More information about the iwhd-devel mailing list