From f090e49be44ca8d373e895a05ab544a394d5a2c1 Mon Sep 17 00:00:00 2001
From: Roman Lebedev <lebedev.ri@gmail.com>
Date: Mon, 22 Mar 2021 13:14:29 +0300
Subject: [PATCH] [NFC][lit] Add a test showing that timing data for tests not
 executed is lost

I.e. when you first run lit on a directory, and then on a single test,
the timing knowledge about anything else other than that single test
is lost. This isn't right.
---
 .../tests/Inputs/reorder/.lit_test_times.txt    |  1 +
 utils/lit/tests/Inputs/reorder/new-test.txt     |  1 +
 utils/lit/tests/reorder.py                      | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 utils/lit/tests/Inputs/reorder/new-test.txt

diff --git a/utils/lit/tests/Inputs/reorder/.lit_test_times.txt b/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
index 00aecc968ed..73d55debc60 100644
--- a/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
+++ b/utils/lit/tests/Inputs/reorder/.lit_test_times.txt
@@ -1,3 +1,4 @@
+42.0 not-executed.txt
 3.0 subdir/ccc.txt
 2.0 bbb.txt
 0.1 aaa.txt
diff --git a/utils/lit/tests/Inputs/reorder/new-test.txt b/utils/lit/tests/Inputs/reorder/new-test.txt
new file mode 100644
index 00000000000..b80b60b7a27
--- /dev/null
+++ b/utils/lit/tests/Inputs/reorder/new-test.txt
@@ -0,0 +1 @@
+# RUN: true
diff --git a/utils/lit/tests/reorder.py b/utils/lit/tests/reorder.py
index 8e5ecda2221..d787112b18f 100644
--- a/utils/lit/tests/reorder.py
+++ b/utils/lit/tests/reorder.py
@@ -1,13 +1,22 @@
 ## Check that we can reorder test runs.
 
 # RUN: cp %{inputs}/reorder/.lit_test_times.txt %{inputs}/reorder/.lit_test_times.txt.orig
-# RUN: %{lit} -j1 %{inputs}/reorder | FileCheck %s
-# RUN: not diff %{inputs}/reorder/.lit_test_times.txt %{inputs}/reorder/.lit_test_times.txt.orig
+# RUN: %{lit} -j1 %{inputs}/reorder > %t.out
+# RUN: cp %{inputs}/reorder/.lit_test_times.txt %{inputs}/reorder/.lit_test_times.txt.new
 # RUN: cp %{inputs}/reorder/.lit_test_times.txt.orig %{inputs}/reorder/.lit_test_times.txt
+# RUN: not diff %{inputs}/reorder/.lit_test_times.txt.new %{inputs}/reorder/.lit_test_times.txt.orig
+# RUN: FileCheck --check-prefix=TIMES --implicit-check-not=not-executed.txt < %{inputs}/reorder/.lit_test_times.txt.new %s
+# RUN: FileCheck < %t.out %s
 # END.
 
-# CHECK:     -- Testing: 3 tests, 1 workers --
+# TIMES: subdir/ccc.txt
+# TIMES-NEXT: bbb.txt
+# TIMES-NEXT: aaa.txt
+# TIMES-NEXT: new-test.txt
+
+# CHECK:     -- Testing: 4 tests, 1 workers --
 # CHECK-NEXT: PASS: reorder :: subdir/ccc.txt
 # CHECK-NEXT: PASS: reorder :: bbb.txt
 # CHECK-NEXT: PASS: reorder :: aaa.txt
-# CHECK:     Passed: 3
+# CHECK-NEXT: PASS: reorder :: new-test.txt
+# CHECK:     Passed: 4