From 221e418f0c56d6b4a8b188fb4d8e75e21f7b0c8d Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Thu, 17 Oct 2019 14:02:42 +0000 Subject: [lit] Make internal diff work in pipelines When using lit's internal shell, RUN lines like the following accidentally execute an external `diff` instead of lit's internal `diff`: ``` # RUN: program | diff file - # RUN: not diff file1 file2 | FileCheck %s ``` Such cases exist now, in `clang/test/Analysis` for example. We are preparing patches to ensure lit's internal `diff` is called in such cases, which will then fail because lit's internal `diff` cannot currently be used in pipelines and doesn't recognize `-` as a command-line option. To enable pipelines, this patch moves lit's `diff` implementation into an out-of-process script, similar to lit's `cat` implementation. A follow-up patch will implement `-` to mean stdin. Reviewed By: probinson, stella.stamenova Differential Revision: https://reviews.llvm.org/D66574 llvm-svn: 375114 --- llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt') diff --git a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt index a6a7eef3f9b..e977c193247 100644 --- a/llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt +++ b/llvm/utils/lit/tests/Inputs/shtest-shell/diff-unified.txt @@ -30,5 +30,9 @@ # RUN: diff -U4 %t.foo %t.bar && false || true # RUN: diff -U0 %t.foo %t.bar && false || true +# Check bad -U argument. +# RUN: diff -U 30.1 %t.foo %t.foo && false || true +# RUN: diff -U-1 %t.foo %t.foo && false || true + # Fail so lit will print output. # RUN: false -- cgit v1.2.3