Hannes Siebenhandl pushed to branch wip/fendor/ghc-pkg-ospath at Glasgow Haskell Compiler / GHC Commits: 4feb04a7 by Fendor at 2026-02-25T11:38:04+01:00 Add ghc-pkg regression test for LONG PATH - - - - - 2 changed files: - testsuite/tests/cabal/Makefile - testsuite/tests/cabal/all.T Changes: ===================================== testsuite/tests/cabal/Makefile ===================================== @@ -79,6 +79,27 @@ ghcpkg04 : @: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF04) -c ghcpkg04.hs || true +PKGCONF10=local10.package.conf +LOCAL_GHC_PKG10 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF10) + +# Test that importing a module exposed by two packages reports a conflict +ghcpkg10 : + @mkdir asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf + @cd asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf + @mkdir zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv + @cd zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv + @mkdir qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer + @cd qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer + @mkdir uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop + @cd uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop + @rm -rf $(PKGCONF10) + $(LOCAL_GHC_PKG10) init $(PKGCONF10) + $(LOCAL_GHC_PKG10) list + $(LOCAL_GHC_PKG10) register --force test.pkg 2>/dev/null + $(LOCAL_GHC_PKG10) describe testpkg | $(STRIP_PKGROOT) + $(LOCAL_GHC_PKG10) describe testpkg-1.2.3.4 | $(STRIP_PKGROOT) + $(LOCAL_GHC_PKG10) field testpkg-1.2.3.4 import-dirs + # Test stacking of package.confs (also #2441) PKGCONF05a=local05a.package.conf PKGCONF05b=local05b.package.conf ===================================== testsuite/tests/cabal/all.T ===================================== @@ -5,6 +5,7 @@ def ignore_warnings(str): return re.sub(r'Warning:.*\n', '', str) test('ghcpkg01', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, []) +test('ghcpkg10', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, []) # Use ignore_stderr to prevent (when HADDOCK_DOCS=NO): # warning: haddock-interfaces .. doesn't exist or isn't a file View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4feb04a77dbbfb3f713bba6e855b0447... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4feb04a77dbbfb3f713bba6e855b0447... You're receiving this email because of your account on gitlab.haskell.org.