From a886822243f11749781ff21eade96c0968d5e275 Mon Sep 17 00:00:00 2001
From: Fabio Fantoni <fantonifabio@tiscali.it>
Date: Fri, 2 Feb 2024 22:08:36 +0100
Subject: [PATCH] add cjs-test and enable full autopkgtest

This add package of installed tests, useful to do more tests also out of
build

Full autopkgtest help to spot regression also when depends are updated,
for example used in debian CI:
https://ci.debian.net/packages/c/cjs/unstable/amd64/

Both installed tests and autopkgtest can be used also manually by users
and developers
---
 debian/control               | 14 ++++++++++++++
 debian/rules                 | 14 +++++++++++++-
 debian/tests/control         | 12 +++++++++---
 debian/tests/installed-tests |  2 +-
 debian/tests/testsuite       |  4 ----
 5 files changed, 37 insertions(+), 9 deletions(-)
 delete mode 100755 debian/tests/testsuite

diff --git a/debian/control b/debian/control
index dc683e7b..5102b225 100644
--- a/debian/control
+++ b/debian/control
@@ -40,6 +40,20 @@ Description: Mozilla-based javascript bindings for the Cinnamon platform (cli to
  uses.
  .
  This package contains the interactive console application.
+
+Package: cjs-tests
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         cjs,
+         at-spi2-core
+Description: Mozilla-based javascript bindings for the Cinnamon platform (tests)
+ Makes it possible for applications to use all of Cinnamon's platform
+ libraries using the JavaScript language. It's mainly based on the
+ Mozilla JavaScript engine and the GObject introspection framework.
+ .
+ This package is the frozen version of gjs that the cinnamon desktop currently
+ uses.
  .
  This package contains test programs, designed to be run as part of a
  regression testsuite.
diff --git a/debian/rules b/debian/rules
index 19ae3f16..e1772ee2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,24 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-Dauto_features=enabled \
 		-Dprofiler=disabled \
-		-Dinstalled_tests=false \
+		-Dinstalled_tests=true \
 		$(NULL)
 
+execute_after_dh_auto_install:
+	rm -f debian/tmp/usr/libexec/installed-tests/cjs/js/modules/*/.eslintrc.yml
+
 override_dh_girepository:
 	dh_girepository -l $(BUILDDIR) /usr/lib/$(DEB_HOST_MULTIARCH)/cjs/girepository-1.0
 
+# debhelper >= 13.4 makes all of /usr/libexec executable, which is not
+# quite right for installed-tests
+override_dh_fixperms:
+	dh_fixperms -Xusr/libexec/installed-tests
+ifneq ($(filter %-tests,$(built_binaries)),)
+	chmod --changes u=rw,og=r debian/*-tests/usr/libexec/installed-tests/cjs/*.so
+	chmod --recursive --changes a+rX,u+w,og-w debian/*-tests/usr/libexec/installed-tests
+endif
+
 override_dh_auto_test:
 	GI_TYPELIB_PATH=$(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) \
 	obj-$(DEB_HOST_GNU_TYPE)/cjs-console -c 'print("Smoke-test OK")'
diff --git a/debian/tests/control b/debian/tests/control
index 2d64be92..f341a109 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,11 @@
+Tests: acc
+Depends: @, dh-acc, exuberant-ctags
+Restrictions: allow-stderr, superficial
+
 Tests: build
-Depends: build-essential, libcjs-dev
+Depends: libcjs-dev, build-essential
+Restrictions: superficial
+
+Tests: installed-tests
+Depends: dbus-daemon, dbus-x11, cjs-tests, gnome-desktop-testing, xauth, xvfb
 
-#Tests: installed-tests
-#Depends: dbus-daemon, dbus-x11, cjs-tests, gnome-desktop-testing, xauth, xvfb
diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index df28cae6..d4a7dd55 100755
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -9,4 +9,4 @@ export XDG_RUNTIME_DIR=$AUTOPKGTEST_TMP
 export LC_ALL=C.UTF-8
 
 # dbus outputs activation messages to stderr which fails the test
-dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner gjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner cjs 2> >(grep -vE '^(Activating|Successfully activated)')>&2
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index f0bdf42b..00000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# dh_auto_test
-make check