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
2 changed files:
Changes:
| ... | ... | @@ -79,6 +79,27 @@ ghcpkg04 : |
| 79 | 79 | @: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
|
| 80 | 80 | '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF04) -c ghcpkg04.hs || true
|
| 81 | 81 | |
| 82 | +PKGCONF10=local10.package.conf
|
|
| 83 | +LOCAL_GHC_PKG10 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF10)
|
|
| 84 | + |
|
| 85 | +# Test that importing a module exposed by two packages reports a conflict
|
|
| 86 | +ghcpkg10 :
|
|
| 87 | + @mkdir asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf
|
|
| 88 | + @cd asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf
|
|
| 89 | + @mkdir zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv
|
|
| 90 | + @cd zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv
|
|
| 91 | + @mkdir qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer
|
|
| 92 | + @cd qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer
|
|
| 93 | + @mkdir uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop
|
|
| 94 | + @cd uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop
|
|
| 95 | + @rm -rf $(PKGCONF10)
|
|
| 96 | + $(LOCAL_GHC_PKG10) init $(PKGCONF10)
|
|
| 97 | + $(LOCAL_GHC_PKG10) list
|
|
| 98 | + $(LOCAL_GHC_PKG10) register --force test.pkg 2>/dev/null
|
|
| 99 | + $(LOCAL_GHC_PKG10) describe testpkg | $(STRIP_PKGROOT)
|
|
| 100 | + $(LOCAL_GHC_PKG10) describe testpkg-1.2.3.4 | $(STRIP_PKGROOT)
|
|
| 101 | + $(LOCAL_GHC_PKG10) field testpkg-1.2.3.4 import-dirs
|
|
| 102 | + |
|
| 82 | 103 | # Test stacking of package.confs (also #2441)
|
| 83 | 104 | PKGCONF05a=local05a.package.conf
|
| 84 | 105 | PKGCONF05b=local05b.package.conf
|
| ... | ... | @@ -5,6 +5,7 @@ def ignore_warnings(str): |
| 5 | 5 | return re.sub(r'Warning:.*\n', '', str)
|
| 6 | 6 | |
| 7 | 7 | test('ghcpkg01', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, [])
|
| 8 | +test('ghcpkg10', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, [])
|
|
| 8 | 9 | |
| 9 | 10 | # Use ignore_stderr to prevent (when HADDOCK_DOCS=NO):
|
| 10 | 11 | # warning: haddock-interfaces .. doesn't exist or isn't a file
|