diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-03 15:07:01 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-02-03 15:07:01 +0200 |
commit | ef8e2a37863ec97c88aedcfd67d2a2e47188bf4b (patch) | |
tree | 76f8c9ff8d4ee3582696b96300a88e1a3b1867c6 | |
parent | 934f2a9a90c5cad3cdc8a66b50c17827a3ddbcee (diff) |
Work around VC issue
-rw-r--r-- | build2/test/rule.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 9a00d84..bc4060d 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -684,10 +684,10 @@ namespace build2 // We simulate stdin redirect (<file) with a fake (already terminate) // cat pipe (cat file |). // - bool stdin (pass_n != pts_n && pts[pass_n] != nullptr); + bool sin (pass_n != pts_n && pts[pass_n] != nullptr); process cat; - if (stdin) + if (sin) { const file& it (pts[pass_n]->as<file> ()); const path& ip (it.path ()); @@ -748,7 +748,7 @@ namespace build2 args.push_back ("-u"); // Note that MinGW-built diff utility (as of 3.3) fails trying to - // detect if STDIN contains text or binary data. We will help it a bit + // detect if stdin contains text or binary data. We will help it a bit // to workaround the issue. // #ifdef _WIN32 @@ -775,8 +775,8 @@ namespace build2 diag_record dr; if (!run_test (tt, dr, - args.data () + (stdin ? 3 : 0), // Skip cat. - stdin ? &cat : nullptr)) + args.data () + (sin ? 3 : 0), // Skip cat. + sin ? &cat : nullptr)) { dr << info << "test command line: "; print_process (dr, args); |