Mercurial Mercurial > upstream > oracle > userland-gate / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/pigz/patches/300_system-test.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 06 Oct 2016 13:05:51 -0700
changeset 7063 c478967a99d2
parent 4393 963a977eeb62
child 7750 dd29141c63d5
permissions -rw-r--r--
23132067 Upgrade pigz to 2.3.3

Developed internally, for system-test; not suitable for upstream.

--- pigz-2.3.3/Makefile.orig	2016-09-26 13:21:02.245052682 +0000
+++ pigz-2.3.3/Makefile	2016-09-26 13:16:33.808207549 +0000
@@ -1,5 +1,6 @@
 CC=cc
 CFLAGS=-O3 -Wall -Wextra
+TARGETDIR ?= $(shell pwd)
 LDFLAGS=-lz
 ZOPFLI=zopfli/src/zopfli/
 # use gcc and gmake on Solaris
@@ -52,36 +53,36 @@
 tryn.o: try.c try.h
 	$(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o tryn.o try.c
 
-test: pigz
-	./pigz -kf pigz.c ; ./pigz -t pigz.c.gz
-	./pigz -kfb 32 pigz.c ; ./pigz -t pigz.c.gz
-	./pigz -kfp 1 pigz.c ; ./pigz -t pigz.c.gz
-	./pigz -kfz pigz.c ; ./pigz -t pigz.c.zz
-	./pigz -kfK pigz.c ; ./pigz -t pigz.c.zip
-	printf "" | ./pigz -cdf | wc -c | test `cat` -eq 0
-	printf "x" | ./pigz -cdf | wc -c | test `cat` -eq 1
-	printf "xy" | ./pigz -cdf | wc -c | test `cat` -eq 2
-	printf "xyz" | ./pigz -cdf | wc -c | test `cat` -eq 3
-	(printf "w" | gzip ; printf "x") | ./pigz -cdf | wc -c | test `cat` -eq 2
-	(printf "w" | gzip ; printf "xy") | ./pigz -cdf | wc -c | test `cat` -eq 3
-	(printf "w" | gzip ; printf "xyz") | ./pigz -cdf | wc -c | test `cat` -eq 4
-	-@if test "`which compress | grep /`" != ""; then \
-	  echo 'compress -f < pigz.c | ./unpigz | cmp - pigz.c' ;\
-	  compress -f < pigz.c | ./unpigz | cmp - pigz.c ;\
+test: $(TARGETDIR)/pigz
+	$(TARGETDIR)/pigz -kf pigz.c ; $(TARGETDIR)/pigz -t pigz.c.gz
+	$(TARGETDIR)/pigz -kfb 32 pigz.c ; $(TARGETDIR)/pigz -t pigz.c.gz
+	$(TARGETDIR)/pigz -kfp 1 pigz.c ; $(TARGETDIR)/pigz -t pigz.c.gz
+	$(TARGETDIR)/pigz -kfz pigz.c ; $(TARGETDIR)/pigz -t pigz.c.zz
+	$(TARGETDIR)/pigz -kfK pigz.c ; $(TARGETDIR)/pigz -t pigz.c.zip
+	printf "" | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 0
+	printf "x" | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 1
+	printf "xy" | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 2
+	printf "xyz" | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 3
+	(printf "w" | gzip ; printf "x") | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 2
+	(printf "w" | gzip ; printf "xy") | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 3
+	(printf "w" | gzip ; printf "xyz") | $(TARGETDIR)/pigz -cdf | wc -c | test `cat` -eq 4
+	-@if test "`type -f compress | grep /`" != ""; then \
+	  echo 'compress -f < pigz.c | $(TARGETDIR)/unpigz | cmp - pigz.c' ;\
+	  compress -f < pigz.c | $(TARGETDIR)/unpigz | cmp - pigz.c ;\
 	fi
 	@rm -f pigz.c.gz pigz.c.zz pigz.c.zip
 	@rm -rf d/1 d/2
 	(mkdir -p d/1; cd d/1; tar xzf ../../../../pigz-2.3.3.tar.gz; \
-	  cd ..; cp -pr 1 2; ../pigz -rp 4 --index %z 1; \
-	  ../pigz -drp 4 --index %z 1; diff -r 1 2)
+	  cd ..; cp -pr 1 2; $(TARGETDIR)/pigz -rp 4 --index %z 1; \
+	  $(TARGETDIR)/pigz -drp 4 --index %z 1; diff -r 1 2)
 	@rm -rf d/1 d/2
 	(mkdir -p d/1; cd d/1; tar xzf ../../../../pigz-2.3.3.tar.gz; \
-	  cd ..; cp -pr 1 2; ../pigz -zrp 4 -X %f.idx 1; \
-	  ../pigz -dzrp 4 -X %f.idx 1; diff -r 1 2)
+	  cd ..; cp -pr 1 2; $(TARGETDIR)/pigz -zrp 4 -X %f.idx 1; \
+	  $(TARGETDIR)/pigz -dzrp 4 -X %f.idx 1; diff -r 1 2)
 	@rm -rf d/1 d/2
 
 tests: dev test
-	./pigzn -kf pigz.c ; ./pigz -t pigz.c.gz
+	$(TARGETDIR)/pigzn -kf pigz.c ; $(TARGETDIR)/pigz -t pigz.c.gz
 	@rm -f pigz.c.gz
 
 docs: pigz.pdf
upstream/oracle/userland-gate