pts/compress-zstd-1.1.3: Update patch per #132

pts/compress-zstd-1.1.3/downloads.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!--Phoronix Test Suite v9.6.0m1-->
+<PhoronixTestSuite>
+  <Downloads>
+    <Package>
+      <URL>http://old-releases.ubuntu.com/releases/16.04.3/ubuntu-16.04.3-server-i386.img</URL>
+      <MD5>8428cead4ee139873da19248590e354f</MD5>
+      <SHA256>2e763f7f3546be33ebc9a59311b2eee3b0b0c8e021fae65431c219b531d26d32</SHA256>
+      <FileName>ubuntu-16.04.3-server-i386.img</FileName>
+      <FileSize>834666496</FileSize>
+    </Package>
+    <Package>
+      <URL>http://github.com/facebook/zstd/archive/v1.3.4.tar.gz, http://www.phoronix-test-suite.com/benchmark-files/zstd-1.3.4.tar.gz</URL>
+      <MD5>10bf0353e3dedd8bae34a188c25d4261</MD5>
+      <SHA256>92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9</SHA256>
+      <FileName>zstd-1.3.4.tar.gz</FileName>
+      <FileSize>2059958</FileSize>
+    </Package>
+    <Package>
+      <URL>http://github.com/facebook/zstd/releases/download/v1.3.4/zstd-v1.3.4-win64.zip</URL>
+      <MD5>c16aa54401b42fa75257938f38c79e10</MD5>
+      <SHA256>b71f16f211aa0397a90e046ac4358c982ab9947c33e1004c933e69aee548ff26</SHA256>
+      <FileName>zstd-v1.3.4-win64.zip</FileName>
+      <FileSize>1221468</FileSize>
+      <PlatformSpecific>Windows</PlatformSpecific>
+    </Package>
+  </Downloads>
+</PhoronixTestSuite>

pts/compress-zstd-1.1.3/install.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+tar -xvf zstd-1.3.4.tar.gz
+cd zstd-1.3.4/
+cat > portable-header-prefix.patch <<'EOF'
+From edde62b003878b62b75492c2c446da1acb5d2b27 Mon Sep 17 00:00:00 2001
+From: Ming Chen <ming.chen1986@gmail.com>
+Date: Mon, 23 Mar 2020 10:33:17 +0800
+Subject: [PATCH] compress-zstd: fix missing line breaks
+
+This change fixes issue #132: compress-zstd-1.1.2: the embedded patch
+fails to apply
+---
+ pts/compress-zstd-1.1.2/install.sh | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/pts/compress-zstd-1.1.2/install.sh b/pts/compress-zstd-1.1.2/install.sh
+index af80c8c..518ba14 100644
+--- a/pts/compress-zstd-1.1.2/install.sh
++++ b/pts/compress-zstd-1.1.2/install.sh
+@@ -6,7 +6,9 @@ cat > portable-header-prefix.patch <<'EOF'
+ --- programs/Makefile
+ +++ programs/Makefile
+ @@ -84,9 +84,14 @@ endif
++
+  VOID = /dev/null
++
+ +# more portable header prefix
+ +# https://github.com/facebook/zstd/issues/1983
+ +# https://github.com/facebook/zstd/commit/06a57cf57e3c4e887cadcf688e3081154f3f6db4
+@@ -20,6 +22,7 @@ cat > portable-header-prefix.patch <<'EOF'
+  ifeq ($(HAVE_THREAD), 1)
+  THREAD_MSG := ==> building with threading support
+ @@ -98,7 +103,7 @@ endif
++
+  # zlib detection
+  NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
+ -HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_zlib$(EXT) -x c - -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0)
+@@ -28,6 +31,7 @@ cat > portable-header-prefix.patch <<'EOF'
+  ZLIB_MSG := ==> building zstd with .gz compression support
+  ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
+ @@ -109,7 +114,7 @@ endif
++
+  # lzma detection
+  NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support
+ -HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lzma$(EXT) -x c - -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0)
+@@ -36,6 +40,7 @@ cat > portable-header-prefix.patch <<'EOF'
+  LZMA_MSG := ==> building zstd with .xz/.lzma compression support
+  LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
+ @@ -120,7 +125,7 @@ endif
++
+  # lz4 detection
+  NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support
+ -HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' | $(CC) $(FLAGS) -o have_lz4$(EXT) -x c - -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0)
+-- 
+2.25.1
+
+
+EOF
+patch -p0 < portable-header-prefix.patch
+make
+cd ~
+cat > compress-zstd <<EOT
+#!/bin/sh
+./zstd-1.3.4/zstd -19 -T\$NUM_CPU_CORES ubuntu-16.04.3-server-i386.img > /dev/null 2>&1
+EOT
+chmod +x compress-zstd

pts/compress-zstd-1.1.3/install_windows.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+unzip -o zstd-v1.3.4-win64.zip
+cat > compress-zstd <<EOT
+#!/bin/sh
+./zstd.exe -19 -T\$NUM_CPU_CORES ubuntu-16.04.3-server-i386.img 2>&1
+EOT
+chmod +x compress-zstd

pts/compress-zstd-1.1.3/interim.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -f ubuntu-16.04.3-server-i386.img.zst

pts/compress-zstd-1.1.3/post.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rm -f ubuntu-16.04.3-server-i386.img.zst

pts/compress-zstd-1.1.3/pre.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+rm -f ubuntu-16.04.3-server-i386.img.zst
+

pts/compress-zstd-1.1.3/results-definition.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!--Phoronix Test Suite v9.6.0m1-->
+<PhoronixTestSuite>
+  <SystemMonitor>
+    <Sensor>sys.time</Sensor>
+  </SystemMonitor>
+</PhoronixTestSuite>

pts/compress-zstd-1.1.3/test-definition.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--Phoronix Test Suite v9.6.0m1-->
+<PhoronixTestSuite>
+  <TestInformation>
+    <Title>Zstd Compression</Title>
+    <AppVersion>1.3.4</AppVersion>
+    <Description>This test measures the time needed to compress a sample file (an Ubuntu file-system image) using Zstd compression.</Description>
+    <ResultScale>Seconds</ResultScale>
+    <Proportion>LIB</Proportion>
+    <SubTitle>Compressing ubuntu-16.04.3-server-i386.img, Compression Level 19</SubTitle>
+    <TimesToRun>3</TimesToRun>
+  </TestInformation>
+  <TestProfile>
+    <Version>1.1.3</Version>
+    <SupportedPlatforms>Linux, BSD, MacOSX, Solaris, Windows</SupportedPlatforms>
+    <SoftwareType>Utility</SoftwareType>
+    <TestType>Processor</TestType>
+    <License>Free</License>
+    <Status>Verified</Status>
+    <ExternalDependencies>build-utilities</ExternalDependencies>
+    <EnvironmentSize>848</EnvironmentSize>
+    <EnvironmentTestingSize>256</EnvironmentTestingSize>
+    <ProjectURL>http://github.com/facebook/zstd</ProjectURL>
+    <Maintainer>Victor Rodriguez</Maintainer>
+  </TestProfile>
+</PhoronixTestSuite>