40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
|
From 90e2b3a3b1a6d2b18c4421ed17a94aa5c56108a8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: openEuler Buildteam <buildteam@openeuler.org>
|
||
|
|
Date: Thu, 13 Feb 2020 21:32:33 +0800
|
||
|
|
Subject: [PATCH] skip updating the preferences
|
||
|
|
|
||
|
|
---
|
||
|
|
tests/Makefile.am | 2 +-
|
||
|
|
tests/Makefile.in | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||
|
|
index 10f095b..ab92353 100644
|
||
|
|
--- a/tests/Makefile.am
|
||
|
|
+++ b/tests/Makefile.am
|
||
|
|
@@ -167,7 +167,7 @@ populate_testing:
|
||
|
|
for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils xargs; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done
|
||
|
|
for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done
|
||
|
|
(cd testing/magic && file -C)
|
||
|
|
- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret
|
||
|
|
+ HOME=$(abs_builddir)/testing gpg2 --import --batch ${abs_srcdir}/data/keys/*.secret
|
||
|
|
|
||
|
|
check_DATA = atconfig atlocal $(TESTSUITE)
|
||
|
|
|
||
|
|
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||
|
|
index 16bcdd5..5603c54 100644
|
||
|
|
--- a/tests/Makefile.in
|
||
|
|
+++ b/tests/Makefile.in
|
||
|
|
@@ -695,7 +695,7 @@ populate_testing:
|
||
|
|
for prog in gzip cat patch tar sh ln chmod rm mkdir uname grep sed find file ionice mktemp nice cut sort diff touch install wc coreutils xargs; do p=`which $${prog}`; if [ "$${p}" != "" ]; then ln -s $${p} testing/$(bindir)/; fi; done
|
||
|
|
for d in /proc /sys /selinux /etc/selinux; do if [ -d $${d} ]; then ln -s $${d} testing/$${d}; fi; done
|
||
|
|
(cd testing/magic && file -C)
|
||
|
|
- HOME=$(abs_builddir)/testing gpg2 --import ${abs_srcdir}/data/keys/*.secret
|
||
|
|
+ HOME=$(abs_builddir)/testing gpg2 --import --batch ${abs_srcdir}/data/keys/*.secret
|
||
|
|
|
||
|
|
@HAVE_FAKECHROOT_TRUE@check-local: $(check_DATA) populate_testing
|
||
|
|
@HAVE_FAKECHROOT_TRUE@ $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|