# 
# patch "ChangeLog"
#  from [ac39e611547d7c2b51c8a5da84499767346018f4]
#    to [24eb510f24c561e9f7607f1283d6d65f0baef24d]
# 
# patch "tests/t_automate_stdio.at"
#  from [82905ef9235da9d20dc5c56e9e0b3e0a55a919d4]
#    to [e86f5d0e9f49172d5948e6131a8de64b5ff20bb1]
# 
# patch "tests/t_cvsimport_drepper.at"
#  from [fa1e2cb90749522674c28871a9a9971c7984c34c]
#    to [5b803327cc8752bab50ced9a0efc4ce59a5244ef]
# 
# patch "tests/t_selector_later_earlier.at"
#  from [8e3a1438e23b7c4b562d254c55c2f2d4b0a75bd5]
#    to [b3e5d9771d979375e79b8506d7b08b4aaa6fc18d]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-06-26  Matthew Gregan  <address@hidden>
+
+	* tests/t_automate_stdio.at, tests/t_cvsimport_drepper.at,
+	tests/t_selector_later_earlier.at: Further canonicalisation of
+	monotone output to resolve test failures on Win32.
+
 2005-06-24  Nathaniel Smith  <address@hidden>
 
 	* tests/t_db_kill_rev_locally.at: Clean up style.
--- tests/t_automate_stdio.at
+++ tests/t_automate_stdio.at
@@ -28,8 +28,10 @@
 ])
 
 AT_CHECK(MONOTONE automate inventory, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout output)
 AT_CHECK(echo "l9:inventorye"|MONOTONE automate stdio, [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(chmod u+x get_stdio.pl)
 CHECK_SAME_STDOUT(./get_stdio.pl stdout 0, cat output)
 
--- tests/t_cvsimport_drepper.at
+++ tests/t_cvsimport_drepper.at
@@ -186,6 +186,7 @@
 AT_CHECK(MONOTONE --branch=foo.bar cvs_import e, [], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=foo.bar.disasm-branch co)
 AT_CHECK(cd foo.bar.disasm-branch && MONOTONE cat manifest, [], [stdout])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp test.manifest stdout)
 
 AT_CLEANUP
--- tests/t_selector_later_earlier.at
+++ tests/t_selector_later_earlier.at
@@ -49,11 +49,13 @@
 AT_CHECK(RAW_MONOTONE automate select "e:2005-04-30", [], [stdout], [ignore])
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
-AT_CHECK(test 3 -eq "`wc -l <a_s`")
+LINE_COUNT=`wc -l < a_s`
+AT_CHECK(test 3 -eq $LINE_COUNT)
 AT_CHECK(RAW_MONOTONE automate select "e:2006-07", [], [stdout], [ignore])
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
-AT_CHECK(test 3 -eq "`wc -l <a_s`")
+LINE_COUNT=`wc -l < a_s`
+AT_CHECK(test 3 -eq $LINE_COUNT)
 
 # -------------------
 # check 'later' selector
@@ -63,40 +65,42 @@
 # commit times.  Giving a time equal to that of third commit thus
 # should not match anything
 AT_CHECK(RAW_MONOTONE automate select "l:2005-04-24T07:44:39", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout nosel)
 AT_CHECK(test -f nosel -a ! -s nosel)
 AT_CHECK(RAW_MONOTONE automate select "l:2005-05", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout nosel)
 AT_CHECK(test -f nosel -a ! -s nosel)
 
 # these sels should extract only the last commit
 # Note: the second sel is one sec before the last commit
-AT_CHECK(cp -f third expout)
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-23", [], [expout], [ignore])
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-24T07:44:38", [], [expout], [ignore])
+CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MONOTONE automate select "l:2005-04-23")
+CHECK_SAME_CANONICALISED_STDOUT(cat third, RAW_MONOTONE automate select "l:2005-04-24T07:44:38")
 
 # now we match the second and third commit
-AT_CHECK(cat third second, [], [stdout], [ignore])
-AT_CHECK(mv stdout expout)
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-21", [], [expout], [ignore])
+CHECK_SAME_CANONICALISED_STDOUT(cat third second, RAW_MONOTONE automate select "l:2005-04-21")
 
 # finally, all the files
 AT_CHECK(RAW_MONOTONE automate select "l:2005-03", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
-AT_CHECK(test 3 -eq "`wc -l <a_s`")
+LINE_COUNT=`wc -l < a_s`
+AT_CHECK(test 3 -eq $LINE_COUNT)
 AT_CHECK(RAW_MONOTONE automate select "l:2003-01", [], [stdout], [ignore])
+AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(mv stdout a_s)
-AT_CHECK(test 3 -eq "`wc -l <a_s`")
+LINE_COUNT=`wc -l < a_s`
+AT_CHECK(test 3 -eq $LINE_COUNT)
 
 # -------------------
 # check combined selectors
 # -------------------
 
 # matching only the second commit
-AT_CHECK(cp -f second expout)
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-23", [], [expout], [ignore])
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-22T20:00:00", [], [expout], [ignore])
-AT_CHECK(RAW_MONOTONE automate select "l:2005-04-21T23:01:00/e:2005-04-22T20:00:00", [], [expout], [ignore])
+CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-23")
+CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-01/e:2005-04-22T20:00:00")
+CHECK_SAME_CANONICALISED_STDOUT(cat second, RAW_MONOTONE automate select "l:2005-04-21T23:01:00/e:2005-04-22T20:00:00")
 
 # non overlapping intervals should not match, even if the single selector 
 # will