From 4348577bc8beda1443f137e82ce088c300404916 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 15 May 2013 22:05:21 +0200 Subject: vala tests: skip in a cross compiler setup The "vala + pkg-config" doesn't interact well with cross-compilation: That is causing annoying failures in our testsuite when it's run in cross-compilation mode. It's not worth trying too be overly smart and work around these problems; just skip the affected tests instead. * t/ax/am-test-lib.sh (require_tool): A new requirement 'valac', telling that the test needs to compile Vala-generated C files. In particular, this causes the test to be skipped when using a cross-compiler. Signed-off-by: Stefano Lattarini --- t/ax/am-test-lib.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 't') diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh index 8508197b9..e14f96fab 100644 --- a/t/ax/am-test-lib.sh +++ b/t/ax/am-test-lib.sh @@ -765,6 +765,19 @@ require_tool () echo "$me: running bison --version" bison --version || skip_all_ "required program 'bison' not available" ;; + valac) + echo "$me: running valac --version" + if ! valac --version; then + skip_all_ "required program 'valac' not available" + elif cross_compiling; then + skip_all_ "cross-compiling valac-generated C files is brittle" + fi + # TODO: We also know we need GNU make, the C compiler, and pkg-config + # here, but there is no easy way to express this with the current + # code organization. We should improve the situation, sooner or + # later. At which point the tests requiring 'valac' can drop the + # explicit requirements for those tools. + ;; *) # Generic case: the tool must support --version. echo "$me: running $1 --version" -- cgit v1.2.1