From d7c002571882d6691745f60b4f6ef7bd79954efe Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Thu, 12 Dec 2024 09:33:37 -0500 Subject: [PATCH] Move using config dedup test to ProjectImport dir --- .../DedupUsingConfigFrom/0.config | 0 .../DedupUsingConfigFrom/2.config | 0 .../DedupUsingConfigFrom/4.config | 0 .../DedupUsingConfigFrom/6.config | 0 .../DedupUsingConfigFrom/8.config | 0 .../DedupUsingConfigFrom/cabal.out | 0 .../DedupUsingConfigFrom/cabal.test.hs | 0 .../DedupUsingConfigFrom/cfg/1.config | 0 .../DedupUsingConfigFrom/cfg/3.config | 0 .../DedupUsingConfigFrom/cfg/5.config | 0 .../DedupUsingConfigFrom/cfg/7.config | 0 .../DedupUsingConfigFrom/cfg/9.config | 0 .../DedupUsingConfigFrom/no-pkg-1/README.md | 0 .../DedupUsingConfigFrom/no-pkg-3/README.md | 0 .../DedupUsingConfigFrom/no-pkgs.project | 0 .../DedupUsingConfigFrom/with-ghc.config | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/0.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/2.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/4.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/6.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/8.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cabal.out (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cabal.test.hs (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cfg/1.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cfg/3.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cfg/5.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cfg/7.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/cfg/9.config (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/no-pkg-1/README.md (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/no-pkg-3/README.md (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/no-pkgs.project (100%) rename cabal-testsuite/PackageTests/{ConditionalAndImport => ProjectImport}/DedupUsingConfigFrom/with-ghc.config (100%) diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/0.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/0.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/0.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/0.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/2.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/2.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/2.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/2.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/4.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/4.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/4.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/4.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/6.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/6.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/6.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/6.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/8.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/8.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/8.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/8.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cabal.out b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cabal.out similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cabal.out rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cabal.out diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cabal.test.hs b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cabal.test.hs similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cabal.test.hs rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cabal.test.hs diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/1.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/1.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/1.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/1.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/3.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/3.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/3.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/3.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/5.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/5.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/5.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/5.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/7.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/7.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/7.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/7.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/9.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/9.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/cfg/9.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/cfg/9.config diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkg-1/README.md b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkg-1/README.md similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkg-1/README.md rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkg-1/README.md diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkg-3/README.md b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkg-3/README.md similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkg-3/README.md rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkg-3/README.md diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkgs.project b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkgs.project similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/no-pkgs.project rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/no-pkgs.project diff --git a/cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/with-ghc.config b/cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/with-ghc.config similarity index 100% rename from cabal-testsuite/PackageTests/ConditionalAndImport/DedupUsingConfigFrom/with-ghc.config rename to cabal-testsuite/PackageTests/ProjectImport/DedupUsingConfigFrom/with-ghc.config