From 992ad3396a49ce1af0a511848acafeef9ebf8bb0 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 14 Jan 2024 14:04:57 -0500 Subject: [PATCH] Patches for project respecting behaviour --- .../Projects-Default-No/cabal.dot-uv.patch | 8 ++++++++ .../Projects-Default-No/cabal.sub-pq.patch | 8 ++++++++ .../Projects-Default-No/cabal.sub-rs.patch | 9 +++++++++ .../Projects-Default-Yes/cabal.dot-uv.patch | 9 +++++++++ .../Projects-Default-Yes/cabal.sub-rs.patch | 10 ++++++++++ 5 files changed, 44 insertions(+) create mode 100644 cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.patch create mode 100644 cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.patch create mode 100644 cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.patch create mode 100644 cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.patch create mode 100644 cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.patch diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.patch b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.patch new file mode 100644 index 00000000000..d16b271c934 --- /dev/null +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.patch @@ -0,0 +1,8 @@ +diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.out +index 3d6859f99..a7ffc109e 100644 +--- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.out ++++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.dot-uv.out +@@ -1,2 +1,2 @@ + # cabal sdist +-Wrote tarball sdist to /cabal.dot-uv.dist/work/./dist/sdist/p-0.1.tar.gz ++Wrote tarball sdist to /cabal.dot-uv.dist/work/./dist/sdist/uv-0.1.tar.gz diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.patch b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.patch new file mode 100644 index 00000000000..a81b0f0099d --- /dev/null +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.patch @@ -0,0 +1,8 @@ +diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.out +index c96d15ee6..12dcc1217 100644 +--- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.out ++++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-pq.out +@@ -1,2 +1,3 @@ + # cabal sdist + Wrote tarball sdist to /cabal.sub-pq.dist/work/./dist/sdist/p-0.1.tar.gz ++Wrote tarball sdist to /cabal.sub-pq.dist/work/./dist/sdist/q-0.1.tar.gz diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.patch b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.patch new file mode 100644 index 00000000000..56dbbae23d5 --- /dev/null +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.patch @@ -0,0 +1,9 @@ +diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.out +index 3a0a8e5f4..b4cced990 100644 +--- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.out ++++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-No/cabal.sub-rs.out +@@ -1,2 +1,3 @@ + # cabal sdist +-Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/p-0.1.tar.gz ++Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/r-0.1.tar.gz ++Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/s-0.1.tar.gz diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.patch b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.patch new file mode 100644 index 00000000000..440c2fabf4c --- /dev/null +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.patch @@ -0,0 +1,9 @@ +diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.out +index 231e0d306..a7ffc109e 100644 +--- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.out ++++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.dot-uv.out +@@ -1,3 +1,2 @@ + # cabal sdist +-Wrote tarball sdist to /cabal.dot-uv.dist/work/./dist/sdist/p-0.1.tar.gz +-Wrote tarball sdist to /cabal.dot-uv.dist/work/./dist/sdist/q-0.1.tar.gz ++Wrote tarball sdist to /cabal.dot-uv.dist/work/./dist/sdist/uv-0.1.tar.gz diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.patch b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.patch new file mode 100644 index 00000000000..de09911d55a --- /dev/null +++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.patch @@ -0,0 +1,10 @@ +diff --git a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.out b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.out +index 264d9e001..b4cced990 100644 +--- a/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.out ++++ b/cabal-testsuite/PackageTests/SDist/Respect-Project-File/Projects-Default-Yes/cabal.sub-rs.out +@@ -1,3 +1,3 @@ + # cabal sdist +-Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/p-0.1.tar.gz +-Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/q-0.1.tar.gz ++Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/r-0.1.tar.gz ++Wrote tarball sdist to /cabal.sub-rs.dist/work/./dist/sdist/s-0.1.tar.gz