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: 13-Mar-2016 05:32:37 Branch: rpm-5_4 Handle: 2016031304323601 Added files: (Branch: rpm-5_4) rpm/tests/mongoc/mock_server .cvsignore Modified files: (Branch: rpm-5_4) rpm CHANGES INSTALL rpm/rpmio Makefile.am microjson.c rpm/tests/bson Makefile.am rpm/tests/mongoc Makefile.am rpm/tests/yajl Makefile.am parse_tests.sh Log: - autofu: resurrect "make distcheck". Summary: Revision Changes Path 1.3501.2.466+1 -0 rpm/CHANGES 2.134.2.18 +1 -0 rpm/INSTALL 1.293.2.61 +1 -1 rpm/rpmio/Makefile.am 1.1.2.2 +22 -16 rpm/rpmio/microjson.c 1.1.2.6 +75 -75 rpm/tests/bson/Makefile.am 1.1.2.6 +2 -1 rpm/tests/mongoc/Makefile.am 1.1.2.1 +2 -0 rpm/tests/mongoc/mock_server/.cvsignore 1.1.2.2 +4 -3 rpm/tests/yajl/Makefile.am 1.1.2.2 +8 -5 rpm/tests/yajl/parse_tests.sh ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.465 -r1.3501.2.466 CHANGES --- rpm/CHANGES 12 Mar 2016 21:53:05 -0000 1.3501.2.465 +++ rpm/CHANGES 13 Mar 2016 04:32:36 -0000 1.3501.2.466 @@ -1,4 +1,5 @@ 5.4.15 -> 5.4.16: + - jbj: autofu: resurrect "make distcheck". - jbj: jsmn: update to latest checkout 572ace5, add to librpmio. - jbj: duk: update to 1.4.0, add to librpmio. - jbj: yajl: add test cases. @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL ============================================================================ $ cvs diff -u -r2.134.2.17 -r2.134.2.18 INSTALL --- rpm/INSTALL 12 Mar 2016 21:53:05 -0000 2.134.2.17 +++ rpm/INSTALL 13 Mar 2016 04:32:36 -0000 2.134.2.18 @@ -66,6 +66,7 @@ mongo-c-driver bundled 1.3.2 1.3.2 https://github.com/mongodb/mongo-c-driver duktape bundled 1.4.0 1.4.0 http://www.duktape.org/index.html jsmn bundled - 572ace5 https://github.com/zserge/jsmn +microjson bundled 0.3 0.3+ http://thyrsus.com/gitweb/?p=microjson.git --------------- --------- ------- ------- ------------------------------------- [0] m4: NOTICE: Do not use GNU m4 1.4.10, it breaks GNU autoconf. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am ============================================================================ $ cvs diff -u -r1.293.2.60 -r1.293.2.61 Makefile.am --- rpm/rpmio/Makefile.am 12 Mar 2016 21:53:06 -0000 1.293.2.60 +++ rpm/rpmio/Makefile.am 13 Mar 2016 04:32:36 -0000 1.293.2.61 @@ -15,7 +15,7 @@ rpmjsio.msg rpmtar.c rpmtar.h \ tdir.c tfts.c tget.c tgfs.c tgit.c tglob.c thkp.c thtml.c tinv.c tkey.c \ tmire.c todbc.c tput.c tpython.c trpmio.c tsexp.c tsvn.c tsw.c \ - lookup3.c tjsmn.c tjson.c yajl.c testit.sh \ + lookup3.c duktape.c tjsmn.c tjson.c yajl.c testit.sh \ microjson.c mongoc-counters.defs EXTRA_PROGRAMS = rpmcpio rpmdpkg rpmtar rpmz @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/microjson.c ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 microjson.c --- rpm/rpmio/microjson.c 16 May 2015 23:55:29 -0000 1.1.2.1 +++ rpm/rpmio/microjson.c 13 Mar 2016 04:32:36 -0000 1.1.2.2 @@ -1,3 +1,9 @@ +***************************************************************************/ +/* The strptime prototype is not provided unless explicitly requested. + * We also need to set the value high enough to signal inclusion of + * newer features (like clock_gettime). See the POSIX spec for more info: + * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02 */ +#define _XOPEN_SOURCE 600 #include "system.h" #include <stdarg.h> @@ -19,9 +25,11 @@ */ /*==============================================================*/ /* --- mjson.h */ -/* Structures for JSON parsing using only fixed-extent memory */ - -#define NITEMS(x) (int)(sizeof(x)/sizeof(x[0])) +/* Structures for JSON parsing using only fixed-extent memory + * + * This file is Copyright (c) 2014 by Eric S. Raymond. + * BSD terms apply: see the file COPYING in the distribution root for details. + */ typedef enum {t_integer, t_uinteger, t_real, t_string, t_boolean, t_character, @@ -207,16 +215,11 @@ everything will work. Strings are supported but all string storage has to be inline in the struct. -***************************************************************************/ -/* The strptime prototype is not provided unless explicitly requested. - * We also need to set the value high enough to signal inclusion of - * newer features (like clock_gettime). See the POSIX spec for more info: - * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02 */ -#if 0 -#define _XOPEN_SOURCE 600 -#endif - +PERMISSIONS + This file is Copyright (c) 2014 by Eric S. Raymond + SPDX-License-Identifier: BSD-2-clause +***************************************************************************/ #ifdef MICROJSON_DEBUG_ENABLE static int debuglevel = 0; @@ -923,8 +926,12 @@ /*==============================================================*/ /* --- test_microjson.c */ -#ifdef MICROJSON_TEST -/* test_mjson.c - unit test for JSON parsing into fixed-extent structures */ +#ifdef MICROJSON_TEST +/* test_mjson.c - unit test for JSON parsing into fixed-extent structures + * + * This file is Copyright (c) 2010 by the GPSD project + * BSD terms apply: see the file COPYING in the distribution root for details. + */ /* * Many of these structures and examples were dissected out of the GPSD code. @@ -1310,7 +1317,6 @@ return status; } #undef STARTSWITH - return -1; } /*@+compdef@*/ @@ -1740,4 +1746,4 @@ } /* end */ -#endif /* MICROJSON_MAIN */ +#endif /* MICROJSON_MAIN */ @@ . patch -p0 <<'@@ .' Index: rpm/tests/bson/Makefile.am ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 Makefile.am --- rpm/tests/bson/Makefile.am 12 Mar 2016 17:59:36 -0000 1.1.2.5 +++ rpm/tests/bson/Makefile.am 13 Mar 2016 04:32:37 -0000 1.1.2.6 @@ -6,81 +6,81 @@ CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda DISTCLEANFILES = EXTRA_DIST = \ - tests/abicheck.sh \ - tests/bson-tests.h \ - tests/binary/binary_deprecated.bson \ - tests/binary/codewscope.bson \ - tests/binary/dollarquery.bson \ - tests/binary/dotkey.bson \ - tests/binary/dotquery.bson \ - tests/binary/eurokey.bson \ - tests/binary/overflow1.bson \ - tests/binary/overflow2.bson \ - tests/binary/overflow3.bson \ - tests/binary/overflow4.bson \ - tests/binary/readergrow.bson \ - tests/binary/stackoverflow.bson \ - tests/binary/stream.bson \ - tests/binary/stream_corrupt.bson \ - tests/binary/test10.bson \ - tests/binary/test11.bson \ - tests/binary/test12.bson \ - tests/binary/test13.bson \ - tests/binary/test14.bson \ - tests/binary/test15.bson \ - tests/binary/test16.bson \ - tests/binary/test17.bson \ - tests/binary/test18.bson \ - tests/binary/test19.bson \ - tests/binary/test1.bson \ - tests/binary/test20.bson \ - tests/binary/test21.bson \ - tests/binary/test22.bson \ - tests/binary/test23.bson \ - tests/binary/test24.bson \ - tests/binary/test25.bson \ - tests/binary/test26.bson \ - tests/binary/test27.bson \ - tests/binary/test28.bson \ - tests/binary/test29.bson \ - tests/binary/test2.bson \ - tests/binary/test30.bson \ - tests/binary/test31.bson \ - tests/binary/test32.bson \ - tests/binary/test33.bson \ - tests/binary/test34.bson \ - tests/binary/test35.bson \ - tests/binary/test36.bson \ - tests/binary/test37.bson \ - tests/binary/test38.bson \ - tests/binary/test39.bson \ - tests/binary/test3.bson \ - tests/binary/test4.bson \ - tests/binary/test40.bson \ - tests/binary/test41.bson \ - tests/binary/test42.bson \ - tests/binary/test43.bson \ - tests/binary/test44.bson \ - tests/binary/test45.bson \ - tests/binary/test46.bson \ - tests/binary/test47.bson \ - tests/binary/test48.bson \ - tests/binary/test49.bson \ - tests/binary/test5.bson \ - tests/binary/test50.bson \ - tests/binary/test51.bson \ - tests/binary/test52.bson \ - tests/binary/test53.bson \ - tests/binary/test54.bson \ - tests/binary/test55.bson \ - tests/binary/test56.bson \ - tests/binary/test57.bson \ - tests/binary/test6.bson \ - tests/binary/test7.bson \ - tests/binary/test8.bson \ - tests/binary/test9.bson \ - tests/binary/trailingnull.bson \ - tests/json/test.json + abicheck.sh \ + bson-tests.h \ + binary/binary_deprecated.bson \ + binary/codewscope.bson \ + binary/dollarquery.bson \ + binary/dotkey.bson \ + binary/dotquery.bson \ + binary/eurokey.bson \ + binary/overflow1.bson \ + binary/overflow2.bson \ + binary/overflow3.bson \ + binary/overflow4.bson \ + binary/readergrow.bson \ + binary/stackoverflow.bson \ + binary/stream.bson \ + binary/stream_corrupt.bson \ + binary/test10.bson \ + binary/test11.bson \ + binary/test12.bson \ + binary/test13.bson \ + binary/test14.bson \ + binary/test15.bson \ + binary/test16.bson \ + binary/test17.bson \ + binary/test18.bson \ + binary/test19.bson \ + binary/test1.bson \ + binary/test20.bson \ + binary/test21.bson \ + binary/test22.bson \ + binary/test23.bson \ + binary/test24.bson \ + binary/test25.bson \ + binary/test26.bson \ + binary/test27.bson \ + binary/test28.bson \ + binary/test29.bson \ + binary/test2.bson \ + binary/test30.bson \ + binary/test31.bson \ + binary/test32.bson \ + binary/test33.bson \ + binary/test34.bson \ + binary/test35.bson \ + binary/test36.bson \ + binary/test37.bson \ + binary/test38.bson \ + binary/test39.bson \ + binary/test3.bson \ + binary/test4.bson \ + binary/test40.bson \ + binary/test41.bson \ + binary/test42.bson \ + binary/test43.bson \ + binary/test44.bson \ + binary/test45.bson \ + binary/test46.bson \ + binary/test47.bson \ + binary/test48.bson \ + binary/test49.bson \ + binary/test5.bson \ + binary/test50.bson \ + binary/test51.bson \ + binary/test52.bson \ + binary/test53.bson \ + binary/test54.bson \ + binary/test55.bson \ + binary/test56.bson \ + binary/test57.bson \ + binary/test6.bson \ + binary/test7.bson \ + binary/test8.bson \ + binary/test9.bson \ + binary/trailingnull.bson \ + json/test.json AM_CPPFLAGS = \ -I$(srcdir) \ @@ . patch -p0 <<'@@ .' Index: rpm/tests/mongoc/Makefile.am ============================================================================ $ cvs diff -u -r1.1.2.5 -r1.1.2.6 Makefile.am --- rpm/tests/mongoc/Makefile.am 12 Mar 2016 17:59:37 -0000 1.1.2.5 +++ rpm/tests/mongoc/Makefile.am 13 Mar 2016 04:32:37 -0000 1.1.2.6 @@ -217,11 +217,12 @@ TEST_ARGS = -f -p test: $(TEST_PROGS) test_certs - @ for TEST_PROG in $(TEST_PROGS) ; do \ + @-for TEST_PROG in $(TEST_PROGS) ; do \ ./$$TEST_PROG $(TEST_ARGS) -F test.log; \ done DISTCLEANFILES += \ + test.log \ test-results.json \ trust_dir/ca.db.serial \ trust_dir/done \ @@ . patch -p0 <<'@@ .' Index: rpm/tests/mongoc/mock_server/.cvsignore ============================================================================ $ cvs diff -u -r0 -r1.1.2.1 .cvsignore --- /dev/null 2016-03-13 05:30:32.000000000 +0100 +++ .cvsignore 2016-03-13 05:32:37.451652502 +0100 @@ -0,0 +1,2 @@ +.deps +.dirstamp @@ . patch -p0 <<'@@ .' Index: rpm/tests/yajl/Makefile.am ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 Makefile.am --- rpm/tests/yajl/Makefile.am 12 Mar 2016 19:52:55 -0000 1.1.2.1 +++ rpm/tests/yajl/Makefile.am 13 Mar 2016 04:32:37 -0000 1.1.2.2 @@ -3,8 +3,9 @@ CLEANFILES = *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda DISTCLEANFILES = EXTRA_DIST = \ - parse_tests.sh - cases/* + $(srcdir)/parse_tests.sh \ + $(srcdir)/cases/*.json \ + $(srcdir)/cases/*.gold AM_CPPFLAGS = \ -I$(srcdir) \ @@ -34,4 +35,4 @@ check: test test: $(TEST_PROGS) - @sh parse_tests.sh + @sh $(srcdir)/parse_tests.sh @@ . patch -p0 <<'@@ .' Index: rpm/tests/yajl/parse_tests.sh ============================================================================ $ cvs diff -u -r1.1.2.1 -r1.1.2.2 parse_tests.sh --- rpm/tests/yajl/parse_tests.sh 12 Mar 2016 19:52:55 -0000 1.1.2.1 +++ rpm/tests/yajl/parse_tests.sh 13 Mar 2016 04:32:37 -0000 1.1.2.2 @@ -15,14 +15,17 @@ testBin=$(pwd)/yajl_test +srcdir=`dirname $0` + ${ECHO} "using test binary: $testBin" +${ECHO} "using test cases: $srcdir/cases" testBinShort=`basename $testBin` testsSucceeded=0 testsTotal=0 -for file in cases/*.json ; do +for file in ${srcdir}/cases/*.json ; do allowComments="" allowGarbage="" allowMultiple="" @@ -53,18 +56,18 @@ # ${ECHO} -n "$testBinShort $allowPartials$allowComments$allowGarbage$allowMultiple-b $iter < $fileShort > ${fileShort}.test : " # parse with a read buffer size ranging from 1-31 to stress stream parsing while [ $iter -lt 32 ] && [ $success = "SUCCESS" ] ; do - $testBin $allowPartials $allowComments $allowGarbage $allowMultiple -b $iter < $file > ${file}.test 2>&1 - diff ${DIFF_FLAGS} ${file}.gold ${file}.test > ${file}.out + $testBin $allowPartials $allowComments $allowGarbage $allowMultiple -b $iter < $file > ${fileShort}.test 2>&1 + diff ${DIFF_FLAGS} ${file}.gold ${fileShort}.test > ${fileShort}.out if [ $? -eq 0 ] ; then if [ $iter -eq 31 ] ; then testsSucceeded=$(( $testsSucceeded + 1 )) ; fi else success="FAILURE" iter=32 ${ECHO} - cat ${file}.out + cat ${fileShort}.out fi iter=$(( iter + 1 )) - rm ${file}.test ${file}.out + rm ${fileShort}.test ${fileShort}.out done ${ECHO} $success @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org