From 791f4f7c1037b955fffbe7ee7c8abb323b16bbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Fri, 25 Sep 2020 09:47:19 +0200
Subject: [PATCH] [Promote] Separate and move the tests in there own directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: François Bobot <francois.bobot@cea.fr>
---
 .../test-cases/promote/non-existent.t/dune     |  5 +++++
 .../promote/non-existent.t/dune-project        |  1 +
 .../test-cases/promote/non-existent.t/run.t    | 18 ++++++++++++++++++
 .../{promote.t => promote/old-tests.t}/dune    |  4 ----
 .../old-tests.t}/dune-project                  |  0
 .../{promote.t => promote/old-tests.t}/run.t   |  7 +------
 6 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 test/blackbox-tests/test-cases/promote/non-existent.t/dune
 create mode 100644 test/blackbox-tests/test-cases/promote/non-existent.t/dune-project
 create mode 100644 test/blackbox-tests/test-cases/promote/non-existent.t/run.t
 rename test/blackbox-tests/test-cases/{promote.t => promote/old-tests.t}/dune (91%)
 rename test/blackbox-tests/test-cases/{promote.t => promote/old-tests.t}/dune-project (100%)
 rename test/blackbox-tests/test-cases/{promote.t => promote/old-tests.t}/run.t (92%)

diff --git a/test/blackbox-tests/test-cases/promote/non-existent.t/dune b/test/blackbox-tests/test-cases/promote/non-existent.t/dune
new file mode 100644
index 000000000000..cf4a75c9277b
--- /dev/null
+++ b/test/blackbox-tests/test-cases/promote/non-existent.t/dune
@@ -0,0 +1,5 @@
+(rule (with-stdout-to x.gen (echo "toto")))
+
+(rule
+ (alias blah-non-existent)
+ (action (diff x-non-existent x.gen)))
diff --git a/test/blackbox-tests/test-cases/promote/non-existent.t/dune-project b/test/blackbox-tests/test-cases/promote/non-existent.t/dune-project
new file mode 100644
index 000000000000..c2e46604eedb
--- /dev/null
+++ b/test/blackbox-tests/test-cases/promote/non-existent.t/dune-project
@@ -0,0 +1 @@
+(lang dune 2.8)
diff --git a/test/blackbox-tests/test-cases/promote/non-existent.t/run.t b/test/blackbox-tests/test-cases/promote/non-existent.t/run.t
new file mode 100644
index 000000000000..5ca32bf3a416
--- /dev/null
+++ b/test/blackbox-tests/test-cases/promote/non-existent.t/run.t
@@ -0,0 +1,18 @@
+Tests for promoting with non existent reference
+-----------------------------------------------
+# Diffing should do as if it is an empty file
+
+  $ cat x-non-existent
+  cat: x-non-existent: No such file or directory
+  [1]
+
+  $ dune build @blah-non-existent
+  File "x-non-existent", line 1, characters 0-0:
+  Error: Files _build/default/x-non-existent and _build/default/x.gen differ.
+  [1]
+
+  $ dune promote
+  Promoting _build/default/x.gen to x-non-existent.
+
+  $ cat x-non-existent
+  toto
diff --git a/test/blackbox-tests/test-cases/promote.t/dune b/test/blackbox-tests/test-cases/promote/old-tests.t/dune
similarity index 91%
rename from test/blackbox-tests/test-cases/promote.t/dune
rename to test/blackbox-tests/test-cases/promote/old-tests.t/dune
index 16f0878616b6..e31de1394fd6 100644
--- a/test/blackbox-tests/test-cases/promote.t/dune
+++ b/test/blackbox-tests/test-cases/promote/old-tests.t/dune
@@ -4,10 +4,6 @@
  (name blah)
  (action (diff x x.gen)))
 
-(alias
- (name blah-non-existent)
- (action (diff x-non-existent x.gen)))
-
 (rule (with-stdout-to x.gen.copy (cat x.gen)))
 
 (rule (with-stdout-to y.gen (echo "titi")))
diff --git a/test/blackbox-tests/test-cases/promote.t/dune-project b/test/blackbox-tests/test-cases/promote/old-tests.t/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/promote.t/dune-project
rename to test/blackbox-tests/test-cases/promote/old-tests.t/dune-project
diff --git a/test/blackbox-tests/test-cases/promote.t/run.t b/test/blackbox-tests/test-cases/promote/old-tests.t/run.t
similarity index 92%
rename from test/blackbox-tests/test-cases/promote.t/run.t
rename to test/blackbox-tests/test-cases/promote/old-tests.t/run.t
index 3d558fec0fcd..366ebbbd60f0 100644
--- a/test/blackbox-tests/test-cases/promote.t/run.t
+++ b/test/blackbox-tests/test-cases/promote/old-tests.t/run.t
@@ -3,22 +3,17 @@ General tests
 
   $ printf titi > x
 
-  $ dune build @blah @blah-non-existent
+  $ dune build @blah
   File "x", line 1, characters 0-0:
   Error: Files _build/default/x and _build/default/x.gen differ.
-  File "x-non-existent", line 1, characters 0-0:
-  Error: Files _build/default/x-non-existent and _build/default/x.gen differ.
   [1]
   $ cat x
   titi
 
   $ dune promote
   Promoting _build/default/x.gen to x.
-  Promoting _build/default/x.gen to x-non-existent.
   $ cat x
   toto
-  $ cat x-non-existent
-  toto
 
   $ dune build @blah
   $ cat x