1395588 - comment lines from *.txt are mixed in the output of ssl.sh

Status: RESOLVED FIXED

(NSS :: Test, defect)

Description

[Daiki Ueno [:ueno]]

Attachment: skip-comments.patch

From the build log:

ssl.sh: skipping  Form is subject to the terms of the Mozilla Public (non-FIPS only)
ssl.sh: skipping  If a copy of the MPL was not distributed with this (non-FIPS only)
ssl.sh: skipping  obtain one at http://mozilla.org/MPL/2.0/. (non-FIPS only)
ssl.sh: skipping   (non-FIPS only)
ssl.sh: skipping  the stress tests for SSL/TLS. (non-FIPS only)
ssl.sh: skipping   (non-FIPS only)
ssl.sh: skipping   (non-FIPS only)
ssl.sh: skipping  client                         Test Case name (non-FIPS only)
ssl.sh: skipping  params (non-FIPS only)
ssl.sh: skipping  ------                         --------------- (non-FIPS only)

The words mixed in the output are from the comment lines in the test data:
https://hg.mozilla.org/projects/nss/file/tip/tests/ssl/sslstress.txt#l1

The attached patch skips the comment lines before processing to avoid this.

Comment 1

[Kai Engert [:KaiE:]]

I suggest instead of
    grep -v '^$'
to use
    grep -v '^ *$'
to filter out lines that aren't completely empty, but contain spaces, only.

Do you agree?

If you wanted to be more complete, you could use the [:space:] class offered by grep, to match tab characters, too. But I searched the ssl/*.txt files, and there aren't any tab characters in those files (except in comment lines that start with # as the first character), so we may decide that using [:space:] is unnecessary.

Everything else looks good, r=kaie

Comment 2

[Kai Engert [:KaiE:]]

(In reply to Kai Engert (:kaie:) from comment #1)
> I suggest instead of
>     grep -v '^$'
> to use
>     grep -v '^ *$'
> to filter out lines that aren't completely empty, but contain spaces, only.
> 
> Do you agree?

Comment 3

[Daiki Ueno [:ueno]]

Attachment: skip-comments-v2.patch

Yes, I agree.  The attached patch addresses those issues.

Comment 4

[Kai Engert [:KaiE:]]

Comment on attachment 8904606 [details] [diff] [review]
skip-comments-v2.patch

great, thanks a lot
r=kaie

Comment 5

[Kai Engert [:KaiE:]]

https://hg.mozilla.org/projects/nss/rev/5d20e29c616a