From 0494881b53d6a125c1e4feeb03101de351085a1b Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 31 Oct 2012 12:40:47 +0100
Subject: [PATCH] vala tests: source test-init.sh, not ./defs

This will avoid spurious errors when the new vala tests (introduced
in the 'vala-work' branch) will be merged back to master.

* t/vala-headers.sh: Adjust as said.
* t/vala-libs.sh: Likewise.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* t/vala.sh: Likewise.
* t/vala2.sh: Likewise.
* t/vala3.sh: Likewise.
* t/vala4.sh: Likewise.
* t/vala5.sh: Likewise.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 t/vala-headers.sh  | 2 +-
 t/vala-libs.sh     | 2 +-
 t/vala-mix.sh      | 2 +-
 t/vala-mix2.sh     | 2 +-
 t/vala-parallel.sh | 2 +-
 t/vala-vapi.sh     | 2 +-
 t/vala-vpath.sh    | 2 +-
 t/vala.sh          | 2 +-
 t/vala2.sh         | 2 +-
 t/vala3.sh         | 2 +-
 t/vala4.sh         | 2 +-
 t/vala5.sh         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index 48dbf81be..79a7b27c8 100755
--- a/t/vala-headers.sh
+++ b/t/vala-headers.sh
@@ -17,7 +17,7 @@
 # Test to make sure compiling Vala code really works with recursive make.
 
 required="pkg-config valac gcc GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index f6a7ba9b3..c38740f99 100755
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -18,7 +18,7 @@
 # And use of vapi files to call C code from Vala.
 
 required="valac cc pkg-config libtoolize GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 2580bd074..5e2e7ce28 100755
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -17,7 +17,7 @@
 # Vala sources and C sources in the same program.  Functional test.
 
 required='valac cc GNUmake'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index e1dbb5d48..9b2402dec 100755
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -18,7 +18,7 @@
 # program.  Functional test.  See automake bug#10894.
 
 required='valac cc c++ GNUmake'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index d03080dcc..c71420ad7 100755
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
@@ -17,7 +17,7 @@
 # Vala support with parallel make.
 
 required='valac cc GNUmake'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 2f332da6f..f006832a9 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -17,7 +17,7 @@
 # Test and that vapi files are correctly handled by Vala support.
 
 required='valac cc GNUmake'
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index 9874f68b7..7428b9765 100755
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -18,7 +18,7 @@
 # See automake bug#8753.
 
 required="cc valac GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_CONFIG_SRCDIR([hello.vala])
diff --git a/t/vala.sh b/t/vala.sh
index 9e48549f8..4869a61dd 100755
--- a/t/vala.sh
+++ b/t/vala.sh
@@ -16,7 +16,7 @@
 
 # Basic "grepping" test on vala support.
 
-. ./defs || exit 1
+. test-init.sh
 
 # So that we won't require libtool macros.
 cat > acinclude.m4 <<'END'
diff --git a/t/vala2.sh b/t/vala2.sh
index 1c5bdb9e1..2543c78e9 100755
--- a/t/vala2.sh
+++ b/t/vala2.sh
@@ -17,7 +17,7 @@
 # Test to make sure compiling Vala code really works with recursive make.
 
 required="pkg-config valac gcc GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 mkdir src
 
diff --git a/t/vala3.sh b/t/vala3.sh
index d9ecdea0e..96135d34e 100755
--- a/t/vala3.sh
+++ b/t/vala3.sh
@@ -17,7 +17,7 @@
 # Test to make sure compiling Vala code really works with non-recursive make.
 
 required="pkg-config valac gcc GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 mkdir src
 
diff --git a/t/vala4.sh b/t/vala4.sh
index cf3e70eee..91d96bb80 100755
--- a/t/vala4.sh
+++ b/t/vala4.sh
@@ -16,7 +16,7 @@
 
 # Test AM_PROG_VALAC.
 
-. ./defs || exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
diff --git a/t/vala5.sh b/t/vala5.sh
index bc293468b..9cd57f8d1 100755
--- a/t/vala5.sh
+++ b/t/vala5.sh
@@ -17,7 +17,7 @@
 # Test per-target flags.
 
 required="pkg-config valac gcc GNUmake"
-. ./defs || exit 1
+. test-init.sh
 
 mkdir src
 
-- 
2.47.2