# 
# patch "ChangeLog"
#  from [32565c6c7b37c6b35e944b9d2e09a95df698d213]
#    to [98bc357765ab1af7c23681fd298cc5228e7326ba]
# 
# patch "paths.cc"
#  from [ccee6af7f3703886f089a5dd2ad62d206c4c5bb9]
#    to [9eb52ee4b1b2921551df8b7f53d5ef0adaec2c1d]
# 
========================================================================
--- ChangeLog	32565c6c7b37c6b35e944b9d2e09a95df698d213
+++ ChangeLog	98bc357765ab1af7c23681fd298cc5228e7326ba
@@ -1,5 +1,11 @@
 2005-08-26  Nathaniel Smith  <address@hidden>
 
+	* paths.cc (check_fp_normalizes_to, test_file_path_internal):
+	Oops, there were more places testing for non-brokenness; break
+	them too.
+
+2005-08-26  Nathaniel Smith  <address@hidden>
+
 	* paths.cc (test_split_join): Test that you cannot create a path
 	in MT by joining.
 	(file_path): Implement it.
========================================================================
--- paths.cc	ccee6af7f3703886f089a5dd2ad62d206c4c5bb9
+++ paths.cc	9eb52ee4b1b2921551df8b7f53d5ef0adaec2c1d
@@ -570,13 +570,17 @@
           BOOST_CHECK(file_path_internal(fp.as_internal()) == fp);
           std::vector<path_component> split_test;
           fp.split(split_test);
-          file_path fp2(split_test);
-          BOOST_CHECK(fp == fp2);
-          BOOST_CHECK(!split_test.empty());
-          if (split_test.size() > 1)
-            for (std::vector<path_component>::const_iterator i = split_test.begin();
-                 i != split_test.end(); ++i)
-              BOOST_CHECK(!null_name(*i));
+          if (fp.empty())
+            BOOST_CHECK(split_test.empty());
+          else
+            {
+              BOOST_CHECK(!split_test.empty());
+              file_path fp2(split_test);
+              BOOST_CHECK(fp == fp2);
+            }
+          for (std::vector<path_component>::const_iterator i = split_test.begin();
+               i != split_test.end(); ++i)
+            BOOST_CHECK(!null_name(*i));
           file_path fp_user = file_path_internal_from_user(std::string(*c));
           BOOST_CHECK(fp == fp_user);
         }
@@ -597,13 +601,17 @@
   BOOST_CHECK(fp.as_external() == after);
   std::vector<path_component> split_test;
   fp.split(split_test);
-  file_path fp2(split_test);
-  BOOST_CHECK(fp == fp2);
-  BOOST_CHECK(!split_test.empty());
-  if (split_test.size() > 1)
-    for (std::vector<path_component>::const_iterator i = split_test.begin();
-         i != split_test.end(); ++i)
-      BOOST_CHECK(!null_name(*i));
+  if (fp.empty())
+    BOOST_CHECK(split_test.empty());
+  else
+    {
+      BOOST_CHECK(!split_test.empty());
+      file_path fp2(split_test);
+      BOOST_CHECK(fp == fp2);
+    }
+  for (std::vector<path_component>::const_iterator i = split_test.begin();
+       i != split_test.end(); ++i)
+    BOOST_CHECK(!null_name(*i));
 }
   
 static void test_file_path_external_no_prefix()