summaryrefslogtreecommitdiff
path: root/Build/source/libs/lua52
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-03 10:38:50 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-03-03 10:38:50 +0000
commitff09b3baf412d5e76069d928b3be7faf1f909a72 (patch)
treee497ea8ed4caa349ccd8ed1b399650d54f037026 /Build/source/libs/lua52
parent8a4e73b3b2f4ffef7bf105234e9b023f30cf2816 (diff)
libs/lua52: New test checking error handling
libs/luajit: New test checking error handling git-svn-id: svn://tug.org/texlive/trunk@33086 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/lua52')
-rw-r--r--Build/source/libs/lua52/ChangeLog7
-rw-r--r--Build/source/libs/lua52/Makefile.am14
-rw-r--r--Build/source/libs/lua52/Makefile.in43
-rwxr-xr-xBuild/source/libs/lua52/configure57
-rw-r--r--Build/source/libs/lua52/configure.ac4
-rw-r--r--Build/source/libs/lua52/error.exp5
-rwxr-xr-xBuild/source/libs/lua52/luaerror.test11
7 files changed, 129 insertions, 12 deletions
diff --git a/Build/source/libs/lua52/ChangeLog b/Build/source/libs/lua52/ChangeLog
index b4b0c66945c..97cb5ff06e8 100644
--- a/Build/source/libs/lua52/ChangeLog
+++ b/Build/source/libs/lua52/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-03 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * luaerror.test (new): Shell script to test error handling.
+ * error.exp (new): Expected test output.
+ * Makefile.am: Add the new files.
+ * configure.ac: The test program requires sqrt().
+
2014-02-11 Peter Breitenlohner <peb@mppmu.mpg.de>
* lua52.test (new): Shell script for a basic test.
diff --git a/Build/source/libs/lua52/Makefile.am b/Build/source/libs/lua52/Makefile.am
index 014598e1522..e8ef2795699 100644
--- a/Build/source/libs/lua52/Makefile.am
+++ b/Build/source/libs/lua52/Makefile.am
@@ -63,21 +63,27 @@ nodist_liblua52_a_SOURCES = \
@LUA52_TREE@/src/lzio.c
if build
-check_PROGRAMS = luatest
-dist_check_SCRIPTS = lua52.test
-TESTS = lua52.test
+check_PROGRAMS = luatest luatry
+dist_check_SCRIPTS = lua52.test luaerror.test
+TESTS = lua52.test luaerror.test
endif build
luatest_SOURCES = luatest.c
luatest_CPPFLAGS = -Iinclude
+nodist_luatry_SOURCES = @LUA52_TREE@/src/lua.c
+
+luatry_CPPFLAGS = -Iinclude
+
LDADD = liblua52.a
+EXTRA_DIST += error.exp
+CLEANFILES = error.out
+
# Rebuild
rebuild_prereq =
rebuild_target = all
-CLEANFILES =
include $(srcdir)/../../am/rebuild.am
diff --git a/Build/source/libs/lua52/Makefile.in b/Build/source/libs/lua52/Makefile.in
index c8b385e7e2a..c7a26f2e7a3 100644
--- a/Build/source/libs/lua52/Makefile.in
+++ b/Build/source/libs/lua52/Makefile.in
@@ -76,7 +76,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-@build_TRUE@check_PROGRAMS = luatest$(EXEEXT)
+@build_TRUE@check_PROGRAMS = luatest$(EXEEXT) luatry$(EXEEXT)
DIST_COMMON = $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
$(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(srcdir)/config.h.in \
@@ -154,7 +154,11 @@ am_luatest_OBJECTS = luatest-luatest.$(OBJEXT)
luatest_OBJECTS = $(am_luatest_OBJECTS)
luatest_LDADD = $(LDADD)
luatest_DEPENDENCIES = liblua52.a
-am__dist_check_SCRIPTS_DIST = lua52.test
+nodist_luatry_OBJECTS = @LUA52_TREE@/src/luatry-lua.$(OBJEXT)
+luatry_OBJECTS = $(nodist_luatry_OBJECTS)
+luatry_LDADD = $(LDADD)
+luatry_DEPENDENCIES = liblua52.a
+am__dist_check_SCRIPTS_DIST = lua52.test luaerror.test
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
@@ -187,7 +191,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(nodist_liblua52_a_SOURCES) $(luatest_SOURCES)
+SOURCES = $(nodist_liblua52_a_SOURCES) $(luatest_SOURCES) \
+ $(nodist_luatry_SOURCES)
DIST_SOURCES = $(luatest_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
@@ -570,7 +575,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES
+EXTRA_DIST = $(LUA52_TREE) $(LUA52_TREE)-PATCHES error.exp
SUBDIRS = . include
AM_CPPFLAGS = -I$(top_srcdir)/$(LUA52_TREE)/src $(LUA52_DEFINES)
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -610,16 +615,18 @@ nodist_liblua52_a_SOURCES = \
@LUA52_TREE@/src/lvm.c \
@LUA52_TREE@/src/lzio.c
-@build_TRUE@dist_check_SCRIPTS = lua52.test
-@build_TRUE@TESTS = lua52.test
+@build_TRUE@dist_check_SCRIPTS = lua52.test luaerror.test
+@build_TRUE@TESTS = lua52.test luaerror.test
luatest_SOURCES = luatest.c
luatest_CPPFLAGS = -Iinclude
+nodist_luatry_SOURCES = @LUA52_TREE@/src/lua.c
+luatry_CPPFLAGS = -Iinclude
LDADD = liblua52.a
+CLEANFILES = error.out rebuild.stamp
# Rebuild
rebuild_prereq =
rebuild_target = all
-CLEANFILES = rebuild.stamp
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -760,6 +767,13 @@ clean-checkPROGRAMS:
luatest$(EXEEXT): $(luatest_OBJECTS) $(luatest_DEPENDENCIES) $(EXTRA_luatest_DEPENDENCIES)
@rm -f luatest$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(luatest_OBJECTS) $(luatest_LDADD) $(LIBS)
+@LUA52_TREE@/src/luatry-lua.$(OBJEXT): \
+ @LUA52_TREE@/src/$(am__dirstamp) \
+ @LUA52_TREE@/src/$(DEPDIR)/$(am__dirstamp)
+
+luatry$(EXEEXT): $(luatry_OBJECTS) $(luatry_DEPENDENCIES) $(EXTRA_luatry_DEPENDENCIES)
+ @rm -f luatry$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(luatry_OBJECTS) $(luatry_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -798,6 +812,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/ltable.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/ltablib.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/ltm.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/lundump.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/lvm.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@@LUA52_TREE@/src/$(DEPDIR)/lzio.Po@am__quote@
@@ -832,6 +847,20 @@ luatest-luatest.obj: luatest.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o luatest-luatest.obj `if test -f 'luatest.c'; then $(CYGPATH_W) 'luatest.c'; else $(CYGPATH_W) '$(srcdir)/luatest.c'; fi`
+@LUA52_TREE@/src/luatry-lua.o: @LUA52_TREE@/src/lua.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatry_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUA52_TREE@/src/luatry-lua.o -MD -MP -MF @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Tpo -c -o @LUA52_TREE@/src/luatry-lua.o `test -f '@LUA52_TREE@/src/lua.c' || echo '$(srcdir)/'`@LUA52_TREE@/src/lua.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Tpo @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUA52_TREE@/src/lua.c' object='@LUA52_TREE@/src/luatry-lua.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatry_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUA52_TREE@/src/luatry-lua.o `test -f '@LUA52_TREE@/src/lua.c' || echo '$(srcdir)/'`@LUA52_TREE@/src/lua.c
+
+@LUA52_TREE@/src/luatry-lua.obj: @LUA52_TREE@/src/lua.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatry_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUA52_TREE@/src/luatry-lua.obj -MD -MP -MF @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Tpo -c -o @LUA52_TREE@/src/luatry-lua.obj `if test -f '@LUA52_TREE@/src/lua.c'; then $(CYGPATH_W) '@LUA52_TREE@/src/lua.c'; else $(CYGPATH_W) '$(srcdir)/@LUA52_TREE@/src/lua.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Tpo @LUA52_TREE@/src/$(DEPDIR)/luatry-lua.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUA52_TREE@/src/lua.c' object='@LUA52_TREE@/src/luatry-lua.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(luatry_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUA52_TREE@/src/luatry-lua.obj `if test -f '@LUA52_TREE@/src/lua.c'; then $(CYGPATH_W) '@LUA52_TREE@/src/lua.c'; else $(CYGPATH_W) '$(srcdir)/@LUA52_TREE@/src/lua.c'; fi`
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run 'make' without going through this Makefile.
# To change the values of 'make' variables: instead of editing Makefiles,
diff --git a/Build/source/libs/lua52/configure b/Build/source/libs/lua52/configure
index fcb505b3efc..f80ec0715e9 100755
--- a/Build/source/libs/lua52/configure
+++ b/Build/source/libs/lua52/configure
@@ -4670,6 +4670,63 @@ else
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5
+$as_echo_n "checking for library containing sqrt... " >&6; }
+if ${ac_cv_search_sqrt+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char sqrt ();
+int
+main ()
+{
+return sqrt ();
+ ;
+ return 0;
+}
+_ACEOF
+for ac_lib in '' m; do
+ if test -z "$ac_lib"; then
+ ac_res="none required"
+ else
+ ac_res=-l$ac_lib
+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
+ fi
+ if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_search_sqrt=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext
+ if ${ac_cv_search_sqrt+:} false; then :
+ break
+fi
+done
+if ${ac_cv_search_sqrt+:} false; then :
+
+else
+ ac_cv_search_sqrt=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5
+$as_echo "$ac_cv_search_sqrt" >&6; }
+ac_res=$ac_cv_search_sqrt
+if test "$ac_res" != no; then :
+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+
+fi
+
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
if ${kpse_cv_have_win32+:} false; then :
diff --git a/Build/source/libs/lua52/configure.ac b/Build/source/libs/lua52/configure.ac
index e93e4114728..727a7311672 100644
--- a/Build/source/libs/lua52/configure.ac
+++ b/Build/source/libs/lua52/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2013, 2014 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -25,6 +25,8 @@ AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D's on command
AM_CONDITIONAL([build], [test "x$enable_build" != xno])
+AC_SEARCH_LIBS([sqrt], [m])
+
KPSE_LUA52_DEFINES
KPSE_LARGEFILE([LUA52_DEFINES])
diff --git a/Build/source/libs/lua52/error.exp b/Build/source/libs/lua52/error.exp
new file mode 100644
index 00000000000..6b84f091ddf
--- /dev/null
+++ b/Build/source/libs/lua52/error.exp
@@ -0,0 +1,5 @@
+./luatry: (command line):1: test
+stack traceback:
+ [C]: in function 'error'
+ (command line):1: in main chunk
+ [C]: in ?
diff --git a/Build/source/libs/lua52/luaerror.test b/Build/source/libs/lua52/luaerror.test
new file mode 100755
index 00000000000..2f6958b3a4c
--- /dev/null
+++ b/Build/source/libs/lua52/luaerror.test
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+# Copyright (C) 2014 Peter Breitenlohner <tex-live@tug.org>
+# You may freely use, modify and/or distribute this file.
+
+./luatry -e "error('test')" 2>error.out && exit 1
+
+diff $srcdir/error.exp error.out || exit 1
+
+
+