Make the LD_PRELOAD path absolute in the tests that use it

In some situations, libtool will change directories and perform
a link step before executing the libtest test app. Since
LD_PRELOAD is in effect for this entire process, the path to the
binary must be absolute so it will be valid no matter in which
directory the app is running.

diff --git a/tests/data/test1008 b/tests/data/test1008
index 563a5c0303fbbca44413bbe7847b4d94c2949b7c..5334f856e46586dd37557173e5f2f8f8297bad65 100644 (file)
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -90,7 +90,7 @@ HTTP proxy CONNECT auth NTLM with chunked-encoded 407 response
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel

diff --git a/tests/data/test1021 b/tests/data/test1021
index 0bc8af3cc5a02789f292d4d74fadab2dd856d464..5ab772878b43340c427acdec71dff5f081b273f2 100644 (file)
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -99,7 +99,7 @@ HTTP proxy CONNECT with any proxyauth and proxy offers NTLM and close
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel

diff --git a/tests/data/test1100 b/tests/data/test1100
index 00bd64431e6e2425114a9aabf23f19daa423ca03..e38c0e0d73e453b4b5b784964ee29731ddf48fa4 100644 (file)
--- a/tests/data/test1100
+++ b/tests/data/test1100
@@ -74,7 +74,7 @@ HTTP POST with NTLM authorization and following a 302 redirect
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/1100 -u testuser:testpass --ntlm -L -d "stuff to send away" 

diff --git a/tests/data/test150 b/tests/data/test150
index fc922e2f28c0d2342d75011334f056202f86bff9..cdd4cf6737c034d1351bebbc4154836f3e109bbc 100644 (file)
--- a/tests/data/test150
+++ b/tests/data/test150
@@ -61,7 +61,7 @@ HTTP with NTLM authorization and --fail
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/150 -u testuser:testpass --ntlm --fail

diff --git a/tests/data/test155 b/tests/data/test155
index 53ee1dbbd538add53621e14c1cee0d5b38c99f7b..891aa35f8cca18f43d809af7a88eb0642d542a09 100644 (file)
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -79,7 +79,7 @@ HTTP PUT with --anyauth authorization (picking NTLM)
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/155 -T log/put155 -u testuser:testpass --anyauth

diff --git a/tests/data/test159 b/tests/data/test159
index ede46249208b6c33fe8db6ed26f398bf609da4a1..2b9c8321857043726a5e67808c8e50dcf63ba82b 100644 (file)
--- a/tests/data/test159
+++ b/tests/data/test159
@@ -60,7 +60,7 @@ HTTP with NTLM authorization when talking HTTP/1.0
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/159 -u testuser:testpass --ntlm -0

diff --git a/tests/data/test169 b/tests/data/test169
index 5af7f9f5c073f8544a6f375672ee2790b4c2bc72..f7419e6d0362f1ff36183c0c72f0ce6be91b8684 100644 (file)
--- a/tests/data/test169
+++ b/tests/data/test169
@@ -85,7 +85,7 @@ HTTP with proxy-requiring-NTLM to site-requiring-Digest
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://data.from.server.requiring.digest.hohoho.com/169 --proxy http://%HOSTIP:%HTTPPORT --proxy-user foo:bar --proxy-ntlm --digest --user digest:alot

diff --git a/tests/data/test209 b/tests/data/test209
index e27b6e38bd31b61fef803ef19419a4e4dd3c9e9f..81cdcbd84141be54cb9906e4c291d27d002402e4 100644 (file)
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -83,7 +83,7 @@ HTTP proxy CONNECT auth NTLM
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel

diff --git a/tests/data/test213 b/tests/data/test213
index 8bab387836b44e40ef772eaf3423f2aea62b7f4d..bb7763bb6368c4047e9782ef4119b72769e6964e 100644 (file)
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -83,7 +83,7 @@ HTTP 1.0 proxy CONNECT auth NTLM and then POST
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"

diff --git a/tests/data/test239 b/tests/data/test239
index e88908989651ed27ba266725abe1ececbd184eff..2748100fb4045f153c326b38305f18d50543a44e 100644 (file)
--- a/tests/data/test239
+++ b/tests/data/test239
@@ -60,7 +60,7 @@ HTTP proxy-auth NTLM and then POST
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/239 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm -d "postit"

diff --git a/tests/data/test243 b/tests/data/test243
index 3effb8202ac5e5c9617737242030806f96e6f9b7..d53a437981ce5e47077c63883904597c665db592 100644 (file)
--- a/tests/data/test243
+++ b/tests/data/test243
@@ -81,7 +81,7 @@ HTTP POST with --proxy-anyauth, picking NTLM
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/243 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth -d "postit"

diff --git a/tests/data/test265 b/tests/data/test265
index e47dbe8e778a38a2d0c14e74b54a62eae7216ba7..18d20a60ac2290f3efc2a79613cb626ecde08f8d 100644 (file)
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -86,7 +86,7 @@ HTTP proxy CONNECT auth NTLM and then POST, response-body in the 407
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"

diff --git a/tests/data/test267 b/tests/data/test267
index aa61b357b20dc30277f33de48496d19384805022..479031c46105c15cdc914791706e2aabfa7d8253 100644 (file)
--- a/tests/data/test267
+++ b/tests/data/test267
@@ -67,7 +67,7 @@ HTTP POST with NTLM authorization and added custom headers
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/267 -u testuser:testpass --ntlm -d "data" -H "Header1: yes" -H "Header2: no"

diff --git a/tests/data/test547 b/tests/data/test547
index 8ac0c9dd5d6e57ee265c828a1ac968142b5c1581..d1e26040a738a48d6ab1939ff0eb6b9fbdf5908b 100644 (file)
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -84,7 +84,7 @@ HTTP proxy auth NTLM with POST data from read callback
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n

diff --git a/tests/data/test548 b/tests/data/test548
index d811fcaebc04a2a8300e35d5d0589944f98e2dcb..c4942e6024b123f653d75124dfac5cd26f799766 100644 (file)
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -84,7 +84,7 @@ HTTP proxy auth NTLM with POST data from CURLOPT_POSTFIELDS
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n

diff --git a/tests/data/test555 b/tests/data/test555
index 74dc210b10aab7bbbca363d016c127f4dfb0aa75..32223452e4c66037b147b86bffe266766341da19 100644 (file)
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -89,7 +89,7 @@ HTTP proxy auth NTLM with POST data from read callback multi-if
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://test.remote.haxx.se/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n

diff --git a/tests/data/test67 b/tests/data/test67
index d6d60efe7c4880b4baeec88fd20c60b8f42f2000..bfe6edd26e016451d23780cfbb6c102edb89b586 100644 (file)
--- a/tests/data/test67
+++ b/tests/data/test67
@@ -67,7 +67,7 @@ HTTP with NTLM authorization
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/67 -u testuser:testpass --ntlm

diff --git a/tests/data/test68 b/tests/data/test68
index 5b79a7a98c60a893ecc41d0dc994c21076bacdd9..10b4429c330625c69cb0c33c6098df427cf071ef 100644 (file)
--- a/tests/data/test68
+++ b/tests/data/test68
@@ -66,7 +66,7 @@ HTTP with NTLM authorization and wrong password
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/68 -u testuser:testpass --ntlm

diff --git a/tests/data/test69 b/tests/data/test69
index d6b8de62c5c3c3ad281bef8ff2d2b971a5c43623..441aed7e8bad89e12042f76df9687e838243e783 100644 (file)
--- a/tests/data/test69
+++ b/tests/data/test69
@@ -83,7 +83,7 @@ HTTP with NTLM, Basic or Wild-and-crazy authorization
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/69 -u testuser:testpass --anyauth

diff --git a/tests/data/test81 b/tests/data/test81
index 47b37e963af4b31b8ebfaac62da56541d39ce7a3..0da0bdca089c86f0f05d9898c409e6ec2ce48af9 100644 (file)
--- a/tests/data/test81
+++ b/tests/data/test81
@@ -66,7 +66,7 @@ HTTP with proxy using NTLM authorization
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/81 --proxy-user testuser:testpass -x http://%HOSTIP:%HTTPPORT --proxy-ntlm

diff --git a/tests/data/test89 b/tests/data/test89
index 3512fbe55181783edca3c1b5de52de56546d87ec..f348eb65815bd26602c75d60449222938b4a0542 100644 (file)
--- a/tests/data/test89
+++ b/tests/data/test89
@@ -100,7 +100,7 @@ HTTP with NTLM and follow-location
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/89 -u testuser:testpass --ntlm -L

diff --git a/tests/data/test90 b/tests/data/test90
index 55c98f4a03bbf3b07566efb37dd9b89d9e9e36c0..24a7ff4d25b2258636d6fb4f74cbd4469050f4a0 100644 (file)
--- a/tests/data/test90
+++ b/tests/data/test90
@@ -138,7 +138,7 @@ HTTP with NTLM via --anyauth, and then follow-location with NTLM again
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/90 -u testuser:testpass --anyauth -L

diff --git a/tests/data/test91 b/tests/data/test91
index 90ace92ed3e8a74ebb85dbd7c58cf47832f80e68..e6f34aedf073e1c3ace3d7fa3b34db69ca658035 100644 (file)
--- a/tests/data/test91
+++ b/tests/data/test91
@@ -84,7 +84,7 @@ HTTP with NTLM/Negotiate/Basic, anyauth and user with domain, with size 0
 # we force our own host name, in order to make the test machine independent
 CURL_GETHOSTNAME=curlhost
 # we try to use the LD_PRELOAD hack, if not a debug build
-LD_PRELOAD=./libtest/.libs/libhostname.so
+LD_PRELOAD=%PWD/libtest/.libs/libhostname.so
  </setenv>
  <command>
 http://%HOSTIP:%HTTPPORT/91 --anyauth -u mydomain\\myself:secret