# # # patch "ChangeLog" # from [367a35211f13309b9071d8a89fab9fecbcdcbf7d] # to [13bf7eaef60b1c8f082e72c009b78b690e46d346] # # patch "tests/t_automate_get_current_revision_id.at" # from [bd046be3d8637125f18bc2b5e4565db6bf9268a2] # to [ce3878cd8f95f48816a3c05b49a70f2ed23b74d8] # ============================================================ --- ChangeLog 367a35211f13309b9071d8a89fab9fecbcdcbf7d +++ ChangeLog 13bf7eaef60b1c8f082e72c009b78b690e46d346 @@ -1,3 +1,8 @@ +2006-05-13 Matthew Gregan + + * tests/t_automate_get_current_revision_id.at: Canonicalise output + before comparison--fixes test on Win32. + 2006-05-13 Matt Johnston * cmd_diff_log (log): don't get the roster unless we have restrictions. ============================================================ --- tests/t_automate_get_current_revision_id.at bd046be3d8637125f18bc2b5e4565db6bf9268a2 +++ tests/t_automate_get_current_revision_id.at ce3878cd8f95f48816a3c05b49a70f2ed23b74d8 @@ -6,8 +6,10 @@ # check an empty base revision id AT_CHECK(MTN automate get_current_revision_id, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cp stdout current, [], [], []) AT_CHECK(MTN automate get_revision | MTN identify, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp current stdout, [0], [], []) # check pending changes against an empty base @@ -16,8 +18,10 @@ ]) AT_CHECK(MTN automate get_current_revision_id, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cp stdout current, [], [], []) AT_CHECK(MTN automate get_revision | MTN identify, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp current stdout, [0], [], []) COMMIT(testbranch) @@ -25,8 +29,10 @@ # check no changes against a non-empty base AT_CHECK(MTN automate get_current_revision_id, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cp stdout current, [], [], []) AT_CHECK(MTN automate get_revision | MTN identify, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp current stdout, [0], [], []) # check changes against a non-empty base @@ -35,8 +41,10 @@ ]) AT_CHECK(MTN automate get_current_revision_id, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cp stdout current, [], [], []) AT_CHECK(MTN automate get_revision | MTN identify, [], [stdout], [ignore]) +AT_CHECK(CANONICALISE(stdout)) AT_CHECK(cmp current stdout, [0], [], []) AT_CLEANUP