<div style="white-space:pre-wrap">Thanks! That does indeed help.<br><br>I guess that the file needed to be explicitly cleaned out rather than relying on the > for the replacement. The static version of the file achieves the same result. But thanks for the information!</div><br><div class="gmail_quote"><div dir="ltr">On Mon, Nov 14, 2016 at 1:01 PM Vedant Kumar <<a href="mailto:vsk@apple.com">vsk@apple.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">If it helps, here is what we were seeing on some bots:<br class="gmail_msg">
<br class="gmail_msg">
$ ./bin/llvm-strings Build/test/tools/llvm-strings/Output/outer.a<br class="gmail_msg">
!<arch><br class="gmail_msg">
#1/12 0 0 0 644 88 `<br class="gmail_msg">
inner.a<br class="gmail_msg">
!<arch><br class="gmail_msg">
#1/4 0 0 0 644 8 `<br class="gmail_msg">
abcdabcd<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Lit output:<br class="gmail_msg">
<br class="gmail_msg">
--<br class="gmail_msg">
Exit Code: 1<br class="gmail_msg">
<br class="gmail_msg">
Command Output (stderr):<br class="gmail_msg">
--<br class="gmail_msg">
/Users/buildslave/jenkins/sharedspace/apple-clang-stage1@2/clang/src/test/tools/llvm-strings/nested-archives.test:9:8: error: expected string not found in input<br class="gmail_msg">
CHECK: inner.a/ 0 0 0 644 72 `<br class="gmail_msg">
^<br class="gmail_msg">
<stdin>:2:1: note: scanning from here<br class="gmail_msg">
#1/12 0 0 0 644 88 `<br class="gmail_msg">
^<br class="gmail_msg">
<br class="gmail_msg">
--<br class="gmail_msg">
<br class="gmail_msg">
vedant<br class="gmail_msg">
<br class="gmail_msg">
> On Nov 14, 2016, at 5:09 AM, Renato Golin via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br class="gmail_msg">
><br class="gmail_msg">
> Author: rengolin<br class="gmail_msg">
> Date: Mon Nov 14 07:09:24 2016<br class="gmail_msg">
> New Revision: 286820<br class="gmail_msg">
><br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=286820&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=286820&view=rev</a><br class="gmail_msg">
> Log:<br class="gmail_msg">
> Revert "llvm-strings: support printing the filename"<br class="gmail_msg">
><br class="gmail_msg">
> Also,<br class="gmail_msg">
><br class="gmail_msg">
> Revert "test: remove the archive before modifying it"<br class="gmail_msg">
> Revert "test: explicitly use gnu format"<br class="gmail_msg">
><br class="gmail_msg">
> This reverts commits r286778, r286729 and r286767, as they are randomly failing<br class="gmail_msg">
> on many bots (AArch64, x86_64).<br class="gmail_msg">
><br class="gmail_msg">
> Removed:<br class="gmail_msg">
> llvm/trunk/test/tools/llvm-strings/archive-filename.test<br class="gmail_msg">
> llvm/trunk/test/tools/llvm-strings/file-filename.test<br class="gmail_msg">
> llvm/trunk/test/tools/llvm-strings/stdin-filename.test<br class="gmail_msg">
> Modified:<br class="gmail_msg">
> llvm/trunk/test/tools/llvm-strings/nested-archives.test<br class="gmail_msg">
> llvm/trunk/tools/llvm-strings/llvm-strings.cpp<br class="gmail_msg">
><br class="gmail_msg">
> Removed: llvm/trunk/test/tools/llvm-strings/archive-filename.test<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/archive-filename.test?rev=286819&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/archive-filename.test?rev=286819&view=auto</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/test/tools/llvm-strings/archive-filename.test (original)<br class="gmail_msg">
> +++ llvm/trunk/test/tools/llvm-strings/archive-filename.test (removed)<br class="gmail_msg">
> @@ -1,10 +0,0 @@<br class="gmail_msg">
> -RUN: echo -n abcd > %T/abcd<br class="gmail_msg">
> -RUN: rm -f %T/archive.a<br class="gmail_msg">
> -RUN: llvm-ar -format gnu crs %T/archive.a %T/abcd<br class="gmail_msg">
> -RUN: llvm-strings -f %T/archive.a | FileCheck %s<br class="gmail_msg">
> -RUN: llvm-strings --print-file-name %T/archive.a | FileCheck %s<br class="gmail_msg">
> -<br class="gmail_msg">
> -CHECK: archive.a: !<arch><br class="gmail_msg">
> -CHECK: archive.a: abcd/ 0 0 0 644 4 `<br class="gmail_msg">
> -CHECK: archive.a: abcd<br class="gmail_msg">
> -<br class="gmail_msg">
><br class="gmail_msg">
> Removed: llvm/trunk/test/tools/llvm-strings/file-filename.test<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/file-filename.test?rev=286819&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/file-filename.test?rev=286819&view=auto</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/test/tools/llvm-strings/file-filename.test (original)<br class="gmail_msg">
> +++ llvm/trunk/test/tools/llvm-strings/file-filename.test (removed)<br class="gmail_msg">
> @@ -1,4 +0,0 @@<br class="gmail_msg">
> -RUN: echo -n abcd > %T/abcd<br class="gmail_msg">
> -RUN: llvm-strings -f %T/abcd | FileCheck %s<br class="gmail_msg">
> -RUN: llvm-strings --print-file-name %T/abcd | FileCheck %s<br class="gmail_msg">
> -CHECK: {{[\\/]}}abcd: abcd<br class="gmail_msg">
><br class="gmail_msg">
> Modified: llvm/trunk/test/tools/llvm-strings/nested-archives.test<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/nested-archives.test?rev=286820&r1=286819&r2=286820&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/nested-archives.test?rev=286820&r1=286819&r2=286820&view=diff</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/test/tools/llvm-strings/nested-archives.test (original)<br class="gmail_msg">
> +++ llvm/trunk/test/tools/llvm-strings/nested-archives.test Mon Nov 14 07:09:24 2016<br class="gmail_msg">
> @@ -1,8 +1,8 @@<br class="gmail_msg">
> RUN: echo -n abcd > %T/abcd<br class="gmail_msg">
> RUN: rm -f %T/<a href="http://inner.ar" rel="noreferrer" class="gmail_msg" target="_blank">inner.ar</a><br class="gmail_msg">
> -RUN: llvm-ar -format gnu crs %T/inner.a %T/abcd<br class="gmail_msg">
> +RUN: llvm-ar crs %T/inner.a %T/abcd<br class="gmail_msg">
> RUN: rm -f %T/<a href="http://outer.ar" rel="noreferrer" class="gmail_msg" target="_blank">outer.ar</a><br class="gmail_msg">
> -RUN: llvm-ar -format gnu crs %T/outer.a %T/inner.a<br class="gmail_msg">
> +RUN: llvm-ar crs %T/outer.a %T/inner.a<br class="gmail_msg">
> RUN: llvm-strings %T/outer.a | FileCheck %s<br class="gmail_msg">
><br class="gmail_msg">
> CHECK: !<arch><br class="gmail_msg">
><br class="gmail_msg">
> Removed: llvm/trunk/test/tools/llvm-strings/stdin-filename.test<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/stdin-filename.test?rev=286819&view=auto" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-strings/stdin-filename.test?rev=286819&view=auto</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/test/tools/llvm-strings/stdin-filename.test (original)<br class="gmail_msg">
> +++ llvm/trunk/test/tools/llvm-strings/stdin-filename.test (removed)<br class="gmail_msg">
> @@ -1,3 +0,0 @@<br class="gmail_msg">
> -RUN: echo -n abcd | llvm-strings -f - | FileCheck %s<br class="gmail_msg">
> -RUN: echo -n abcd | llvm-strings --print-file-name - | FileCheck %s<br class="gmail_msg">
> -CHECK: {standard input}: abcd<br class="gmail_msg">
><br class="gmail_msg">
> Modified: llvm/trunk/tools/llvm-strings/llvm-strings.cpp<br class="gmail_msg">
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-strings/llvm-strings.cpp?rev=286820&r1=286819&r2=286820&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-strings/llvm-strings.cpp?rev=286820&r1=286819&r2=286820&view=diff</a><br class="gmail_msg">
> ==============================================================================<br class="gmail_msg">
> --- llvm/trunk/tools/llvm-strings/llvm-strings.cpp (original)<br class="gmail_msg">
> +++ llvm/trunk/tools/llvm-strings/llvm-strings.cpp Mon Nov 14 07:09:24 2016<br class="gmail_msg">
> @@ -29,19 +29,7 @@ static cl::list<std::string> InputFileNa<br class="gmail_msg">
> cl::desc("<input object files>"),<br class="gmail_msg">
> cl::ZeroOrMore);<br class="gmail_msg">
><br class="gmail_msg">
> -static cl::opt<bool><br class="gmail_msg">
> - PrintFileName("print-file-name",<br class="gmail_msg">
> - cl::desc("Print the name of the file before each string"));<br class="gmail_msg">
> -static cl::alias PrintFileNameShort("f", cl::desc(""),<br class="gmail_msg">
> - cl::aliasopt(PrintFileName));<br class="gmail_msg">
> -<br class="gmail_msg">
> -static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {<br class="gmail_msg">
> - auto print = [&OS, FileName](StringRef L) {<br class="gmail_msg">
> - if (PrintFileName)<br class="gmail_msg">
> - OS << FileName << ": ";<br class="gmail_msg">
> - OS << L << '\n';<br class="gmail_msg">
> - };<br class="gmail_msg">
> -<br class="gmail_msg">
> +static void strings(raw_ostream &OS, StringRef Contents) {<br class="gmail_msg">
> const char *P = nullptr, *E = nullptr, *S = nullptr;<br class="gmail_msg">
> for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {<br class="gmail_msg">
> if (std::isgraph(*P) || std::isblank(*P)) {<br class="gmail_msg">
> @@ -49,12 +37,12 @@ static void strings(raw_ostream &OS, Str<br class="gmail_msg">
> S = P;<br class="gmail_msg">
> } else if (S) {<br class="gmail_msg">
> if (P - S > 3)<br class="gmail_msg">
> - print(StringRef(S, P - S));<br class="gmail_msg">
> + OS << StringRef(S, P - S) << '\n';<br class="gmail_msg">
> S = nullptr;<br class="gmail_msg">
> }<br class="gmail_msg">
> }<br class="gmail_msg">
> if (S && E - S > 3)<br class="gmail_msg">
> - print(StringRef(S, E - S));<br class="gmail_msg">
> + OS << StringRef(S, E - S) << '\n';<br class="gmail_msg">
> }<br class="gmail_msg">
><br class="gmail_msg">
> int main(int argc, char **argv) {<br class="gmail_msg">
> @@ -72,8 +60,7 @@ int main(int argc, char **argv) {<br class="gmail_msg">
> if (std::error_code EC = Buffer.getError())<br class="gmail_msg">
> errs() << File << ": " << EC.message() << '\n';<br class="gmail_msg">
> else<br class="gmail_msg">
> - strings(llvm::outs(), File == "-" ? "{standard input}" : File,<br class="gmail_msg">
> - Buffer.get()->getMemBufferRef().getBuffer());<br class="gmail_msg">
> + strings(llvm::outs(), Buffer.get()->getMemBufferRef().getBuffer());<br class="gmail_msg">
> }<br class="gmail_msg">
><br class="gmail_msg">
> return EXIT_SUCCESS;<br class="gmail_msg">
><br class="gmail_msg">
><br class="gmail_msg">
> _______________________________________________<br class="gmail_msg">
> llvm-commits mailing list<br class="gmail_msg">
> <a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
<br class="gmail_msg">
</blockquote></div>