Tree - rpms/libdap - src.fedoraproject.org

rpms / libdap

Overview Files Commits Branches Forks Releases
Monitoring status:

Bugzilla Assignee:

Fedora:: orion
EPEL:: orion
Files

Commit: d535cbfdded93990ecfc3adc1ae4ad01df636039
Blob Blame History Raw
From 080ce6905700259413076fb159f0ebb42235e2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="4"/>
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="i">
+        <Dim size="5"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>ebd5bedf</Value>
+        </Attribute>
+    </Int32>
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Dim size="4"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+    </Int32>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_array_9.xml" dapVersion="4.0" dmrVersion="1.0" name="test_array_9">
+    <Int32 name="x">
+        <Dim size="0"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Int32>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s"/>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.2.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.2">
+    <Structure name="s">
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>00000000</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
+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
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+    </Structure>
+</Dataset>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<Dataset xmlns="http://xml.opendap.org/ns/DAP/4.0#" xml:base="file:dap4/test_simple_6.3.xml" dapVersion="4.0" dmrVersion="1.0" name="test_simple_6.3">
+    <Structure name="s">
+        <Int32 name="i1"/>
+        <String name="s"/>
+        <Structure name="inner"/>
+        <Attribute name="DAP4_Checksum_CRC32" type="String">
+            <Value>63dceb61</Value>
+        </Attribute>
+    </Structure>
+</Dataset>
+
+The data:
+{ { 123456789, "Silly test string: 1", {  } } }

From c88a7588892ccaa22954c32bd2f606005d5d3e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
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])
rpms / libdap

Source Code

Files
