From 5b70120293f3702f290fba5023a7016fa5ff1beb Mon Sep 17 00:00:00 2001 From: Hilko Bengen Date: Mon, 17 Dec 2012 22:24:03 +0100 Subject: [PATCH] lua: Use correct binary for tests --- lua/run-bindtests | 4 +++- lua/tests/010-load.lua | 5 ++++- lua/tests/015-globals.lua | 5 ++++- lua/tests/020-create.lua | 5 ++++- lua/tests/025-create-flags.lua | 5 ++++- lua/tests/027-create-multiple.lua | 5 ++++- lua/tests/030-config.lua | 5 ++++- lua/tests/050-lvcreate.lua | 5 ++++- lua/tests/060-readdir.lua | 5 ++++- lua/tests/070-optargs.lua | 5 ++++- lua/tests/400-events.lua | 5 ++++- lua/tests/400-progress.lua | 5 ++++- lua/tests/900-errors.lua | 5 ++++- run.in | 1 + 14 files changed, 52 insertions(+), 13 deletions(-) diff --git a/lua/run-bindtests b/lua/run-bindtests index 170e45b83..fd2e67fa4 100755 --- a/lua/run-bindtests +++ b/lua/run-bindtests @@ -16,5 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -lua bindtests.lua > bindtests.tmp +set -e + +$LUA $srcdir/bindtests.lua > bindtests.tmp diff -u $srcdir/../bindtests bindtests.tmp diff --git a/lua/tests/010-load.lua b/lua/tests/010-load.lua index 4443e3221..7a4b19280 100755 --- a/lua/tests/010-load.lua +++ b/lua/tests/010-load.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/015-globals.lua b/lua/tests/015-globals.lua index 9733ef5c0..92f83174f 100755 --- a/lua/tests/015-globals.lua +++ b/lua/tests/015-globals.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/020-create.lua b/lua/tests/020-create.lua index b7e748d6e..75c650a05 100755 --- a/lua/tests/020-create.lua +++ b/lua/tests/020-create.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/025-create-flags.lua b/lua/tests/025-create-flags.lua index 08865c70e..ddaa97bc6 100755 --- a/lua/tests/025-create-flags.lua +++ b/lua/tests/025-create-flags.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/027-create-multiple.lua b/lua/tests/027-create-multiple.lua index a3f8c8cf5..af2a2adca 100755 --- a/lua/tests/027-create-multiple.lua +++ b/lua/tests/027-create-multiple.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/030-config.lua b/lua/tests/030-config.lua index d70528c0d..a5a63ee06 100755 --- a/lua/tests/030-config.lua +++ b/lua/tests/030-config.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/050-lvcreate.lua b/lua/tests/050-lvcreate.lua index 9fd5bec71..4b1e51beb 100755 --- a/lua/tests/050-lvcreate.lua +++ b/lua/tests/050-lvcreate.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/060-readdir.lua b/lua/tests/060-readdir.lua index b14813701..00f594fd8 100755 --- a/lua/tests/060-readdir.lua +++ b/lua/tests/060-readdir.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/070-optargs.lua b/lua/tests/070-optargs.lua index 00559a1b8..31155b30a 100755 --- a/lua/tests/070-optargs.lua +++ b/lua/tests/070-optargs.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/400-events.lua b/lua/tests/400-events.lua index c17bdc27b..af1618cea 100755 --- a/lua/tests/400-events.lua +++ b/lua/tests/400-events.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/400-progress.lua b/lua/tests/400-progress.lua index 293a46310..728f4aab1 100755 --- a/lua/tests/400-progress.lua +++ b/lua/tests/400-progress.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/lua/tests/900-errors.lua b/lua/tests/900-errors.lua index c560f7f4c..7dc45a994 100755 --- a/lua/tests/900-errors.lua +++ b/lua/tests/900-errors.lua @@ -1,4 +1,7 @@ -#!/usr/bin/lua +#!/bin/sh +# -*- lua -*- +test -z "$LUA" /usr/bin/lua/usr/bin/lua LUA=/usr/bin/lua +exec $LUA << END_OF_FILE -- libguestfs Lua bindings -*- lua -*- -- Copyright (C) 2012 Red Hat Inc. -- diff --git a/run.in b/run.in index 36946f43c..9cfa88d6a 100755 --- a/run.in +++ b/run.in @@ -116,6 +116,7 @@ fi export PATH # For Lua. +export LUA=@LUA@ if [ -z "$LUA_CPATH" ]; then LUA_CPATH="$b/lua/?.so" else