From d535cbfdded93990ecfc3adc1ae4ad01df636039 Mon Sep 17 00:00:00 2001 From: Dan Horák Date: Apr 15 2016 08:41:06 +0000 Subject: - Update to 3.17.1 - Switch to github for source archive - Add missing big endian baselines (#1325114) --- diff --git a/.gitignore b/.gitignore index b046e3d..052f5e5 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ libdap-3.10.2.tar.gz /libdap-3.15.1.tar.gz /libdap-3.16.0.tar.gz /libdap-3.17.0.tar.gz +/version-3.17.1.tar.gz diff --git a/libdap-big-endian-baselines.patch b/libdap-big-endian-baselines.patch new file mode 100644 index 0000000..e56f337 --- /dev/null +++ b/libdap-big-endian-baselines.patch @@ -0,0 +1,418 @@ +From 080ce6905700259413076fb159f0ebb42235e2e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Thu, 14 Apr 2016 19:31:45 +0200 +Subject: [PATCH 1/2] add big endian baseline files for new tests + +--- + .../big-endian/test_array_12.xml.intern_base | 23 ++++++++++++++++ + .../big-endian/test_array_12.xml.trans_base | 29 ++++++++++++++++++++ + .../big-endian/test_array_13.xml.intern_base | 25 +++++++++++++++++ + .../big-endian/test_array_13.xml.trans_base | 31 ++++++++++++++++++++++ + .../big-endian/test_array_14.xml.intern_base | 25 +++++++++++++++++ + .../big-endian/test_array_14.xml.trans_base | 31 ++++++++++++++++++++++ + .../big-endian/test_array_9.xml.intern_base | 17 ++++++++++++ + .../big-endian/test_array_9.xml.trans_base | 20 ++++++++++++++ + .../big-endian/test_simple_6.2.xml.intern_base | 13 +++++++++ + .../big-endian/test_simple_6.2.xml.trans_base | 17 ++++++++++++ + .../big-endian/test_simple_6.3.xml.intern_base | 21 +++++++++++++++ + .../big-endian/test_simple_6.3.xml.trans_base | 24 +++++++++++++++++ + 12 files changed, 276 insertions(+) + create mode 100644 tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base + create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base + create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base + create mode 100644 tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base + +diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base +new file mode 100644 +index 0000000..c83cac0 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.intern_base +@@ -0,0 +1,23 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base +new file mode 100644 +index 0000000..306fe92 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_12.xml.trans_base +@@ -0,0 +1,29 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ebd5bedf ++ ++ ++ ++ ++ ++ 00000000 ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base +new file mode 100644 +index 0000000..4dde012 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.intern_base +@@ -0,0 +1,25 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base +new file mode 100644 +index 0000000..21e4274 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_13.xml.trans_base +@@ -0,0 +1,31 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ebd5bedf ++ ++ ++ ++ ++ ++ ++ 00000000 ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {{},{},{},{}} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base +new file mode 100644 +index 0000000..99eeb81 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.intern_base +@@ -0,0 +1,25 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base +new file mode 100644 +index 0000000..84f92ae +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_14.xml.trans_base +@@ -0,0 +1,31 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ebd5bedf ++ ++ ++ ++ ++ ++ ++ 00000000 ++ ++ ++ ++ ++The data: ++{ {123456789, 123456789, 123456789, 123456789, 123456789}, {} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base +new file mode 100644 +index 0000000..2f53699 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.intern_base +@@ -0,0 +1,17 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ {} } +diff --git a/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base +new file mode 100644 +index 0000000..e24d475 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_array_9.xml.trans_base +@@ -0,0 +1,20 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 00000000 ++ ++ ++ ++ ++The data: ++{ {} } +diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base +new file mode 100644 +index 0000000..014c72e +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.intern_base +@@ -0,0 +1,13 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ { } } +diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base +new file mode 100644 +index 0000000..b393e3f +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_simple_6.2.xml.trans_base +@@ -0,0 +1,17 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 00000000 ++ ++ ++ ++ ++The data: ++{ { } } +diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base +new file mode 100644 +index 0000000..c0ea6cc +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.intern_base +@@ -0,0 +1,21 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++The data: ++{ { 123456789, "Silly test string: 1", { } } } +diff --git a/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base +new file mode 100644 +index 0000000..d260d64 +--- /dev/null ++++ b/tests/dmr-testsuite/big-endian/test_simple_6.3.xml.trans_base +@@ -0,0 +1,24 @@ ++Parse successful ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 63dceb61 ++ ++ ++ ++ ++The data: ++{ { 123456789, "Silly test string: 1", { } } } + +From c88a7588892ccaa22954c32bd2f606005d5d3e92 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Thu, 14 Apr 2016 19:34:52 +0200 +Subject: [PATCH 2/2] remove the condition because we added the missing + baselines + +--- + tests/DMRTest.at | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/tests/DMRTest.at b/tests/DMRTest.at +index 93e3b58..3ab1b38 100644 +--- a/tests/DMRTest.at ++++ b/tests/DMRTest.at +@@ -240,12 +240,6 @@ DMR_PARSE([dmr-testsuite/test_array_14.xml], [pass]) + DMR_PARSE([dmr-testsuite/test_simple_6.2.xml], [pass]) + DMR_PARSE([dmr-testsuite/test_simple_6.3.xml], [pass]) + +-# These tests for zero-length array values only work for +-# little-endian machines at this time. If baselines for +-# big-endian machines are built, this AS_IF can be removed. +-# jhrg 1/28/16 +-AS_IF([test "$WORD_ORDER" = "little-endian"], +-[ + DMR_TRANS([test_array_9.xml], [pass]) + DMR_TRANS([test_array_12.xml], [pass]) + DMR_TRANS([test_array_13.xml], [pass]) +@@ -263,9 +257,6 @@ DMR_INTERN([test_array_14.xml], [pass]) + DMR_INTERN([test_simple_6.2.xml], [pass]) + DMR_INTERN([test_simple_6.3.xml], [pass]) + +-], +-[]) +- + # Test various facets of the CE parser and evaluation engine + + DMR_TRANS_CE([test_array_4.xml], [a], [test_array_4.xml.1.trans_base], [pass]) diff --git a/libdap-gcc6.patch b/libdap-gcc6.patch deleted file mode 100644 index 65580b0..0000000 --- a/libdap-gcc6.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up libdap-3.16.0/dds.yy.gcc6 libdap-3.16.0/dds.yy ---- libdap-3.16.0/dds.yy.gcc6 2015-10-19 16:03:35.000000000 -0600 -+++ libdap-3.16.0/dds.yy 2016-02-04 13:59:22.309817685 -0700 -@@ -262,7 +262,7 @@ declaration: base_type var ';' - | grid '{' SCAN_WORD ':' - { - if (is_keyword(string($3), "array")) { -- part = array; -+ part = libdap::array; - } - else { - ostringstream msg; -diff -up libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 libdap-3.16.0/unit-tests/generalUtilTest.cc ---- libdap-3.16.0/unit-tests/generalUtilTest.cc.gcc6 2015-09-08 16:42:20.000000000 -0600 -+++ libdap-3.16.0/unit-tests/generalUtilTest.cc 2016-02-04 14:12:59.677136555 -0700 -@@ -265,7 +265,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest); - DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl); - CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr"); - -- char A_200_177[4] = { 128, 127, 'A', '\0' }; -+ char A_200_177[4] = { (char)128, 127, 'A', '\0' }; - DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl); - CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177)); - diff --git a/libdap.spec b/libdap.spec index a548675..de65234 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,16 +1,19 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.17.0 +Version: 3.17.1 Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://www.opendap.org/ -Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz +#Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz +Source0: https://github.com/OPENDAP/libdap4/archive/version-%{version}.tar.gz #Don't run HTTP tests - builders don't have network connections Patch0: libdap-offline.patch -# Fix gcc6/c++11 compile errors -Patch1: libdap-gcc6.patch +# Add missing big endian baselines +# https://github.com/OPENDAP/libdap4/pull/13 +# https://bugzilla.redhat.com/show_bug.cgi?id=1325114 +Patch1: libdap-big-endian-baselines.patch # For autoreconf BuildRequires: libtool @@ -63,9 +66,9 @@ Documentation of the libdap library. %prep -%setup -q +%setup -q -n %{name}4-version-%{version} %patch0 -p1 -b .offline -%patch1 -p1 -b .libdap +%patch1 -p1 -b .big-endian-baselines iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -134,6 +137,11 @@ make check %changelog +* Fri Apr 15 2016 Dan Horák - 3.17.1-1 +- Update to 3.17.1 +- Switch to github for source archive +- Add missing big endian baselines (#1325114) + * Tue Feb 9 2016 Orion Poplawski - 3.17.0-1 - Update to 3.17.0 - Add patch for gcc 6 support diff --git a/sources b/sources index 8771fdd..ac6cb08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebeff3892b45fb95ea80fc6ffafb6448 libdap-3.17.0.tar.gz +f2232538779402ee0384e4ee1c883584 version-3.17.1.tar.gz