968044 - xpcshell tests have trailing \x0D on every log output of individual tests

Status: RESOLVED FIXED

(Testing :: XPCShell Harness, defect)

Description

[Mark Hammond [:markh] [:mhammond]]

This started happening last week.  eg:

...
 0:03.81 Retrying tests that failed when run in parallel.
 0:04.91 TEST-UNEXPECTED-FAIL | o:/src/mozilla-git/gecko-dev/obj-release/_tests/xpcshell/services/sync/tests/unit/test_service_detect_upgrade.js | test failed (with xpcshell return code: 0), see following log:
 0:04.91 >>>>>>>
 0:04.91 1391578503323  Sync.EngineManager      ERROR   Engine 'tabs' is already registered!\x0D
 0:04.91 \x0D
 0:04.91 TEST-INFO | (xpcshell/head.js) | test MAIN run_test pending (1)
 0:04.91 \x0D
 0:04.91 TEST-INFO | (xpcshell/head.js) | test run_next_test 0 pending (2)
 0:04.91 \x0D
 0:04.91 TEST-INFO | (xpcshell/head.js) | test MAIN run_test finished (2)
 0:04.91 \x0D
 0:04.91 TEST-INFO | (xpcshell/head.js) | running event loop
 0:04.91 TEST-INFO | o:/src/mozilla-git/gecko-dev/obj-release/_tests/xpcshell/services/sync/tests/unit/test_service_detect_upgrade.js | Starting v4_upgrade\x0D
 0:04.91 \x0D
 0:04.91 TEST-INFO | (xpcshell/head.js) | test v4_upgrade pending (2)
 0:04.91 Set up some tabs.\x0D
 0:04.91 1391578503329  Sync.Status     INFO    Resetting Status.\x0D
 0:04.91 1391578503329  Sync.Status     DEBUG   Status.service: service.client_not_configured => success.status_ok\x0D
 0:04.91 Logging in.\x0D
etc

Comment 1

[(not currently active) Ted Mielczarek]

Possible fallout from bug 933885? Specifically:
http://hg.mozilla.org/mozilla-central/rev/73733b06cbf7

Comment 2

[Gregory Szorc [:gps]]

Possibly also a Windows line ending in a file / string literal somewhere. I don't see this on OS X.

Comment 3

[Mark Hammond [:markh] [:mhammond]]

(In reply to Ted Mielczarek [:ted.mielczarek] from comment #1)
> Possible fallout from bug 933885? Specifically:
> http://hg.mozilla.org/mozilla-central/rev/73733b06cbf7

Almost certainly:

    1.32 +# TODO: perhaps this should be in a more generally shared location?
    1.33 +# This regex matches all of the C0 and C1 control characters
    1.34 +# (U+0000 through U+001F; U+007F; U+0080 through U+009F),
    1.35 +# except TAB (U+0009) and LF (U+000A); also, backslash (U+005C).
    1.36 +# A raw string is deliberately not used.

The lines on Windows are terminated with carriage-return + linefeed, and this block will turn the CR (0xD) chars with the escaped version.

Comment 4

[Mark Hammond [:markh] [:mhammond]]

Attachment: 0001-Bug-968044-prevent-xpcshell-test-output-from-escapin.patch

Not escaping CR characters solves this.

Comment 5

[Mark Hammond [:markh] [:mhammond]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/136a8198b5e9

Comment 6

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/136a8198b5e9