automake-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2


From: Stefano Lattarini
Subject: [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-707-g0e72e03
Date: Sat, 28 Jul 2012 08:17:50 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=0e72e0312428321571c7041b33b5cdc31f844650

The branch, ng/master has been updated
       via  0e72e0312428321571c7041b33b5cdc31f844650 (commit)
       via  02cc99440781c63ae95b0e0221d193bd013da7f7 (commit)
       via  9dc9b4ee3aad18832fce71a2d40c8dc87d43f80d (commit)
       via  e2004fd5ed8420617af1d31b99228908b0a3b948 (commit)
       via  3727413f33e44a9171e817ceb2e86743631dda9c (commit)
       via  53a810f989871687928fba6b6ebd21c217f13f68 (commit)
       via  dc326edfc83ed1294d04abb9a5302b21d8f5cc05 (commit)
      from  ef0f88c18fe02f70aea0484a911531f61ecfa922 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0e72e0312428321571c7041b33b5cdc31f844650
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 28 01:39:57 2012 +0200

    [ng] check: refactor 'am.test-suite.handle-suffix'
    
    * lib/am/parallel-tests.am (am.test-suite.handle-suffix.helper):
    New, extracted from ...
    (am.test-suite.handle-suffix): ... this, which now uses it.
    (am__tpfx): Remove, inlined into 'am.test-suite.handle-suffix'.
    * t/parallel-tests-internals.sh: Remove as obsolete.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 02cc99440781c63ae95b0e0221d193bd013da7f7
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 28 00:56:02 2012 +0200

    [ng] cosmetics: fix an occurrence of inconsistent indentation
    
    * lib/am/parallel-tests.am: Here.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 9dc9b4ee3aad18832fce71a2d40c8dc87d43f80d
Author: Stefano Lattarini <address@hidden>
Date:   Sat Jul 28 00:52:45 2012 +0200

    [ng] refactor: use new function 'am.vars.is-undef' ...
    
    * lib/am/header-vars.am (SUBDIRS): ... in the definition of this (instead
    of using hand-rolled almost-equivalent) ...
    ($(1)LOG_DRIVER, TEST_EXTENSIONS): ... and of these (instead of resorting
    to weaker and unsafer '?=' assignment).
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit e2004fd5ed8420617af1d31b99228908b0a3b948
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 20:30:11 2012 +0200

    [ng] utils: new function 'am.vars.is-undef'
    
    Sometimes, in our makefiles, we want to assign a default value to
    a variable that might not have been assigned yet.  One might think
    that using the GNU make assignment '?=' is enough:
    
        VAR ?= DEFAULT-VALUE
    
    But alas, such a usage allows interferences from the environment; i.e.,
    if an environment variable named 'VAR' is defined to, say, BAD-VALUE,
    the construct above will result in the $(VAR) make variable being
    defined to BAD-VALUE, not to DEFAULT-VALUE.
    
    Use the 'am.vars.is-undef' function to avoid this situation.  It tells
    whether the given make variable is not "safely" defined, i.e., either
    undefined, or defined to a value that is inherited from the environment.
    
    With such a tool, we can safely declare default values for variables
    that avoids environmental interferences, as follow:
    
        ifeq ($(call am.vars.is-undef,VAR),yes)
          VAR = DEFAULT-VALUE
        endif
    
    * lib/am/header-vars.am (am.vars.is-undef): New.
    * t/internals.tap: Test it, and add few sanity checks.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 3727413f33e44a9171e817ceb2e86743631dda9c
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 19:46:28 2012 +0200

    [ng] tests: tests on internal stuff is more resilient now
    
    * t/internals.tap: Reorganize the test script to minimize the
    possibility of one test failure messing up all the other ones.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 53a810f989871687928fba6b6ebd21c217f13f68
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 19:26:11 2012 +0200

    [ng] tests: simplify munging of header-vars.am ...
    
    * t/am-xargs-map.sh, t/ensure-dir-exists.sh, t/internals.tap,
    t/memoize.tap: ... here, since that files no more contains
    '@foo@' substitutions nor '?COND?' transforms.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit dc326edfc83ed1294d04abb9a5302b21d8f5cc05
Author: Stefano Lattarini <address@hidden>
Date:   Fri Jul 27 19:19:51 2012 +0200

    [ng] refactor: read 'color-tests.am' more verbatim
    
    * lib/am/color-tests.am (am.test-suite.tty-colors): Define with the
    'define' built-in rather than with '='.
    * automake.in (handle_tests): Use '&almost_verbatim' rather than
    '&file_contents' to read and process 'color-tests.am'.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 automake.in                   |    2 +-
 lib/am/color-tests.am         |    4 +-
 lib/am/header-vars.am         |   35 ++++++++--
 lib/am/parallel-tests.am      |   37 +++++-----
 t/am-xargs-map.sh             |    8 +--
 t/ensure-dir-exists.sh        |    8 +--
 t/internals.tap               |  158 ++++++++++++++++++++++++++++-------------
 t/memoize.tap                 |    8 +--
 t/parallel-tests-internals.sh |   44 -----------
 9 files changed, 163 insertions(+), 141 deletions(-)
 delete mode 100755 t/parallel-tests-internals.sh

diff --git a/automake.in b/automake.in
index 4799dd6..01df5fe 100644
--- a/automake.in
+++ b/automake.in
@@ -4102,7 +4102,7 @@ sub handle_tests
   if (var ('TESTS'))
     {
       push (@check_tests, 'check-TESTS');
-      $output_rules .= file_contents ('color-tests', new Automake::Location);
+      almost_verbatim ('color-tests');
       if (option 'serial-tests')
         {
           almost_verbatim ('serial-tests');
diff --git a/lib/am/color-tests.am b/lib/am/color-tests.am
index a7cf297..eb670e5 100644
--- a/lib/am/color-tests.am
+++ b/lib/am/color-tests.am
@@ -14,7 +14,8 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-am.test-suite.tty-colors = { \
+define am.test-suite.tty-colors
+{ \
   if test "X$(AM_COLOR_TESTS)" = Xno; then \
     am__color_tests=no; \
   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
@@ -39,3 +40,4 @@ am.test-suite.tty-colors = { \
     mgn= red= grn= lgn= blu= brg= std=; \
   fi; \
 }
+endef
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 472d0b2..fc3d3cf 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -45,6 +45,33 @@ define am.error
 $(warning $1)$(eval am.error.seen := yes)
 endef
 
+#
+# Sometimes, in our makefiles, we want to assign a default value to a
+# variable that might not have been assigned yet.  One might think that
+# using the GNU make assignment '?=' is enough:
+#
+#    VAR ?= DEFAULT-VALUE
+#
+# But alas, such a usage allows interferences from the environment; i.e.,
+# if an environment variable named 'VAR' is defined to, say, BAD-VALUE,
+# the construct above will result in the $(VAR) make variable being
+# defined to BAD-VALUE, not to DEFAULT-VALUE.
+#
+# Use the 'am.vars.is-undef' function to avoid this situation.  It tells
+# whether the given make variable is not "safely" defined, i.e., either
+# undefined, or defined to a value that is inherited from the environment.
+#
+# With such a tool, we can safely declare default values for variables
+# that avoids environmental interferences, as follow:
+#
+#     ifeq ($(call am.vars.is-undef,VAR),yes)
+#       VAR = DEFAULT-VALUE
+#     endif
+#
+define am.vars.is-undef
+$(if $(filter undefined environment,$(origin $(strip $1))),yes)
+endef
+
 # Some problematic characters (especially when used in arguments
 # to make functions, or for syntax highlighting).
 am.chars.bslash := \\
@@ -72,12 +99,8 @@ endef
 
 # Neutralize unwarranted environment settings that might interfere with
 # our Makefiles.
-ifdef SUBDIRS
-  ifneq "$(origin SUBDIRS)" "file"
-    ifneq "$(origin SUBDIRS)" "command line"
-      SUBDIRS :=
-    endif
-  endif
+ifeq ($(call am.vars.is-undef,SUBDIRS),yes)
+  SUBDIRS :=
 endif
 
 # CDPATH is only useful in interactive usage, and should never be exported
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index bb4ce64..defd88b 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -60,33 +60,30 @@ am.test-suite.runtest = \
   "$$tst"                                                              \
   $(AM_TESTS_FD_REDIRECT)
 
-# Turn e.g., ".test" in "_TEST", and return the empty string unchanged.
-am__tpfx = \
-  $(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1)))
-
-define am.test-suite.handle-suffix
-
-# FIXME: This will pick up the default from the environment; are we sure
-# FIXME: we want that?
-$$(call am__tpfx,$1)LOG_DRIVER ?= $(SHELL) $(am.conf.aux-dir)/test-driver
-
-%.log %.trs: %$1 $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
-       @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
-
+define am.test-suite.handle-suffix.helper
+ifeq ($$(call am.vars.is-undef,$(2)LOG_DRIVER),yes)
+$(2)LOG_DRIVER = $(SHELL) $(am.conf.aux-dir)/test-driver
+endif
+%.log %.trs: %$1 $$($(2)LOG_DEPENDENCIES)
+       @$$(call am.test-suite.runtest,$2)
 ifeq ($(am.conf.handle-exeext),yes)
 ifdef EXEEXT
-%.log %.trs: %$1$(EXEEXT) $$($$(call am__tpfx,$1)LOG_DEPENDENCIES)
-       @$$(call am.test-suite.runtest,$$(call am__tpfx,$1))
+%.log %.trs: %$1$(EXEEXT) $$($(2)LOG_DEPENDENCIES)
+       @$$(call am.test-suite.runtest,$2)
 endif # defined EXEEXT
 endif # am.conf.handle-exeext = yes
+endef
 
-endef # am.test-suite.handle-suffix
+define am.test-suite.handle-suffix
+$(call $0.helper,$1,$(if $1,$(call am.util.toupper,$(patsubst .%,%_,$1))))
+endef
+
+ifeq ($(call am.vars.is-undef,TEST_EXTENSIONS),yes)
+  TEST_EXTENSIONS := .test
+endif
 
-# FIXME: this will pick up the default from the environment; are we sure
-# FIXME: we want that?
-TEST_EXTENSIONS ?= .test
 $(foreach e,$(filter-out .%,$(TEST_EXTENSIONS)),\
-     $(call am.error,invalid test extension: '$e'))
+  $(call am.error,invalid test extension: '$e'))
 $(foreach e,$(TEST_EXTENSIONS), \
   $(eval $(call am.test-suite.handle-suffix,$e)))
 # It is *imperative* that the "empty" suffix goes last.  Otherwise, a
diff --git a/t/am-xargs-map.sh b/t/am-xargs-map.sh
index da3621d..3d5db39 100755
--- a/t/am-xargs-map.sh
+++ b/t/am-xargs-map.sh
@@ -20,14 +20,10 @@
 am_create_testdir=empty
 . ./defs || exit 1
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|address@hidden@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 sed 's/^[0-9][0-9]*:://' > Makefile << 'END'
 01::include ./defn.mk
 02::
diff --git a/t/ensure-dir-exists.sh b/t/ensure-dir-exists.sh
index bc396b6..5911c0b 100755
--- a/t/ensure-dir-exists.sh
+++ b/t/ensure-dir-exists.sh
@@ -19,14 +19,10 @@
 am_create_testdir=empty
 . ./defs || exit 1
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|address@hidden@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 cat > Makefile << 'END'
 include ./defn.mk
 
diff --git a/t/internals.tap b/t/internals.tap
index 90126a7..91449a0 100755
--- a/t/internals.tap
+++ b/t/internals.tap
@@ -19,52 +19,64 @@
 am_create_testdir=empty
 . ./defs || exit 1
 
-plan_ 10
+plan_ 12
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|address@hidden@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
-# WARNING: there are a lot of embedded tabs in this makefile.
+# WARNING: there are a lot of embedded tabs in the makefile
+# fragments used by this script.  They are all deliberate.
 # DO NOT "NORMALIZE" THEM TO SPACES!
-cat > Makefile << 'END'
-include ./defn.mk
-
-lower = abcdefghijklmnopqrstuvwxyz
-upper = ABCDEFGHIJKLMNOPQRSTUVWXYZ
-digits = 0123456789
-comma = ,
-dollar = $$
-bslash = \\
 
-default:
-       @echo Please select an explicit test; exit 1
-.PHONY: default
+i=0
+T ()
+{
+  i=$(($i + 1))
+  mkdir T$i.d
+  cd T$i.d
+  {
+    echo 'include ../defn.mk'
+    echo 'lower = abcdefghijklmnopqrstuvwxyz'
+    echo 'upper = ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    echo 'digits = 0123456789'
+  } > Makefile
+  cat >> Makefile
+  test_name=$1; shift
+  command_ok_ "$test_name" $MAKE ${1+"$@"} test
+  cd ..
+}
+
+T 'sanity check' FOO=ok <<'END'
+FOO = ko
+test:
+       test $(FOO) = ok
+       touch sane
+END
+test -f T1.d/sane || fatal_ "function 'T' is buggy"
 
-.PHONY: test-strip-first-word
-test-strip-first-word:
+T 'am.util.strip-first-word' <<'END'
+test:
        test '$(call am.util.strip-first-word,)'                = ''
        test '$(call am.util.strip-first-word,1)'               = ''
        test '$(call am.util.strip-first-word,1 1)'             = '1'
        test '$(call am.util.strip-first-word,1 2)'             = '2'
        test '$(call am.util.strip-first-word,1 2 3 4 5 6 7 8)' = '2 3 4 5 6 7 
8'
        test '$(call am.util.strip-first-word,  1         2     )' = '2'
+END
 
-.PHONY: test-strip-last-word
-test-strip-last-word:
+T 'am.util.strip-last-word' <<'END'
+test:
        test '$(call am.util.strip-last-word,)'                 = ''
        test '$(call am.util.strip-last-word,1)'                = ''
        test '$(call am.util.strip-last-word,1 1)'              = '1'
        test '$(call am.util.strip-last-word,1 2)'              = '1'
        test '$(call am.util.strip-last-word,1 2 3 4 5 6 7 8)'  = '1 2 3 4 5 6 
7'
        test '$(call am.util.strip-last-word,  1          2     )' = '1'
+END
 
-.PHONY: test-uniq
-test-uniq:
+T 'am.util.uniq' <<'END'
+test:
        test '$(call am.util.uniq,)'                    = ''
        test '$(call am.util.uniq,1)'                   = '1'
        test '$(call am.util.uniq,1 1)'                 = '1'
@@ -80,9 +92,10 @@ test-uniq:
        test '$(call am.util.uniq,1 1 1 3 1 1 1)'       = '1 3'
        test '$(call am.util.uniq,3 1 1 4 1 4 1 1)'     = '3 1 4'
        test '$(call am.util.uniq,      1   3   1  )'   = '1 3'
+END
 
-.PHONY: test-strip-suffixes
-test-strip-suffixes:
+T 'am.util.strip-suffixes' <<'END'
+test:
        test '$(call am.util.strip-suffixes,,)'                 = ''
        test '$(call am.util.strip-suffixes,      ,)'           = ''
        test '$(call am.util.strip-suffixes,,     )'            = ''
@@ -111,9 +124,10 @@ test-strip-suffixes:
              = 'foo.b bar'
        test '$(call am.util.strip-suffixes, .b.a .a, foo.b.a bar.a)' \
              = 'foo bar'
+END
 
-.PHONY: test-toupper
-test-toupper:
+T 'am.util.toupper' <<'END'
+test:
        test '$(call am.util.toupper,a)'        = A
        test '$(call am.util.toupper,A)'        = A
        test '$(call am.util.toupper,aba)'      = ABA
@@ -128,9 +142,10 @@ test-toupper:
        test '$(call am.util.toupper,zxzxzxZXZxzxzxzxzx)' = ZXZXZXZXZXZXZXZXZX
        test '$(call am.util.toupper,$(lower))' = '$(upper)'
        test '$(call am.util.toupper,$(upper))' = '$(upper)'
+END
 
-.PHONY: test-tolower
-test-tolower:
+T 'am.util.tolower' <<'END'
+test:
        test '$(call am.util.tolower,A)'        = a
        test '$(call am.util.tolower,a)'        = a
        test '$(call am.util.tolower,ABA)'      = aba
@@ -145,9 +160,13 @@ test-tolower:
        test '$(call am.util.tolower,ZXZXZXzxzXZXZXZXZX)' = zxzxzxzxzxzxzxzxzx
        test '$(call am.util.tolower,$(upper))' = '$(lower)'
        test '$(call am.util.tolower,$(lower))' = '$(lower)'
+END
 
-.PHONY: test-canonicalize
-test-canonicalize:
+T 'am.util.canon' <<'END'
+comma = ,
+dollar = $$
+bslash = \\
+test:
        test '$(call am.util.canon,A)' = A
        test '$(call am.util.canon, b)' = b
        test '$(call am.util.canon, foo  )' = foo
@@ -161,39 +180,76 @@ test-canonicalize:
        test '$(call am.util.canon,$(comma))' = '_'
        test '$(call am.util.canon,$(bslash)$(comma))' = '__'
        test '$(call am.util.canon,x$(comma)@$(bslash))' = 'address@hidden'
+END
 
-.PHONY: test-newline-1
-test-newline-1:
+FOO_ENVIRON=ok; export FOO_ENVIRON
+FOO_UNDEF=; unset FOO_UNDEF
+FOO_INDIR=; unset FOO_INDIR
+T 'am.vars.is-undef' FOO_CMDLINE=ok <<'END'
+
+FOO_MAKEFILE_1 = ok
+FOO_MAKEFILE_2 := ok
+override FOO_OVERRIDE_1 = ok
+override FOO_OVERRIDE_2 := ok
+FOO_EMPTY_1 =
+FOO_EMPTY_2 :=
+
+# Help avoiding typos.
+X = $(call am.vars.is-undef,$1)
+
+test:
+       @echo UNDEF:
+       test '$(call X,FOO_UNDEF)' = yes
+       @echo ENVIRON:
+       test '$(call X,FOO_ENVIRON)' = yes
+       @echo MAKEFILE 1:
+       test -z '$(call X,FOO_MAKEFILE_1)'
+       @echo MAKEFILE 2:
+       test -z '$(call X,FOO_MAKEFILE_2)'
+       @echo CMDLINE:
+       test -z '$(call X,FOO_CMDLINE)'
+       @echo OVERRIDE 1:
+       test -z '$(call X,FOO_OVERRIDE_1)'
+       @echo OVERRIDE 2:
+       test -z '$(call X,FOO_OVERRIDE_2)'
+       @echo EMPTY 1:
+       test -z '$(call X,FOO_EMPTY_1)'
+       @echo EMPTY 2:
+       test -z '$(call X,FOO_EMPTY_2)'
+       @echo DEFAULT:
+       test -z '$(call X,CC)'
+       @echo EXTRA SPACES:
+       test '$(call X,  FOO_UNDEF      )' = yes
+       @echo SANITY CHECKS:
+       test '$(FOO_ENVIRON)' = ok
+       test '$(FOO_CMDLINE)' = ok
+END
+unset FOO_ENVIRON
+
+T 'am.chars.newline (1)' <<'END'
+test:
        @echo OK > fo1$(am.chars.newline)@touch ba1$(am.chars.newline)-false > 
qu1
        test `cat fo1` = OK
        test -f ba1
        test -f qu1
+END
 
+T 'am.chars.newline (2)' <<'END'
 my_newline = $(am.chars.newline)
-.PHONY: test-newline-2
-test-newline-2:
+test:
        @echo OK > fo2$(my_newline)@touch ba2$(my_newline)-false > qu2
        test `cat fo2` = OK
        test -f ba2
        test -f qu2
+END
 
+T 'am.chars.newline (3)' <<'END'
+my_newline = $(am.chars.newline)
 command-1 = test x = x$(am.chars.newline)
 command-2 = test y = y$(my_newline)
-.PHONY: test-newline-3
-test-newline-3:
+test:
        $(command-1)$(command-2)touch n3
        test -f n3
 END
 
-command_ok_  am.util.strip-first-word   $MAKE test-strip-first-word
-command_ok_  am.util.strip-last-word    $MAKE test-strip-last-word
-command_ok_  am.util.uniq               $MAKE test-uniq
-command_ok_  am.util.strip-suffixes     $MAKE test-strip-suffixes
-command_ok_  am.util.tolower            $MAKE test-tolower
-command_ok_  am.util.toupper            $MAKE test-toupper
-command_ok_  am.util.canon              $MAKE test-canonicalize
-command_ok_  "am.chars.newline (1)"          $MAKE test-newline-1
-command_ok_  "am.chars.newline (2)"          $MAKE test-newline-2
-command_ok_  "am.chars.newline (3)"          $MAKE test-newline-3
-
 :
diff --git a/t/memoize.tap b/t/memoize.tap
index 5e3646b..d829918 100755
--- a/t/memoize.tap
+++ b/t/memoize.tap
@@ -23,14 +23,10 @@ plan_ 17
 
 ocwd=$(pwd) || fatal_ "couldn't get current working directory"
 
-cp "$am_amdir"/header-vars.am . \
+# Filter out Automake comments.
+grep -v '^##' "$am_amdir"/header-vars.am > defn.mk \
   || fatal_ "fetching makefile fragment headers-vars.am"
 
-# Filter out Automake comments and things that would need configure
-# substitutions.
-LC_ALL=C $EGREP -v '(^##|address@hidden@)' header-vars.am > defn.mk
-rm -f header-vars.am
-
 T ()
 {
   tcount=$(($tcount + 1))
diff --git a/t/parallel-tests-internals.sh b/t/parallel-tests-internals.sh
deleted file mode 100755
index f15852f..0000000
--- a/t/parallel-tests-internals.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Some internals of the parallel testsuite harness implementation.
-
-. ./defs || exit 1
-
-cat >> configure.ac << 'END'
-AC_OUTPUT
-END
-
-cat > Makefile.am << 'END'
-TESTS =
-.PHONY: test
-test:
-       test x'$(call am__tpfx,)'      = x
-       test x'$(call am__tpfx,.test)' = x'TEST_'
-       test x'$(call am__tpfx,.sh5)'  = x'SH5_'
-       test x'$(call am__tpfx,.x_y)'  = x'X_Y_'
-       test x'$(call am__tpfx,  )'    = x
-       test x'$(call am__tpfx, .t  )' = x'T_'
-END
-
-$ACLOCAL
-$AUTOCONF
-$AUTOMAKE -a
-
-./configure
-$MAKE test
-
-:


hooks/post-receive
-- 
GNU Automake



reply via email to

[Prev in Thread] Current Thread [Next in Thread]