From b73b3fa491b5d8d9f439ad6a09029e242a9e2c69 Mon Sep 17 00:00:00 2001
From: Shon Feder <shon.feder@gmail.com>
Date: Mon, 31 Aug 2020 17:32:27 -0400
Subject: [PATCH] Use shared backend for compiler flags tests

---
 .../compile-flags.t/dune-file-with-invalid-flag/dune | 12 ------------
 .../test-cases/inline_tests/compile-flags.t/run.t    |  7 ++++---
 .../inline_tests/compile-flags.t/test-project/dune   |  6 ++++++
 .../dune-project                                     |  0
 .../compile-flags.t/test-project/invalid_flags/dune  |  5 +++++
 .../compile-flags.t/test-project/valid_flags/dune    |  5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-invalid-flag/dune
 create mode 100644 test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune
 rename test/blackbox-tests/test-cases/inline_tests/compile-flags.t/{dune-file-with-valid-flag => test-project}/dune-project (100%)
 create mode 100644 test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/invalid_flags/dune
 create mode 100644 test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/valid_flags/dune

diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-invalid-flag/dune b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-invalid-flag/dune
deleted file mode 100644
index 379fe2cba4b5..000000000000
--- a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-invalid-flag/dune
+++ /dev/null
@@ -1,12 +0,0 @@
-(library
- (name backend_foo_bar)
- (modules ())
- (inline_tests.backend
-  (generate_runner
-   (echo "let () = print_endline \"backend_foo_bar\""))))
-
-(library
- (name compile_flags_test_with_invalid_flag)
- (inline_tests
-  (backend backend_foo_bar)
-  (compile_flags -flag-that-is-not-accepted-by-ocaml)))
diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/run.t b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/run.t
index 073b5025f8a1..5d711f79bac1 100644
--- a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/run.t
+++ b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/run.t
@@ -4,13 +4,14 @@ to compile_flags field.
 First, we pass a valid flag to compile_flags field expecting compilation
 to be successful.
 
-  $ dune runtest dune-file-with-valid-flag
-  inline_test_runner_compile_flags_test alias dune-file-with-valid-flag/runtest
+  $ dune runtest valid_flags --root ./test-project
+  Entering directory 'test-project'
+  inline_test_runner_valid_compile_flags_test alias valid_flags/runtest
   backend_foo
 
 Lastly, we pass an invalid flag to compile_flags field expecting compilation
 to fail.
 
-  $ output=$(dune runtest dune-file-with-invalid-flag 2>&1); result=$?; (echo $output | grep -o "unknown option '-flag-that-is-not-accepted-by-ocaml'."); (exit $result)
+  $ output=$(dune runtest invalid_flags --root ./test-project 2>&1); result=$?; (echo $output | grep -o "unknown option '-flag-that-is-not-accepted-by-ocaml'."); (exit $result)
   unknown option '-flag-that-is-not-accepted-by-ocaml'.
   [1]
diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune
new file mode 100644
index 000000000000..3a3748e56ac0
--- /dev/null
+++ b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune
@@ -0,0 +1,6 @@
+(library
+ (name backend_foo)
+ (modules ())
+ (inline_tests.backend
+  (generate_runner
+   (echo "let () = print_endline \"backend_foo\""))))
diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-valid-flag/dune-project b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune-project
similarity index 100%
rename from test/blackbox-tests/test-cases/inline_tests/compile-flags.t/dune-file-with-valid-flag/dune-project
rename to test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/dune-project
diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/invalid_flags/dune b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/invalid_flags/dune
new file mode 100644
index 000000000000..f1bde9bf45d7
--- /dev/null
+++ b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/invalid_flags/dune
@@ -0,0 +1,5 @@
+(library
+ (name invalid_compile_flags_test)
+ (inline_tests
+  (backend backend_foo)
+  (compile_flags -flag-that-is-not-accepted-by-ocaml)))
diff --git a/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/valid_flags/dune b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/valid_flags/dune
new file mode 100644
index 000000000000..11c7df2adbc9
--- /dev/null
+++ b/test/blackbox-tests/test-cases/inline_tests/compile-flags.t/test-project/valid_flags/dune
@@ -0,0 +1,5 @@
+(library
+ (name valid_compile_flags_test)
+ (inline_tests
+  (backend backend_foo)
+  (compile_flags -nolabels)))