r54442 - in /desktop/unstable/gjs/debian: changelog rules test.sh

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sun Oct 15 10:51:12 2017
New Revision: 54442

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54442
Log:
  - d/test.sh: Wrap tests in a script, making failures non-fatal on
    the same architectures as mozjs52
  - d/test.sh: Run a smoke-test (a "hello world" program) to prove
    that the interpreter has any sort of functionality at all

Added:
    desktop/unstable/gjs/debian/test.sh   (with props)
Modified:
    desktop/unstable/gjs/debian/changelog
    desktop/unstable/gjs/debian/rules

Modified: desktop/unstable/gjs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/changelog?rev=54442&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gjs/debian/changelog	[utf-8] Sun Oct 15 10:51:12 2017
@@ -3,6 +3,10 @@
   * d/rules: Actually run build-time tests. Thanks, Adrian Bunk
     (Closes: #878610)
     - d/rules: Run tests with VERBOSE=1 like dh_auto_test would
+    - d/test.sh: Wrap tests in a script, making failures non-fatal on
+      the same architectures as mozjs52
+    - d/test.sh: Run a smoke-test (a "hello world" program) to prove
+      that the interpreter has any sort of functionality at all
 
  -- Simon McVittie <smcv at debian.org>  Sun, 15 Oct 2017 11:38:51 +0100
 

Modified: desktop/unstable/gjs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/rules?rev=54442&op=diff
==============================================================================
--- desktop/unstable/gjs/debian/rules	[utf-8] (original)
+++ desktop/unstable/gjs/debian/rules	[utf-8] Sun Oct 15 10:51:12 2017
@@ -27,7 +27,7 @@
 
 override_dh_auto_test:
 ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
-	VERBOSE=1 make check
+	DEB_HOST_ARCH=$(DEB_HOST_ARCH) debian/test.sh
 endif
 
 override_dh_makeshlibs:

Added: desktop/unstable/gjs/debian/test.sh
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gjs/debian/test.sh?rev=54442&op=file
==============================================================================
--- desktop/unstable/gjs/debian/test.sh	(added)
+++ desktop/unstable/gjs/debian/test.sh	[utf-8] Sun Oct 15 10:51:12 2017
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+: "${DEB_HOST_ARCH:=$(dpkg --print-architecture)}"
+
+if "./gjs-console" -c 'print("Hello, world")'; then
+	echo "Smoke-test successful, continuing with full test suite"
+else
+	echo "Smoke-test failed: did interpreter initialization fail? (see #873778)"
+	exit 1
+fi
+
+if make -k check VERBOSE=1; then
+	echo "check successful"
+else
+	echo "check failed, checking whether to continue anyway..."
+
+	case "${DEB_HOST_ARCH}" in
+		(kfreebsd-i386|kfreebsd-amd64)
+			echo "Ignoring test failure, https://bugs.debian.org/878331"
+			;;
+		(mips64el)
+			echo "Ignoring test failure, https://bugs.debian.org/877428"
+			;;
+		(mips)
+			echo "Ignoring test failure, https://bugs.debian.org/878284"
+			;;
+		(ppc64el)
+			echo "Ignoring test failure, https://bugs.debian.org/878319"
+			;;
+		(s390x|ppc64)
+			echo "Ignoring test failure, https://bugs.debian.org/878286"
+			;;
+		(powerpc|s390x|ppc64)
+			echo "Ignoring test failure, https://bugs.debian.org/878285"
+			;;
+		(*)
+			echo "Test failure is considered serious, causing FTBFS"
+			exit 1
+	esac
+fi

Propchange: desktop/unstable/gjs/debian/test.sh
------------------------------------------------------------------------------
    svn:executable = *