Étienne Mollier pushed to branch master at Debian Med / gdpc
Commits:
6f80d75c by Étienne Mollier at 2021-02-06T15:45:57+01:00
Add myself to uploaders.
- - - - -
b1e4c005 by Étienne Mollier at 2021-02-06T15:47:58+01:00
Rewrote the test suite for more clarity
The initial variant has been running all three examples at the same
time, faster but making it hard to identify the location of the issue.
The test is more verbose too. I'm afraid I might have introduced some
bashisms though.
- - - - -
bacf555a by Étienne Mollier at 2021-02-06T16:19:39+01:00
d/{,t/}control: exclude i386 and s390x
- - - - -
96e58f7a by Étienne Mollier at 2021-02-06T16:22:29+01:00
d/t/r-u-test: add missing --append
- - - - -
58e7418a by Étienne Mollier at 2021-02-06T17:01:45+01:00
d/t/run-unit-test: add simple test
- - - - -
8776261e by Étienne Mollier at 2021-02-06T17:09:42+01:00
fix process filters
- - - - -
2b998037 by Étienne Mollier at 2021-02-06T17:28:40+01:00
routine-update: Ready to upload to unstable
- - - - -
6 changed files:
- − Makefile.orig
- debian/README.test
- debian/changelog
- debian/control
- debian/tests/control
- debian/tests/run-unit-test
Changes:
=====================================
Makefile.orig deleted
=====================================
@@ -1,35 +0,0 @@
-CC = gcc -g
-CFLAGS=-Wall `pkg-config --cflags gtk+-2.0 gthread-2.0` -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED
-LIBS=`pkg-config --libs gtk+-2.0 gthread-2.0`
-bindir ?= /usr/bin
-
-.c.o:
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $<
-
-gdpc: main.o colors.o sort.o drawatoms.o readinput.o init.o rotate.o setup.o
Makefile
- $(CC) $(CFLAGS) -o gdpc main.o colors.o drawatoms.o init.o sort.o
rotate.o setup.o readinput.o $(LIBS)
-
-main.o: main.c parameters.h
-
-colors.o: colors.c parameters.h
-
-readinput.o: readinput.c parameters.h
-
-drawatoms.o: drawatoms.c parameters.h
-
-init.o: init.c parameters.h
-
-sort.o: sort.c parameters.h
-
-rotate.o: rotate.c parameters.h
-
-setup.o: setup.c parameters.h tooltips.h
-
-clean:
- rm *.o gdpc
-
-install:
- install gdpc $(bindir)
-
-uninstall:
- rm $(bindir)/gdpc
=====================================
debian/README.test
=====================================
@@ -3,6 +3,6 @@ Notes on how this package can be tested.
This package can be tested by running the provided test:
- sh run-unit-test
+ bash run-unit-test
in order to confirm its integrity.
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+gdpc (2.2.5-12) unstable; urgency=medium
+
+ * Add myself to uploaders.
+ * d/{,t/}control: exclude i386 and s390x from supported architectures.
+
+ -- Étienne Mollier <[email protected]> Sat, 06 Feb 2021 17:27:12
+0100
+
gdpc (2.2.5-11) unstable; urgency=medium
* Nelson A. de Oliveira left Debian so remove him from Uploaders
=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
Source: gdpc
Maintainer: Debian Med Packaging Team
<[email protected]>
-Uploaders: Andreas Tille <[email protected]>
+Uploaders: Andreas Tille <[email protected]>,
+ Étienne Mollier <[email protected]>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
@@ -12,7 +13,7 @@ Homepage:
https://web.archive.org/web/20180212152753/http://www.frantz.fi/softwa
Rules-Requires-Root: no
Package: gdpc
-Architecture: any
+Architecture: any-amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64
Depends: ${shlibs:Depends},
${misc:Depends}
Suggests: gdpc-examples (>= ${source:Version}),
=====================================
debian/tests/control
=====================================
@@ -1,3 +1,4 @@
Tests: run-unit-test
-Depends: @, xvfb, xauth
+Depends: @, xvfb, xauth, procps
Restrictions: allow-stderr
+Architecture: any-amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64
=====================================
debian/tests/run-unit-test
=====================================
@@ -8,6 +8,29 @@ if [ "$AUTOPKGTEST_TMP" = "" ] ; then
trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
fi
+check_n_cleanup () {
+ local gdpc_pids="$(
+ ps aux \
+ | awk "/^$USER"'.*bin[/]gdpc/ {print$2}' \
+ | xargs
+ )"
+
+ local xvfb_pids="$(
+ ps aux \
+ | awk -vORS=' ' "/^$USER"'.*[X]vfb/ {print$2}' \
+ | xargs
+ )"
+
+ if [ -n "$gdpc_pids" ]
+ then
+ kill $gdpc_pids
+ else
+ printf -- 'error: gdpc crashed before the end of the test\n' >&2
+ exit 1
+ fi
+ test -n "$xvfb_pids" && kill $xvfb_pids
+}
+
cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
cd $AUTOPKGTEST_TMP
@@ -15,15 +38,32 @@ cd $AUTOPKGTEST_TMP
gunzip *.gz
rm -f test.log
+set -v
#test recipe from README file
-xvfb-run --auto-servernum /usr/bin/gdpc cube 30 m 2 d 20 erase 1 2 3 4
liquid.test 2>&1 | tee >> test.log &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase xyz 2 3 4 5 md.test
2>&1 | tee >> test.log &
-xvfb-run --auto-servernum /usr/bin/gdpc m 2 d 10 erase usetypes xyz 2 3 4 5
manytypes.test 2>&1 | tee >> test.log &
+xvfb-run --auto-servernum \
+ /usr/bin/gdpc 2>&1 \
+ | tee --append test.log &
+sleep 10
+check_n_cleanup
+
+xvfb-run --auto-servernum \
+ /usr/bin/gdpc cube 30 m 2 d 20 erase 1 2 3 4 liquid.test 2>&1 \
+ | tee --append test.log &
+sleep 10
+check_n_cleanup
+
+xvfb-run --auto-servernum \
+ /usr/bin/gdpc m 2 d 10 erase xyz 2 3 4 5 md.test 2>&1 \
+ | tee --append test.log &
+sleep 10
+check_n_cleanup
+xvfb-run --auto-servernum \
+ /usr/bin/gdpc m 2 d 10 erase usetypes xyz 2 3 4 5 manytypes.test 2>&1 \
+ | tee --append test.log &
sleep 10
-kill -9 `ps aux | grep -w "^${USER}.*/usr/bin/gdpc" | grep -v "0:0[0-9] grep "
| grep -v "0:0[0-9] ps " | sed
"s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
-sleep 1
-kill -9 `ps aux | grep -w "^${USER}.*Xvfb" | grep -v "0:0[0-9] grep " | grep
-v "0:0[0-9] ps " | sed "s/^${USER}[[:space:]]\+\([0-9]\+\)[[:space:]]\+.*/\1/"`
+check_n_cleanup
+set +v
ls -l test.log
cat test.log
View it on GitLab:
https://salsa.debian.org/med-team/gdpc/-/compare/dab1198df945c6b98aee8f748fa7329787df4a5e...2b998037e08d4bee15af8ce158dfe829a2854c15
--
View it on GitLab:
https://salsa.debian.org/med-team/gdpc/-/compare/dab1198df945c6b98aee8f748fa7329787df4a5e...2b998037e08d4bee15af8ce158dfe829a2854c15
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
