From 301ae1ae1bde66e51eef9d55d9835196341af792 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 16 Jan 2008 22:08:37 +0000
Subject: [PATCH] Nathan Coulter's patch that makes runtests.pl respect the
 PATH when figuring out what valgrind to run.

---
 CHANGES           | 4 ++++
 RELEASE-NOTES     | 3 ++-
 tests/runtests.pl | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8f382bf..89b091c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@
 
                                   Changelog
 
+Daniel S (16 Jan 2008)
+- Nathan Coulter's patch that makes runtests.pl respect the PATH when figuring
+  out what valgrind to run.
+
 Yang Tse (16 Jan 2008)
 - Improved handling of out of memory in the command line tool that afected
   data url encoded HTTP POSTs when reading it from a file.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ba5ec52..779de46 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -56,6 +56,7 @@ This release includes the following bugfixes:
  o removed extra newlines from many error messages
  o improved pipelining
  o improved OOM handling for data url encoded HTTP POSTs when read from a file
+ o test suite could pick wrong tool(s) if more than one existed in the PATH
 
 This release includes the following known bugs:
 
@@ -79,6 +80,6 @@ advice from friends like these:
  Gilles Blanc, David Wright, Vikram Saxena, Mateusz Loskot, Gary Maxwell,
  Dmitry Kurochkin, Mohun Biswas, Richard Atterer, Maxim Perenesenko,
  Daniel Egger, Jeff Johnson, Nikitinskit Dmitriy, Georg Lippitsch, Eric Landes,
- Joe Malicki
+ Joe Malicki, Nathan Coulter
  
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 86687ee..e4f2e9d 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -373,8 +373,8 @@ sub startnew {
 #
 sub checkcmd {
     my ($cmd)=@_;
-    my @paths=("/usr/sbin", "/usr/local/sbin", "/sbin", "/usr/bin",
-               "/usr/local/bin", split(":", $ENV{'PATH'}));
+    my @paths=(split(":", $ENV{'PATH'}), "/usr/sbin", "/usr/local/sbin",
+               "/sbin", "/usr/bin", "/usr/local/bin", );
     for(@paths) {
         if( -x "$_/$cmd") {
             return "$_/$cmd";
-- 
2.7.4