From 1ceee714db0c6dea6e5d3ebb6e4a608b81bad0ec Mon Sep 17 00:00:00 2001
From: Robert Underwood <robertu94@users.noreply.github.com>
Date: Tue, 14 Jun 2022 18:53:47 -0400
Subject: [PATCH] sz: smoke, unit, version updates, and more oh my (#30873)

Co-authored-by: Robert Underwood <runderwood@anl.gov>
---
 .../repos/builtin/packages/sz/package.py      |  68 ++++++++++++++++++
 .../packages/sz/test/testfloat_8_8_128.dat    | Bin 0 -> 32768 bytes
 2 files changed, 68 insertions(+)
 create mode 100644 var/spack/repos/builtin/packages/sz/test/testfloat_8_8_128.dat

diff --git a/var/spack/repos/builtin/packages/sz/package.py b/var/spack/repos/builtin/packages/sz/package.py
index 12c8c054ac1..9d7cf3932c6 100644
--- a/var/spack/repos/builtin/packages/sz/package.py
+++ b/var/spack/repos/builtin/packages/sz/package.py
@@ -17,6 +17,7 @@ class Sz(CMakePackage):
     tags = ['e4s']
 
     version('master', branch='master')
+    version('2.1.12.2', sha256='427e263e1fed1b0a56e13e0aff8e6a19c6d78d5f35dd16856876c70ab6066dc6')
     version('2.1.12', sha256='3712b2cd7170d1511569e48a208f02dfb72ecd7ad053c321e2880b9083e150de')
     version('2.1.11.1', sha256='e6fa5c969b012782b1e5e9fbd1cd7d1c0ace908d9ec982e78b2910ec5c2161ac')
     version('2.1.11', sha256='85b8ef99344a3317ba9ee63ca4b9d99a51d1832d4d8880e01c7c56b3a69cacc9')
@@ -63,6 +64,7 @@ class Sz(CMakePackage):
     depends_on('hdf5', when="+hdf5")
     depends_on('netcdf-c', when="+netcdf")
     depends_on('cmake@3.13:', type='build')
+    depends_on('cunit', type="test")
 
     patch('ctags-only-if-requested.patch', when='@2.1.8.1:2.1.8.3')
 
@@ -136,4 +138,70 @@ def cmake_args(self):
             args.append("-DBUILD_STATS=ON")
         else:
             args.append("-DBUILD_STATS=OFF")
+
+        args.append(self.define("BUILD_TESTS", self.run_tests))
+
         return args
+
+    @run_after('build')
+    @on_package_attributes(run_tests=True)
+    def test_build(self):
+        make('test')
+
+    def _test_2d_float(self):
+        """This test performs simple 2D compression/decompression (float)"""
+        test_data_dir = self.test_suite.current_test_data_dir
+
+        filename = 'testfloat_8_8_128.dat'
+        orifile = test_data_dir.join(filename)
+
+        exe = 'sz'
+        reason = 'testing 2D compression of {0}'.format(exe)
+        options = ['-z', '-f', '-i', orifile, '-M',
+                   'REL', '-R', '1E-3', '-2', '8', '1024']
+
+        self.run_test(exe, options, [], installed=True,
+                      purpose=reason, skip_missing=True, work_dir=test_data_dir)
+
+        filename = 'testfloat_8_8_128.dat.sz'
+        decfile = test_data_dir.join(filename)
+
+        reason = 'testing 2D decompression of {0}'.format(exe)
+        options = ['-x', '-f', '-i', orifile, '-s', decfile,
+                   '-2', '8', '1024', '-a']
+
+        self.run_test(exe, options, [], installed=True, purpose=reason,
+                      skip_missing=True, work_dir=test_data_dir)
+
+    def _test_3d_float(self):
+        """This test performs simple 3D compression/decompression (float)"""
+
+        test_data_dir = self.test_suite.current_test_data_dir
+
+        filename = 'testfloat_8_8_128.dat'
+        orifile = test_data_dir.join(filename)
+
+        exe = 'sz'
+        reason = 'testing 3D compression of {0}'.format(exe)
+        options = ['-z', '-f', '-i', orifile, '-M', 'REL',
+                   '-R', '1E-3', '-3', '8', '8', '128']
+
+        self.run_test(exe, options, [], installed=True, purpose=reason,
+                      skip_missing=True, work_dir=test_data_dir)
+
+        filename = 'testfloat_8_8_128.dat.sz'
+        decfile = test_data_dir.join(filename)
+
+        reason = 'testing 3D decompression of {0}'.format(exe)
+        options = ['-x', '-f', '-i', orifile, '-s', decfile,
+                   '-3', '8', '8', '128', '-a']
+
+        self.run_test(exe, options, [], installed=True, purpose=reason,
+                      skip_missing=True, work_dir=test_data_dir)
+
+    def test(self):
+        """Perform smoke tests on the installed package"""
+        # run 2D compression and decompression (float)
+        self._test_2d_float()
+        # run 3D compression and decompression (float)
+        self._test_3d_float()
diff --git a/var/spack/repos/builtin/packages/sz/test/testfloat_8_8_128.dat b/var/spack/repos/builtin/packages/sz/test/testfloat_8_8_128.dat
new file mode 100644
index 0000000000000000000000000000000000000000..1f9d40d84b5d0201197385c0cb090552d0191129
GIT binary patch
literal 32768
zcmeI#Nl2AZ0L5{Mv=npkf=Gf2tqhwjvWasqCItm0E=^yVW2W!>G%2G3El7%5n2=f_
zl}6B_f)I^HNhF$$Y%r;8q#}t1iY%#!Z}~X;^ICjd9%uEx_icVvQ(a7)<f0?aMO?g#
znhAe?C%TB3<Kpo=7ggf>kr^)hqg~AY<{-Am!O5!*4zxR1amj&gbD+K_9CdKkbuep+
zgY?${>^vU8woL)7S{A@$UjXWR^|cb9tOWbN6r<V{BPM%2#+DV~YuP$1uPB82{;9eE
zzJ`1xHRoZVEf)v-a?s<;!JQdv(UFu5^}T<@8bsap<7jObDhf04a=|LZZq0zdAOjmu
zXFz>NVit=1E)uRE!sQW9G5BJPnSN=d>D#x%?7q-w)c4QRT217d8>TVknMu$7YOcH;
zYHR1l*!)+c?6=Z!R(((Xl3=59XWHgH^X*{&VmtC!nqA(x+9sE}c1ihmtG>5>tg$UU
z4YsMb-j**cu$gtYOv<lH6CPG+!v1{f``^a@-@o^MvZ&J3*6cMAdE@QKcl+$mGe@j<
zH-G;Riu=urb+)Xg*hY5^vqf9{X5hTfY`Qz#L^g$+rH_Uf^*u2>%+yExK*od5STXGb
z;^N+5!<9aKuk1zgr~6RfTPJtnK;3o3S9GGKyB!a6E}-OI8%lc5pegzk)c5S?CvYz9
zINo<RA@#;#?D93DGxH#JY;HhUdOg&4b>Fi-b>Fi-b>Fi-b>Fi-b>Fi-b>Fi-b>Fi-
zb>Fi-b>Fi-b>Fi-&$pp|s`}o0*I<3>zGr>vzGr>vzGr>vzGr>R$Lc%tvHH$@tiCfJ
ztMAOm>O1qX`p$f;zB3=I@65;QJM*#n?)fm(&tN|G?nQNHK33nEkJWePWA&Z+SbbOb
zJ?m5VJ?m5VJ?m5VJ?m5VJ?m5VJ?m5VJ?m5VJ?m5VJ?m5VJ?ry)8|tU3@4a^o)~D`!
z)~D`!)~D`!)~D`!*2jFTzB3=I@65;QJM*#n&U~!CGasw(%*X0G^RfEQe5}4RAFJ=4
z4@3P7=40<(RCnfM^_}@xeP=#a-<glqcXi*hK6T%-K6T%-K6T%-K6T%-K6T%-K6T%-
zK6T%-K6T%-K6T%-KF_zIeyaN3d)Hun>b_@v>b_@v>b_@v>b_@v%*X0G^RfEQe5}4R
zAFJ=o$Lc%tvHH$@tiCfJtMAOm>O1qX`tJEK)X!i(_U=V>XFgWnnUB?X=417p`B;5d
z_dV-V_dV-V_dV-V_dV-V_dV-V_dV-V_dV-V_dV-V_dV-V_dV<Ld>iVgs_(sb4c4db
Td)BA!d)BA!d)BA!d)D_G>40MX

literal 0
HcmV?d00001