From bea14132cf8f814e52de30676f098c94a50c49b9 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Mon, 14 Mar 2016 14:28:43 +0000
Subject: [PATCH] Normalize the $testdir and $argv0 paths so that they continue
 to work in the testing subdirectory.

FossilOrigin-Name: 19225b8130f1640772fc54250583b571a89063b6
---
 manifest        | 12 ++++++------
 manifest.uuid   |  2 +-
 test/tester.tcl |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/manifest b/manifest
index be4618cf04..8f5aa6a6b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Run\sTCL\stests\sin\sa\ssubdirectory\s"testdir".
-D 2016-03-14T13:42:29.333
+C Normalize\sthe\s$testdir\sand\s$argv0\spaths\sso\sthat\sthey\scontinue\sto\swork\nin\sthe\stesting\ssubdirectory.
+D 2016-03-14T14:28:43.708
 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -1085,7 +1085,7 @@ F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
-F test/tester.tcl 5e4888b6bfa9862716531c085a7d450d80427884
+F test/tester.tcl 91d34b1d829a25b63ad79160fafce8d626f433ef
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 54b8968e335760105206b894672213c1d56771a4
-R 51c96c83fefb55fe62e20e36b1c079f2
+P f632bba0d6ad3edc60f4127380ce8320378dac42
+R 22b406abedcbf80fe60cfc67f5d3bedf
 U drh
-Z ad4f0a6837143665327a52812ce6dad2
+Z 43e678777243a6003b283ca0fdf3c95b
diff --git a/manifest.uuid b/manifest.uuid
index 837a8076f0..63fbc091c0 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f632bba0d6ad3edc60f4127380ce8320378dac42
\ No newline at end of file
+19225b8130f1640772fc54250583b571a89063b6
\ No newline at end of file
diff --git a/test/tester.tcl b/test/tester.tcl
index e8d41fd4a2..d8b37579a6 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -517,7 +517,9 @@ if {[info exists cmdlinearg]==0} {
       }
     }
   }
+  set testdir [file normalize $testdir]
   set cmdlinearg(TESTFIXTURE_HOME) [pwd]
+  set argv0 [file normalize $argv0]
   if {$cmdlinearg(testdir)!=""} {
     file mkdir $cmdlinearg(testdir)
     cd $cmdlinearg(testdir)