Fix tests by enabling rule caching and disabling reproducability checks

Signed-off-by: Marek Kubica <[email protected]>
ocaml · Aug 8, 2024 · df9980d · df9980d
1 parent 45ba06f
commit df9980d
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 0 deletions.
diff --git a/test/blackbox-tests/test-cases/directory-targets/cache-file-and-dir.t b/test/blackbox-tests/test-cases/directory-targets/cache-file-and-dir.t
@@ -2,6 +2,7 @@ This checks what happens when a file available in the cache is used in a directo
 
   $ export DUNE_CACHE_ROOT=$PWD/.cache
   $ export DUNE_CACHE=enabled
+  $ export DUNE_CACHE_USER_RULES=enabled
   $ . ./helpers.sh
 
   $ cat > dune-project << EOF

diff --git a/test/blackbox-tests/test-cases/directory-targets/cache-shared-subdir.t b/test/blackbox-tests/test-cases/directory-targets/cache-shared-subdir.t
@@ -1,6 +1,7 @@
 We create 2 directory targets which share a whole subdirectory.
 
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
   $ export DUNE_CACHE=enabled
   $ . ./helpers.sh
 

diff --git a/test/blackbox-tests/test-cases/directory-targets/cache.t b/test/blackbox-tests/test-cases/directory-targets/cache.t
@@ -1,6 +1,7 @@
 We test that directory targets can go in the shared cache. See #8067.
 
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
   $ export DUNE_CACHE=enabled
 
 In project a, we create a rule with a directory target. The script that creates

diff --git a/test/blackbox-tests/test-cases/dune-cache/config.t b/test/blackbox-tests/test-cases/dune-cache/config.t
@@ -26,6 +26,7 @@ Check that old cache configuration format works fine with an old language
 Test that DUNE_CACHE_ROOT can be used to control the cache location
 
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
 
 Build succeeds and the 'copy' mode is respected
 

diff --git a/test/blackbox-tests/test-cases/dune-cache/dedup.t b/test/blackbox-tests/test-cases/dune-cache/dedup.t
@@ -2,6 +2,7 @@ Test deduplication of build artifacts when using Dune cache with hard links.
 
   $ export DUNE_CACHE=enabled
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
 
   $ cat > dune-project <<EOF
   > (lang dune 2.1)

diff --git a/test/blackbox-tests/test-cases/dune-cache/missing-cache-entries.t b/test/blackbox-tests/test-cases/dune-cache/missing-cache-entries.t
@@ -6,6 +6,7 @@ Check that Dune cache can cope with missing file/metadata entries.
   > (lang dune 2.1)
   > (sandboxing_preference none)
   > (cache enabled)
+  > (cache-user-rules enabled)
   > (cache-duplication copy)
   > (cache-transport direct)
   > EOF

diff --git a/test/blackbox-tests/test-cases/dune-cache/mode-copy.t b/test/blackbox-tests/test-cases/dune-cache/mode-copy.t
@@ -9,6 +9,7 @@ variable, and via the [DUNE_CACHE_ROOT] variable. Here we test the former.
   $ cat > config <<EOF
   > (lang dune 3.0)
   > (cache enabled)
+  > (cache-user-rules enabled)
   > (cache-storage-mode copy)
   > EOF
   $ cat > dune-project <<EOF

diff --git a/test/blackbox-tests/test-cases/dune-cache/mode-hardlink.t b/test/blackbox-tests/test-cases/dune-cache/mode-hardlink.t
@@ -9,6 +9,7 @@ variable, and via the [DUNE_CACHE_ROOT] variable. Here we test the former.
   $ cat > config <<EOF
   > (lang dune 2.1)
   > (cache enabled)
+  > (cache-user-rules enabled)
   > EOF
   $ cat > dune-project <<EOF
   > (lang dune 2.1)

diff --git a/test/blackbox-tests/test-cases/dune-cache/repro-check.t b/test/blackbox-tests/test-cases/dune-cache/repro-check.t
@@ -4,6 +4,7 @@ Test reproducibility check
   $ cat > config <<EOF
   > (lang dune 3.0)
   > (cache enabled)
+  > (cache-user-rules enabled)
   > EOF
   $ cat > dune-project <<EOF
   > (lang dune 3.0)

diff --git a/test/blackbox-tests/test-cases/dune-cache/size.t/run.t b/test/blackbox-tests/test-cases/dune-cache/size.t/run.t
@@ -3,6 +3,7 @@ the cache.
 
   $ export DUNE_CACHE=enabled
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
 
   $ cat > config << EOF
   > (lang dune 3.7)

diff --git a/test/blackbox-tests/test-cases/dune-cache/symlink.t b/test/blackbox-tests/test-cases/dune-cache/symlink.t
@@ -3,6 +3,7 @@ produced symbolic links work correctly and are appropriately cached.
 
   $ export DUNE_CACHE=enabled
   $ export DUNE_CACHE_ROOT=$PWD/.cache
+  $ export DUNE_CACHE_USER_RULES=enabled
 
   $ cat > dune-project <<EOF
   > (lang dune 2.1)

diff --git a/test/blackbox-tests/test-cases/dune-cache/trim.t b/test/blackbox-tests/test-cases/dune-cache/trim.t
@@ -1,4 +1,5 @@
   $ export DUNE_CACHE=enabled
+  $ export DUNE_CACHE_USER_RULES=enabled
   $ export XDG_RUNTIME_DIR=$PWD/.xdg-runtime
   $ export XDG_CACHE_HOME=$PWD/.xdg-cache