2 files changed, 15 insertions, 33 deletions
diff --git a/libz/tests/minigzip/buildfile b/libz/tests/minigzip/buildfile
index 660d759..c58e902 100644
--- a/libz/tests/minigzip/buildfile
+++ b/libz/tests/minigzip/buildfile
@@ -5,9 +5,17 @@ import libs = libz%lib{z}
 
 exe{driver}: {h c}{*} $libs testscript
 
-# Disable MSVC warnings that pop up with /W3 and Clang/MSVC warnings.
+# Disable MSVC warnings that pop up with /W3 and Clang warnings.
+#
+# @@ TMP: try to re-enable on next release.
 #
 if ($c.class == 'msvc')
   c.coptions += /wd4267 /wd4996
-elif ($c.id == 'clang' && $c.target.system == 'win32-msvc')
-  c.coptions += -Wno-deprecated-declarations
+else
+{
+  if ($c.id.type == 'clang' && $c.version.major >= 15)
+    c.coptions += -Wno-deprecated-non-prototype
+
+  if ($c.id == 'clang' && $c.target.system == 'win32-msvc')
+    c.coptions += -Wno-deprecated-declarations
+}
diff --git a/libz/tests/minigzip/testscript b/libz/tests/minigzip/testscript
index 92b03fc..a13458c 100644
--- a/libz/tests/minigzip/testscript
+++ b/libz/tests/minigzip/testscript
@@ -5,34 +5,8 @@ s='abcdefghijklmnopqrstuvwxz0123456789'
 s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
 s="$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s$s"
 
-: max-compression
-:
-{
-  cat <"$s" >=in &!in;
-  $* -9 in &in.gz;
-  $* -d -c in.gz >"$s"
-}
 
-: filtered
-:
-{
-  cat <"$s" >=in &!in;
-  $* -f in &in.gz;
-  $* -d -c in.gz >"$s"
-}
-
-: huffman
-:
-{
-  cat <"$s" >=in &!in;
-  $* -h in &in.gz;
-  $* -d -c in.gz >"$s"
-}
-
-: rle
-:
-{
-  cat <"$s" >=in &!in;
-  $* -r in &in.gz;
-  $* -d -c in.gz >"$s"
-}
+$* -9 <"$s" | $* -d -c >"$s" : max-compression
+$* -f <"$s" | $* -d -c >"$s" : filtered
+$* -h <"$s" | $* -d -c >"$s" : huffman
+$* -r <"$s" | $* -d -c >"$s" : rle