summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2018-12-12 21:50:17 +0100
committerDidier Raboud <odyx@debian.org>2018-12-12 20:28:23 +0100
commit0035dc9f676209799232da708096f718fab84742 (patch)
tree24b88cde1953adbc52081bf07b2b32e5ed8323b0
parentb6e898647e4c293f1a1bdfc908aa5aaf1fd4bef2 (diff)
parent010b3758ebde325b6b832c5c9026ea14af712638 (diff)
Set executable bit for verbose test driver in rules
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/patches/0007-Run-tests-with-custom-verbose-log-driver.patch6
-rwxr-xr-xdebian/rules4
-rw-r--r--[-rwxr-xr-x]scripts/test-driver-verbose0
4 files changed, 8 insertions, 6 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 11290d3..3bac8c6 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-025859d8ca69d4486e03014125d232a851904b9d
-025859d8ca69d4486e03014125d232a851904b9d
+010b3758ebde325b6b832c5c9026ea14af712638
+010b3758ebde325b6b832c5c9026ea14af712638
e50542121e724e851fc5d6c68bb773f80c0bc12c
e50542121e724e851fc5d6c68bb773f80c0bc12c
gutenprint_5.3.1.orig.tar.xz
diff --git a/debian/patches/0007-Run-tests-with-custom-verbose-log-driver.patch b/debian/patches/0007-Run-tests-with-custom-verbose-log-driver.patch
index 5ee9123..73bb386 100644
--- a/debian/patches/0007-Run-tests-with-custom-verbose-log-driver.patch
+++ b/debian/patches/0007-Run-tests-with-custom-verbose-log-driver.patch
@@ -1,4 +1,4 @@
-From 025859d8ca69d4486e03014125d232a851904b9d Mon Sep 17 00:00:00 2001
+From 010b3758ebde325b6b832c5c9026ea14af712638 Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Sun, 4 May 2014 12:34:59 +0200
Subject: Run tests with custom verbose log driver
@@ -10,7 +10,7 @@ Closes: #868743
scripts/global.mk | 4 +
scripts/test-driver-verbose | 151 ++++++++++++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
- create mode 100755 scripts/test-driver-verbose
+ create mode 100644 scripts/test-driver-verbose
diff --git a/scripts/global.mk b/scripts/global.mk
index c4054826..3c55e55d 100644
@@ -28,7 +28,7 @@ index c4054826..3c55e55d 100644
# Libraries
diff --git a/scripts/test-driver-verbose b/scripts/test-driver-verbose
-new file mode 100755
+new file mode 100644
index 00000000..221fa9e2
--- /dev/null
+++ b/scripts/test-driver-verbose
diff --git a/debian/rules b/debian/rules
index 899002a..01229f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,9 @@ override_dh_compress:
dh_compress -X.pdf -X.odt
override_dh_auto_test:
- - dh_auto_test
+ # As dgit doesn't support the executable bit in patches, set it here before running the test
+ chmod +x scripts/test-driver-verbose
+ dh_auto_test
override_dh_perl:
dh_perl -d
diff --git a/scripts/test-driver-verbose b/scripts/test-driver-verbose
index 221fa9e..221fa9e 100755..100644
--- a/scripts/test-driver-verbose
+++ b/scripts/test-driver-verbose