From d7961606b446d5ee0508385a03bbd41b1d10d892 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Mon, 13 Aug 2012 20:17:14 +0200
Subject: [PATCH] testsuite: 'ren' no longer needed.

---
 doc/release_new_version                    | 3 +++
 testsuite/Makefile                         | 7 +++++--
 testsuite/tests-to-run/parallel-local15.sh | 3 +--
 testsuite/tests-to-run/parallel-local23.sh | 5 +----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/doc/release_new_version b/doc/release_new_version
index 16c2de8e..aa61b06e 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -181,6 +181,9 @@ for stable long-term use.
 
 New in this release:
 
+* Parallel Proxy Scraper & Checker Tool 
+  https://www.youtube.com/watch?v=iXCeR_XsP6o
+
 * GNU Parallel was presented at Chiang Mai Bar Camp
   http://barcampchiangmai.org/
   See write up here:
diff --git a/testsuite/Makefile b/testsuite/Makefile
index 4f6ea229..c653b290 100644
--- a/testsuite/Makefile
+++ b/testsuite/Makefile
@@ -2,7 +2,11 @@ testsuite: ../src/parallel tests-to-run/* wanted-results/* startdb prereqlocal p
 	time sh Start.sh
 	date
 
-local: ../src/parallel tests-to-run/*local* wanted-results/*local* prereqlocal
+testdb: ../src/parallel tests-to-run/*sql* wanted-results/*sql* prereqdb
+	time sh Start.sh sql
+	date
+
+testlocal: ../src/parallel tests-to-run/*local* wanted-results/*local* prereqlocal
 	time sh Start.sh local
 	date
 
@@ -10,7 +14,6 @@ prereqlocal: installparallel
 	seq 1 2 >/dev/null || (echo seq is required for testsuite; /bin/false)
 	stdout echo || (echo stdout is required for testsuite; /bin/false)
 	convert >/dev/null || (echo convert is required for testsuite; /bin/false)
-	ren '$$_' a || (echo ren is required for testsuite; /bin/false)
 	echo 1+2 | bc >/dev/null || (echo bc is required for testsuite; /bin/false)
 	echo | gawk '{print "gawk is installed"}' || (echo gawk is required for testsuite; /bin/false)
 	expect -c 'spawn cat; puts "expect is installed"' || (echo expect is required for testsuite; /bin/false)
diff --git a/testsuite/tests-to-run/parallel-local15.sh b/testsuite/tests-to-run/parallel-local15.sh
index 3d03cd03..090f66eb 100755
--- a/testsuite/tests-to-run/parallel-local15.sh
+++ b/testsuite/tests-to-run/parallel-local15.sh
@@ -4,8 +4,7 @@ rsync -Ha --delete input-files/testdir/ tmp/
 cd tmp
 
 echo echo test of cat pipe sh | parallel -j 50 2>&1
-find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {}_thumb.jpg
-find . -name '*_thumb.jpg' | ren 's:/([^/]+)_thumb.jpg$:/thumb_$1:' 
+find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/}
 
 ls | parallel ls | sort
 ls | parallel echo ls | sort
diff --git a/testsuite/tests-to-run/parallel-local23.sh b/testsuite/tests-to-run/parallel-local23.sh
index 8845e4d0..0615f49b 100755
--- a/testsuite/tests-to-run/parallel-local23.sh
+++ b/testsuite/tests-to-run/parallel-local23.sh
@@ -1,14 +1,11 @@
 #!/bin/bash
 
-PAR=parallel
-
 rm -rf tmp 2>/dev/null
 cp -a input-files/testdir2 tmp
 cd tmp
 
 echo '### Test filenames containing UTF-8'
-find . -name '*.jpg' | $PAR -j +0 convert -geometry 120 {} {}_thumb.jpg
-find . -name '*_thumb.jpg' | ren 's:/([^/]+)_thumb.jpg$:/thumb_$1:'
+find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/}
 
 find |grep -v CVS | sort