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>

diff --git a/t/vala-headers.sh b/t/vala-headers.sh
index 48dbf81be33096db45928744e447fe0398731800..79a7b27c801e143600076842472204800c3c7d51 100755 (executable)
--- 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 f6a7ba9b30b4d974fc57836ff9d76dd2910e5357..c38740f99eab089fc180598924f206fc06fcab70 100755 (executable)
--- 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 2580bd07493be74e4c807c0547c6578a941e9c07..5e2e7ce287ea6e3515ed32ed6aa40f27caf516aa 100755 (executable)
--- 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 e1dbb5d480e0f5976272660e3e2151a441876572..9b2402dec4fc3e8fc577db3926a1490ad8525dfc 100755 (executable)
--- 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 d03080dcc3721f32fe291a0bdcb19dbb53987a48..c71420ad7719e59d48c750b67e5f17f2de8fead4 100755 (executable)
--- 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 2f332da6f0952d061c02b3728c87955bc69acb66..f006832a9ddb4bb1d117a039379deb1bab22977b 100755 (executable)
--- 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 9874f68b7f4ef872adfa2d171c427e348af6c34a..7428b9765b277d486d413b4160d7c41c26e1da37 100755 (executable)
--- 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 9e48549f899f53ebc2dffea483bd246351eedbcc..4869a61dd59fbdf0d481fdd77cfe048989a5bbb6 100755 (executable)
--- 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 1c5bdb9e1603c672220902fa1552f99e06cce275..2543c78e9b7aba9a76ed1a0b727842147dbf2cb4 100755 (executable)
--- 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 d9ecdea0e17c12f5a65b613bde78604b6fc451ad..96135d34e04ba0b2187454b17240b585cd7f71ad 100755 (executable)
--- 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 cf3e70eee85f5e51a137fc5ec5c2849ac4e10964..91d96bb8074244bdc5ba99667548f98d9ea56da0 100755 (executable)
--- 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 bc293468b217b3274104a2de43ff2590bf1b5e8a..9cd57f8d156838f4aad28f3c9c2316d3a4c31d1f 100755 (executable)
--- 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