[SCM] GNU Autoconf source repository branch, master, updated. v2.64-21-g206564a

[Ralf Wildenhues]

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 Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=206564ac3e22cc5533f1a915f7744ba5904495cb

The branch, master has been updated
       via  206564ac3e22cc5533f1a915f7744ba5904495cb (commit)
       via  1c17608e794e873aa375b5d6e3d0ceed327ae0b1 (commit)
       via  62c0ca770a1d8427d61251d895403336fbcdaf04 (commit)
      from  5c36d61f64449d4f3a820db66b0fb3acbf60d83c (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 206564ac3e22cc5533f1a915f7744ba5904495cb
Author: Romain Lenglet <address@hidden>
Date:   Sat Aug 22 10:48:38 2009 +0200

    Fix AT_CHECK_EUNIT for versions of Erlang/OTP without init:stop/1.
    
    * lib/autotest/specific.m4 (AT_CHECK_EUNIT): Support older
    versions of Erlang/OTP with an erlang:stop() function that doesn't
    take arguments.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 1c17608e794e873aa375b5d6e3d0ceed327ae0b1
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Aug 22 10:45:10 2009 +0200

    Drop unneeded line in Eunit test.
    
    * tests/autotest.at (Erlang Eunit unit tests): Do not copy
    install-sh.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 62c0ca770a1d8427d61251d895403336fbcdaf04
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Aug 22 10:43:51 2009 +0200

    Fix build dependencies for Erlang macro files.
    
    * lib/freeze.mk (autotest_m4f_dependencies): Add
    $(src_libdir)/autotest/specific.m4.
    * tests/Makefile.am (AUTOCONF_FILES): Add erlang.m4.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                |   18 ++++++++++++++++++
 lib/autotest/specific.m4 |   11 +++++++----
 lib/freeze.mk            |    3 ++-
 tests/Makefile.am        |    1 +
 tests/autotest.at        |    1 -
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dff72dc..b468323 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-08-22  Romain Lenglet  <address@hidden>
+
+       Fix AT_CHECK_EUNIT for versions of Erlang/OTP without init:stop/1.
+       * lib/autotest/specific.m4 (AT_CHECK_EUNIT): Support older
+       versions of Erlang/OTP with an erlang:stop() function that doesn't
+       take arguments.
+
+2009-08-22  Ralf Wildenhues  <address@hidden>
+
+       Drop unneeded line in Eunit test.
+       * tests/autotest.at (Erlang Eunit unit tests): Do not copy
+       install-sh.
+
+       Fix build dependencies for Erlang macro files.
+       * lib/freeze.mk (autotest_m4f_dependencies): Add
+       $(src_libdir)/autotest/specific.m4.
+       * tests/Makefile.am (AUTOCONF_FILES): Add erlang.m4.
+
 2009-09-19  Paolo Bonzini  <address@hidden>
 
        Use a separate program to test whether the compiler works.
diff --git a/lib/autotest/specific.m4 b/lib/autotest/specific.m4
index df32cfe..e1a21c8 100644
--- a/lib/autotest/specific.m4
+++ b/lib/autotest/specific.m4
@@ -74,12 +74,13 @@ test(Options) ->
   TestSpec = $2,
   ReturnValue = case code:load_file(eunit) of
     {module, _} -> case eunit:test(TestSpec, Options) of
-        ok -> 0; %% test passes
-        _  -> 1  %% test fails
+        ok -> "0\n"; %% test passes
+        _  -> "1\n"  %% test fails
       end;
-    _ -> 77 %% EUnit not found, test skipped
+    _ -> "77\n" %% EUnit not found, test skipped
   end,
-  init:stop(ReturnValue).
+  file:write_file("$1.result", ReturnValue),
+  init:stop().
 ]])
 AT_CHECK(["$ERLC" $ERLCFLAGS -b beam $1.erl])
 ## Make EUnit verbose when testsuite is verbose:
@@ -90,4 +91,6 @@ else
 fi
 AT_CHECK(["$ERL" $3 -s $1 test $at_eunit_options -noshell], [0], [ignore], [],
          [$4], [$5])
+AT_CAPTURE_FILE([$1.result])
+AT_CHECK([test -f "$1.result" && (exit `cat "$1.result"`)])
 ])
diff --git a/lib/freeze.mk b/lib/freeze.mk
index 2237101..45e68e2 100644
--- a/lib/freeze.mk
+++ b/lib/freeze.mk
@@ -74,7 +74,8 @@ m4sh_m4f_dependencies =                               \
 autotest_m4f_dependencies =                    \
        $(m4sh_m4f_dependencies)                \
        $(src_libdir)/autotest/autotest.m4      \
-       $(src_libdir)/autotest/general.m4
+       $(src_libdir)/autotest/general.m4       \
+       $(src_libdir)/autotest/specific.m4
 
 autoconf_m4f_dependencies =                    \
        $(m4sh_m4f_dependencies)                \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4c29a6e..085c9d1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -168,6 +168,7 @@ AUTOCONF_FILES = $(autoconfdir)/general.m4 \
                 $(autoconfdir)/functions.m4 \
                 $(autoconfdir)/lang.m4 \
                 $(autoconfdir)/c.m4 \
+                $(autoconfdir)/erlang.m4 \
                 $(autoconfdir)/fortran.m4 \
                 $(autoconfdir)/headers.m4 \
                 $(autoconfdir)/libs.m4 \
diff --git a/tests/autotest.at b/tests/autotest.at
index ced792b..5310ab5 100644
--- a/tests/autotest.at
+++ b/tests/autotest.at
@@ -1457,7 +1457,6 @@ AC_CONFIG_FILES([s/compile], [chmod +x s/compile])
 AC_CONFIG_FILES([erlang.conf])
 AC_OUTPUT
 ]])
-cp "$abs_top_srcdir/build-aux/install-sh" pkg
 
 # File to pass info back to us
 AT_DATA([erlang.conf.in],


hooks/post-receive
-- 
GNU Autoconf source repository