From: Ralf Wildenhues Date: Sun, 13 Sep 2009 11:40:06 +0000 (+0200) Subject: testsuite: improve Erlang tests portability, overridability. X-Git-Tag: v2.65~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83989941d307b772d92356f49d25a82a806e7b08;p=thirdparty%2Fautoconf.git testsuite: improve Erlang tests portability, overridability. * tests/autotest.at (Erlang Eunit unit tests): Use "no" as value-if-not-found for Erlang tools. * tests/erlang.at: Likewise. Also, use AS_EXIT instead of plain exit. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index 568e48aa..60a4daaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-09-14 Ralf Wildenhues + + testsuite: improve Erlang tests portability, overridability. + * tests/autotest.at (Erlang Eunit unit tests): Use "no" as + value-if-not-found for Erlang tools. + * tests/erlang.at: Likewise. Also, use AS_EXIT instead of plain + exit. + 2009-09-13 Ralf Wildenhues * bin/autoupdate.in: Fix typos in comments. diff --git a/tests/autotest.at b/tests/autotest.at index 05e7cce8..8b0a6c25 100644 --- a/tests/autotest.at +++ b/tests/autotest.at @@ -1438,9 +1438,9 @@ AT_KEYWORDS([Erlang]) mkdir s t AT_DATA([configure.ac], [[AC_INIT -AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then +AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then HAVE_ERLANG=no HAVE_EUNIT=no else diff --git a/tests/erlang.at b/tests/erlang.at index 7865b144..34023807 100644 --- a/tests/erlang.at +++ b/tests/erlang.at @@ -30,9 +30,9 @@ AT_BANNER([Erlang low level compiling and utility macros.]) ## ----------------- ## AT_CHECK_MACRO([Erlang], -[[AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then exit 77; fi +[[AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then AS_EXIT([77]); fi AC_LANG([Erlang]) ## Can't compile, but can run an Erlang module: AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [halt(0)])], @@ -52,9 +52,9 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([], [halt(0)])], ## ---------------------- ## AT_CHECK_MACRO([AC_ERLANG_CHECK_LIB], -[[AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then exit 77; fi +[[AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then AS_EXIT([77]); fi AC_ERLANG_CHECK_LIB([stdlib], [AC_MSG_RESULT([ok])], [AC_MSG_RESULT([failed])]) @@ -72,9 +72,9 @@ fi ## --------------------------- ## AT_CHECK_MACRO([AC_ERLANG_SUBST_ROOT_DIR], -[[AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then exit 77; fi +[[AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then AS_EXIT([77]); fi AC_ERLANG_SUBST_ROOT_DIR ## Test that the root path detection really detected a directory: if test ! -d "$ERLANG_ROOT_DIR"; then @@ -89,9 +89,9 @@ fi ## -------------------------- ## AT_CHECK_MACRO([AC_ERLANG_SUBST_LIB_DIR], -[[AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then exit 77; fi +[[AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then AS_EXIT([77]); fi AC_ERLANG_SUBST_LIB_DIR ## Test that the lib path detection really detected a directory: if test ! -d "$ERLANG_LIB_DIR"; then @@ -128,9 +128,9 @@ fi ## -------------------------- ## AT_CHECK_MACRO([AC_ERLANG_SUBST_ERTS_VER], -[[AC_ERLANG_PATH_ERL([not found]) -AC_ERLANG_PATH_ERLC([not found]) -if test "$ERL" = "not found" || test "$ERLC" = "not found"; then exit 77; fi +[[AC_ERLANG_PATH_ERL([no]) +AC_ERLANG_PATH_ERLC([no]) +if test "$ERL" = "no" || test "$ERLC" = "no"; then AS_EXIT([77]); fi AC_ERLANG_SUBST_ERTS_VER ]], [AT_KEYWORDS([Erlang])])