RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 20-Apr-2016 12:40:06
Branch: rpm-5_4 Handle: 2016042010400600
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am macros.in
Log:
- sanity.
Summary:
Revision Changes Path
1.95.2.76 +37 -13 rpm/tests/Makefile.am
1.34.2.9 +46 -1 rpm/tests/macros.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95.2.75 -r1.95.2.76 Makefile.am
--- rpm/tests/Makefile.am 13 Mar 2016 05:15:48 -0000 1.95.2.75
+++ rpm/tests/Makefile.am 20 Apr 2016 10:40:06 -0000 1.95.2.76
@@ -5,7 +5,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
EXTRA_DIST = \
- fib.js \
+ $(srcdir)/fib.js \
genpgp.sh \
genssl.sh \
gpsee/gffi.js \
@@ -127,6 +127,8 @@
vg = $(LIBTOOL) --mode=execute vg
+#sudo = /usr/bin/pseudo
+#export PSEUDO_PREFIX=$(testdir)
sudo = sudo
rpmdb = $(testdir)/tmp/rpmdb
@@ -359,17 +361,17 @@
${rpm} -bs --nodeps rpm.spec && mv rpm/*.src.rpm . ; \
fi
-%.spec: $(wildcard %-*.src.rpm)
+%.spec: $(wildcard $(srcdir)/%-*.src.rpm)
@${rpm2cpio} $(wildcard $*-*.src.rpm) | ${cpio} -i --quiet $@
-%.src.rpm: $(wildcard *.spec)
+%.src.rpm: $(wildcard $(srcdir)/*.spec)
@${rpm} -bs --nodeps $^
-BUILD_DIRS ?= $(shell ${rpm} -qp --qf '%{NAME} ' $(wildcard *.src.rpm))
+BUILD_DIRS ?= $(shell ${rpm} -qp --qf '%{NAME} ' $(wildcard
$(srcdir)/*.src.rpm))
-$(BUILD_DIRS): $(wildcard %-*.src.rpm)
+$(BUILD_DIRS): $(wildcard $(srcdir)/%-*.src.rpm)
@echo "=== build $@ ==="
- ${rpm} -i --nodeps $@-*.src.rpm
+ ${rpm} -i --nodeps $(srcdir)/$@-*.src.rpm
(cd $@ && ${rpm} -q --specfile $@.spec && ${rpm} -q --specsrpm $@.spec
&& ${rpm} -q --specfile --specedit $@.spec && ${rpm} -bb --nodeps $@.spec || :)
> /dev/null
define IGNORED_BY_GNU_MAKE:
@@ -473,6 +475,8 @@
check-install:
@echo "=== $@ ==="
@${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps
devtool-sanity/*.rpm
+ @-${rpm} -e --allmatches probes
+ @${rpm} -i probes-test/probes-1*.rpm
@${rpm} -U probes-test/probes-2*.rpm
# AL -- AsianLinux
@@ -1115,16 +1119,18 @@
@echo "=== $@ ==="
@rm -f tmp/bson.out
@make -C bson check >> tmp/bson.out 2>&1 || :
+# @-diff -u tmp/bson.out $(srcdir)/ref/bson.out || cp tmp/bson.out
ref/bson.out
check-mongoc:
@echo "=== $@ ==="
@rm -f tmp/mongoc.out
@make -C mongoc check >> tmp/mongoc.out 2>&1 || :
+# @-diff -u tmp/mongoc.out $(srcdir)/ref/mongoc.out || cp tmp/mongoc.out
ref/mongoc.out
tgfs = ${abs_top_builddir}/rpmio/tgfs
gfsfn = /tmp/gfsfn
bsondump = /usr/bin/bsondump
-check-gfs: check-bson check-mongoc
+check-gfs: # check-bson check-mongoc
@echo "=== $@ ==="
@rm -f tmp/gfs.out
@echo "--> drop gfs database"
@@ -1153,7 +1159,7 @@
duk = ${abs_top_builddir}/rpmio/duk
check-duk:
@echo "=== $@ ==="
- @${duk} fib.js
+ @${duk} $(srcdir)/fib.js
check-js:
@echo "=== $@ ==="
@@ -1169,8 +1175,11 @@
@-(${todbc} ${odbc_uri_postgres} 2>&1) >> tmp/odbc.out
@-diff -u tmp/odbc.out ref/odbc.out || cp tmp/odbc.out ref/odbc.out
-FIOURI = http://pkgs.repoforge.org/fio/fio-2.1.7-1.rf.src.rpm
+ostamp:
+ @echo "=== $@ ==="
+ ${rpm} -E "%{ostamp_publish $$(date --rfc-3339=ns | sha256sum | cut -f1
-d\ )}"
+FIOURI = http://pkgs.repoforge.org/fio/fio-2.1.7-1.rf.src.rpm
fio:
@echo "=== $@ ==="
@-rm -rf tmp/wget
@@ -1180,10 +1189,6 @@
-mkdir -p tmp/cp && ${cp} --rpmiodebug --davdebug -R $(FIOURI) tmp/cp
-diff -ru tmp/{wget,cp}
-ostamp:
- @echo "=== $@ ==="
- ${rpm} -E "%{ostamp_publish $$(date --rfc-3339=ns | sha256sum | cut -f1
-d\ )}"
-
P = popt/popt-1.14-1.x86_64.rpm
foo:
@echo "=== $@ ==="
@@ -1199,6 +1204,25 @@
$(rpm) -qp --qf '%|dirnames?{TRUE}:{FALSE}|\n' $(P)
$(rpm) -qp --qf '%|dirnames=/lib/?{TRUE}:{FALSE}|\n' $(P)
+Q = $(testdir)/edos-test/car*.noarch.rpm
+fdir = guzzy
+fuzzer = afl-fuzz -i ./I -o ./O -d -m 100 --
+fuzz:
+ @echo "=== $@ ==="
+ mkdir -p $(fdir)/I $(fdir)/O $(fdir)/rpmdb
+ cp $(Q) $(fdir)/I
+ cd $(fdir) && $(fuzzer) /X/src/wdj54/rpm --rpmpopt=/X/src/wdj54/rpmpopt
--macros /X/src/wdj54/macros/macros:/X/src/wdj54/tests/macros --dbpath ./rpmdb
-qp --nomanifest @@
+
+fuzzrestart = afl-fuzz -i- -o ./O -d -m 100 --
+fuzz-restart:
+ @echo "=== $@ ==="
+ cd $(fdir) && $(fuzzrestart) /X/src/wdj54/rpm
--rpmpopt=/X/src/wdj54/rpmpopt --macros
/X/src/wdj54/macros/macros:/X/src/wdj54/tests/macros --dbpath ./rpmdb -qp
--nomanifest @@
+
+analyzer = afl-analyze -i $(Q) --
+anal:
+ @echo "=== $@ ==="
+ $(analyzer) /X/src/wdj54/rpm --rpmpopt=/X/src/wdj54/rpmpopt --macros
/X/src/wdj54/macros/macros:/X/src/wdj54/tests/macros -qp --nomanifest --yaml @@
+
test: check-init \
check-pubkeys \
check-markup \
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/macros.in
============================================================================
$ cvs diff -u -r1.34.2.8 -r1.34.2.9 macros.in
--- rpm/tests/macros.in 13 Aug 2014 17:51:34 -0000 1.34.2.8
+++ rpm/tests/macros.in 20 Apr 2016 10:40:06 -0000 1.34.2.9
@@ -14,6 +14,8 @@
%_rpmgio .ufdio
%_rpmgi_pattern_glob file://%{_testdir}/edos-test/
+#%_build_sign RSA/SHA256
+
#%_hkp_keyserver %{nil}
#%_hkp_keyserver_query %{nil}
%_hkp_keyserver hkp://localhost
@@ -66,7 +68,7 @@
glibc>nscd \
filesystem>setup
-%_dependency_whiteout_idms \
+%_dependency_whiteout_IDMS \
cracklib>cracklib-dicts \
perl>perl-Term-ReadKey \
openssl>openssl-perl \
@@ -76,7 +78,22 @@
iptables>iptables-ipv6 \
krb5-server>krb5-workstation
+%_dependency_whiteout_OWL31 \
+ dhcp-server>coreutils \
+ pciutils->zlib \
+ acct->info \
+ info->libtermcap \
+ logrotate>popt \
+ vixie-cron>grep \
+ owl-startup>e2fsprogs \
+ acct>sed \
+ acct>grep \
+ dhcp-server>dhcp \
+ libtermcap>bash \
+
+
%_dependency_whiteout \
+ %{?_dependency_whiteout_OWL31} \
%{?_dependency_whiteout_system} \
%{nil}
@@ -132,6 +149,34 @@
%__scriptlet_requires %{nil}
%__check_files %{_testdir}/../scripts/check-files %{buildroot}
+%ostamp_uri http://www.originstamp.org
+%ostamp_api 9764b1ebd8b01e9d631ce566cdf9f4b5
+%ostamp_sender j...@rpm5.org
+%ostamp_title rpm-5.4.16
+%ostamp_send_back 1
+%ostamp_hash %(date --rfc-3339=ns | sha256sum | cut -f1 -d\\ )
+
+%ostamp_json \{\
+%{?ostamp_sender: "sender": "%{ostamp_sender}",}\
+%{?ostamp_send_back: "send_back": %{ostamp_send_back},}\
+%{?ostamp_title: "title": "%{ostamp_title}",}\
+ "hash_sha256": "%1"\
+\}
+
+%ostamp_publish() %(\
+%{__curl} -sS -X POST\\\
+ -H "Content-Type: application/json"\\\
+ -H "Authorization: Token token=%{ostamp_api}"\\\
+ -d '\
+{\
+%{?ostamp_sender: "sender": "%{ostamp_sender}",}\
+%{?ostamp_send_back: "send_back": %{ostamp_send_back},}\
+%{?ostamp_title: "title": "%{ostamp_title}",}\
+ "hash_sha256": "%1"\
+}'\\\
+ %{ostamp_uri}/api/stamps\
+)%{nil}
+
%NVR %{name}-%{version}-%{release}
%NVRA %{name}-%{version}-%{release}.%{_target_cpu}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
