Ticket #5977: 5977-tests.patch

File 5977-tests.patch, 21.8 KB (added by pcapriotti, 3 years ago)
  • driver/testlib.py

    From 517db7a98a67ee692a2fc42dd9a1fd8a94fc7909 Mon Sep 17 00:00:00 2001
    From: Paolo Capriotti <[email protected]>
    Date: Fri, 4 May 2012 13:05:01 +0100
    Subject: [PATCH] Rename package-conf flags to package-db.
    
    ---
     driver/testlib.py                       |    4 +-
     mk/test.mk                              |    2 +-
     tests/cabal/Makefile                    |   34 +++++++++++++++---------------
     tests/codeGen/should_compile/jmp_tbl.hs |    2 +-
     tests/driver/T3007/Makefile             |    4 +-
     tests/driver/recomp007/Makefile         |    2 +-
     tests/ghci/linking/Makefile             |   15 ++++++-------
     tests/plugins/Makefile                  |    2 +-
     tests/plugins/all.T                     |    4 +-
     tests/rename/prog006/Makefile           |    6 ++--
     tests/safeHaskell/check/pkg01/Makefile  |    2 +-
     tests/safeHaskell/check/pkg01/all.T     |    8 +++---
     tests/typecheck/bug1465/Makefile        |    6 ++--
     13 files changed, 45 insertions(+), 46 deletions(-)
    
    diff --git a/driver/testlib.py b/driver/testlib.py
    index cf3c6cb..9f6d018 100644
    a b def _reqlib( opts, lib ): 
    9797        if have_subprocess:
    9898            # By preference we use subprocess, as the alternative uses
    9999            # /dev/null which mingw doesn't have.
    100             p = subprocess.Popen([config.ghc_pkg, '--no-user-package-conf', 'describe', lib],
     100            p = subprocess.Popen([config.ghc_pkg, '--no-user-package-db', 'describe', lib],
    101101                                 stdout=subprocess.PIPE,
    102102                                 stderr=subprocess.PIPE)
    103103            # read from stdout and stderr to avoid blocking due to
    def if_verbose_dump( n, f ): 
    16721672# Guess flags suitable for the compiler.
    16731673def guess_compiler_flags():
    16741674   if config.compiler_type == 'ghc':
    1675        return ['-fforce-recomp', '-dcore-lint', '-no-user-package-conf']
     1675       return ['-fforce-recomp', '-dcore-lint', '-no-user-package-db']
    16761676   elif config.compiler_type == 'nhc':
    16771677       return ['-an-nhc-specific-flag']
    16781678   else:
  • mk/test.mk

    diff --git a/mk/test.mk b/mk/test.mk
    index e6873cb..982cdd0 100644
    a b CONFIG = $(CONFIGDIR)/$(COMPILER) 
    2727
    2828# TEST_HC_OPTS is passed to every invocation of TEST_HC
    2929# in nested Makefiles
    30 TEST_HC_OPTS = -fforce-recomp -dcore-lint -dcmm-lint -dno-debug-output -no-user-package-conf -rtsopts $(EXTRA_HC_OPTS)
     30TEST_HC_OPTS = -fforce-recomp -dcore-lint -dcmm-lint -dno-debug-output -no-user-package-db -rtsopts $(EXTRA_HC_OPTS)
    3131
    3232RUNTEST_OPTS =
    3333
  • tests/cabal/Makefile

    diff --git a/tests/cabal/Makefile b/tests/cabal/Makefile
    index 25642ff..769a50d 100644
    a b include $(TOP)/mk/boilerplate.mk 
    33include $(TOP)/mk/test.mk
    44
    55PKGCONF01=local01.package.conf
    6 LOCAL_GHC_PKG01 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF01)
     6LOCAL_GHC_PKG01 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF01)
    77
    88STRIP_PKGROOT=sed 's/^pkgroot: .*$$/pkgroot: /'
    99
    ghcpkg01 : 
    4949        if $(LOCAL_GHC_PKG01) register test3.pkg; then false; else true; fi
    5050
    5151PKGCONF03=local03.package.conf
    52 LOCAL_GHC_PKG03 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF03)
     52LOCAL_GHC_PKG03 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF03)
    5353
    5454ghcpkg03 :
    5555        @rm -rf $(PKGCONF03)
    ghcpkg03 : 
    6767        $(LOCAL_GHC_PKG03) update --force test.pkg
    6868
    6969PKGCONF04=local04.package.conf
    70 LOCAL_GHC_PKG04 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF04)
     70LOCAL_GHC_PKG04 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF04)
    7171
    7272# Test that importing a module exposed by two packages reports a conflict
    7373ghcpkg04 :
    ghcpkg04 : 
    7777        $(LOCAL_GHC_PKG04) update --force test5.pkg >/dev/null 2>&1
    7878        $(LOCAL_GHC_PKG04) expose testpkg-1.2.3.4  >/dev/null 2>&1
    7979        @: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
    80         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF04) -c ghcpkg04.hs || true
     80        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF04) -c ghcpkg04.hs || true
    8181
    8282# Test stacking of package.confs (also #2441)
    8383PKGCONF05a=local05a.package.conf
    8484PKGCONF05b=local05b.package.conf
    85 LOCAL_GHC_PKG05a = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a)
    86 LOCAL_GHC_PKG05b = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a) -f $(PKGCONF05b)
     85LOCAL_GHC_PKG05a = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF05a)
     86LOCAL_GHC_PKG05b = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF05a) -f $(PKGCONF05b)
    8787
    8888ghcpkg05 :
    8989        rm -rf $(PKGCONF05a) $(PKGCONF05b)
    ghcpkg05 : 
    101101
    102102# Test for #2330: reject duplicate dependencies
    103103PKGCONF06=local06.package.conf
    104 LOCAL_GHC_PKG06 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF06)
     104LOCAL_GHC_PKG06 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF06)
    105105
    106106ghcpkg06 :
    107107        rm -rf $(PKGCONF06)
    ghcpkg06 : 
    111111        $(LOCAL_GHC_PKG06) register --force testdup.pkg
    112112
    113113PKGCONF1750=local1750.package.conf
    114 LOCAL_GHC_PKG1750 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF1750)
     114LOCAL_GHC_PKG1750 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONF1750)
    115115
    1161161750:
    117117        rm -rf $(PKGCONF1750) 1750.hs 1750.o 1750.hi 1750.out
    118118        $(LOCAL_GHC_PKG1750) init $(PKGCONF1750)
    119119        $(LOCAL_GHC_PKG1750) register --force 1750A.pkg >1750.out 2>&1
    120120        $(LOCAL_GHC_PKG1750) register --force 1750B.pkg >1750.out 2>&1
    121         GHC_PACKAGE_PATH=$(PKGCONF1750) '$(GHC_PKG)' --no-user-package-conf list
     121        GHC_PACKAGE_PATH=$(PKGCONF1750) '$(GHC_PKG)' --no-user-package-db list
    122122# GHC_PACKAGE_PATH trick is to make this work with 6.8.2 which doesn't have
    123123# the patch "Change the command-line semantics for query commands" to
    124124# ghc-pkg
    125125        echo "main = return ()" >1750.hs
    126         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF1750) -package 1750A 1750.hs || true
     126        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF1750) -package 1750A 1750.hs || true
    127127
    128128PKGCONFSHADOW1=localshadow1.package.conf
    129129PKGCONFSHADOW2=localshadow2.package.conf
    130 LOCAL_GHC_PKGSHADOW1 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1)
    131 LOCAL_GHC_PKGSHADOW2 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW2)
    132 LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2)
     130LOCAL_GHC_PKGSHADOW1 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1)
     131LOCAL_GHC_PKGSHADOW2 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW2)
     132LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2)
    133133
    134134# Test package shadowing behaviour.
    135135#
    shadow: 
    152152# shadowdep-1-XXX to be unavailable:
    153153#
    154154        @echo "should FAIL:"
    155         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code || true
     155        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW1) -package-db $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code || true
    156156#
    157157# Reversing the order of the package.conf files should fix the problem:
    158158#
    159159        @echo "should SUCCEED:"
    160         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW2) -package-conf $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code || true
     160        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW2) -package-db $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code || true
    161161#
    162162# We can also fix the problem by using an explicit -package-id flag to
    163163# specify a package we really want to use:
    164164#
    165165        @echo "should SUCCEED:"
    166         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package-id shadowdep-1-XXX -c shadow.hs -fno-code
     166        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFSHADOW1) -package-db $(PKGCONFSHADOW2) -package-id shadowdep-1-XXX -c shadow.hs -fno-code
    167167
    168168
    169169# -----------------------------------------------------------------------------
    shadow: 
    172172# of InstalledPackageInfo.
    173173
    174174PACKAGE_CONF_ghcpkg02 = package.conf.ghcpkg02
    175 GHC_PKG_ghcpkg02 = '$(GHC_PKG)' --no-user-package-conf --global-conf=$(PACKAGE_CONF_ghcpkg02)
     175GHC_PKG_ghcpkg02 = '$(GHC_PKG)' --no-user-package-db --global-package-db=$(PACKAGE_CONF_ghcpkg02)
    176176
    177177ghcpkg02:
    178178        rm -rf $(PACKAGE_CONF_ghcpkg02)
  • tests/codeGen/should_compile/jmp_tbl.hs

    diff --git a/tests/codeGen/should_compile/jmp_tbl.hs b/tests/codeGen/should_compile/jmp_tbl.hs
    index 56904ed..673efc8 100644
    a b  
    44This funny module was reduced from a failing build of stage2 using
    55the new code generator and the linear register allocator, with this bug:
    66
    7 "inplace/bin/ghc-stage1" -fPIC -dynamic  -H32m -O -Wall -H64m -O0    -package-name ghc-7.1.20110414 -hide-all-packages -i -icompiler/basicTypes -icompiler/cmm -icompiler/codeGen -icompiler/coreSyn -icompiler/deSugar -icompiler/ghci -icompiler/hsSyn -icompiler/iface -icompiler/llvmGen -icompiler/main -icompiler/nativeGen -icompiler/parser -icompiler/prelude -icompiler/profiling -icompiler/rename -icompiler/simplCore -icompiler/simplStg -icompiler/specialise -icompiler/stgSyn -icompiler/stranal -icompiler/typecheck -icompiler/types -icompiler/utils -icompiler/vectorise -icompiler/stage2/build -icompiler/stage2/build/autogen -Icompiler/stage2/build -Icompiler/stage2/build/autogen -Icompiler/../libffi/build/include -Icompiler/stage2 -Icompiler/../libraries/base/cbits -Icompiler/../libraries/base/include -Icompiler/. -Icompiler/parser -Icompiler/utils   -optP-DGHCI -optP-include -optPcompiler/stage2/build/autogen/cabal_macros.h -package Cabal-1.11.0 -package array-0.3.0.2 -package base-4.3.1.0 -package bin-package-db-0.0.0.0 -package bytestring-0.9.1.10 -package containers-0.4.0.0 -package directory-1.1.0.0 -package filepath-1.2.0.0 -package hoopl-3.8.7.0 -package hpc-0.5.0.6 -package old-time-1.0.0.6 -package process-1.0.1.4 -package template-haskell-2.5.0.0 -package unix-2.4.1.0  -Wall -fno-warn-name-shadowing -fno-warn-orphans -XHaskell98 -XNondecreasingIndentation -XCPP -XMagicHash -XUnboxedTuples -XPatternGuards -XForeignFunctionInterface -XEmptyDataDecls -XTypeSynonymInstances -XMultiParamTypeClasses -XFlexibleInstances -XRank2Types -XScopedTypeVariables -XDeriveDataTypeable -DGHCI_TABLES_NEXT_TO_CODE -DSTAGE=2 -O2 -O -DGHC_DEFAULT_NEW_CODEGEN -no-user-package-conf -rtsopts     -odir compiler/stage2/build -hidir compiler/stage2/build -stubdir compiler/stage2/build -hisuf dyn_hi -osuf  dyn_o -hcsuf dyn_hc -c compiler/main/DriverPipeline.hs -o compiler/stage2/build/DriverPipeline.dyn_o  -fforce-recomp -dno-debug-output -fno-warn-unused-binds
     7"inplace/bin/ghc-stage1" -fPIC -dynamic  -H32m -O -Wall -H64m -O0    -package-name ghc-7.1.20110414 -hide-all-packages -i -icompiler/basicTypes -icompiler/cmm -icompiler/codeGen -icompiler/coreSyn -icompiler/deSugar -icompiler/ghci -icompiler/hsSyn -icompiler/iface -icompiler/llvmGen -icompiler/main -icompiler/nativeGen -icompiler/parser -icompiler/prelude -icompiler/profiling -icompiler/rename -icompiler/simplCore -icompiler/simplStg -icompiler/specialise -icompiler/stgSyn -icompiler/stranal -icompiler/typecheck -icompiler/types -icompiler/utils -icompiler/vectorise -icompiler/stage2/build -icompiler/stage2/build/autogen -Icompiler/stage2/build -Icompiler/stage2/build/autogen -Icompiler/../libffi/build/include -Icompiler/stage2 -Icompiler/../libraries/base/cbits -Icompiler/../libraries/base/include -Icompiler/. -Icompiler/parser -Icompiler/utils   -optP-DGHCI -optP-include -optPcompiler/stage2/build/autogen/cabal_macros.h -package Cabal-1.11.0 -package array-0.3.0.2 -package base-4.3.1.0 -package bin-package-db-0.0.0.0 -package bytestring-0.9.1.10 -package containers-0.4.0.0 -package directory-1.1.0.0 -package filepath-1.2.0.0 -package hoopl-3.8.7.0 -package hpc-0.5.0.6 -package old-time-1.0.0.6 -package process-1.0.1.4 -package template-haskell-2.5.0.0 -package unix-2.4.1.0  -Wall -fno-warn-name-shadowing -fno-warn-orphans -XHaskell98 -XNondecreasingIndentation -XCPP -XMagicHash -XUnboxedTuples -XPatternGuards -XForeignFunctionInterface -XEmptyDataDecls -XTypeSynonymInstances -XMultiParamTypeClasses -XFlexibleInstances -XRank2Types -XScopedTypeVariables -XDeriveDataTypeable -DGHCI_TABLES_NEXT_TO_CODE -DSTAGE=2 -O2 -O -DGHC_DEFAULT_NEW_CODEGEN -no-user-package-db -rtsopts     -odir compiler/stage2/build -hidir compiler/stage2/build -stubdir compiler/stage2/build -hisuf dyn_hi -osuf  dyn_o -hcsuf dyn_hc -c compiler/main/DriverPipeline.hs -o compiler/stage2/build/DriverPipeline.dyn_o  -fforce-recomp -dno-debug-output -fno-warn-unused-binds
    88
    99ghc-stage1: panic! (the 'impossible' happened)
    1010  (GHC version 7.1.20110414 for x86_64-unknown-linux):
  • tests/driver/T3007/Makefile

    diff --git a/tests/driver/T3007/Makefile b/tests/driver/T3007/Makefile
    index 8c81bff..7161225 100644
    a b T3007: 
    1212        $(MAKE) clean
    1313        echo '[]' > package.conf
    1414        cd A && '$(TEST_HC)' -v0 --make Setup
    15         cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
     15        cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-option=-package-db../package.conf
    1616        cd A && ./Setup build -v0
    1717        cd A && ./Setup register --inplace -v0
    1818        cd B && '$(TEST_HC)' -v0 --make Setup
    19         cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
     19        cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-package-db=../package.conf --ghc-option=-package-db../package.conf
    2020        cd B && ./Setup build -v0
    2121
  • tests/driver/recomp007/Makefile

    diff --git a/tests/driver/recomp007/Makefile b/tests/driver/recomp007/Makefile
    index 94d46e8..18ac7bd 100644
    a b recomp007: 
    1717        "$(TEST_HC)" -v0 --make Setup.hs
    1818        $(MAKE) prep.a1
    1919        $(MAKE) prep.b
    20         "$(GHC_PKG)" unregister --package-conf=$(LOCAL_PKGCONF) a-1.0
     20        "$(GHC_PKG)" unregister --package-db=$(LOCAL_PKGCONF) a-1.0
    2121        $(MAKE) prep.a2
    2222        cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
    2323        cd b && ../Setup build
  • tests/ghci/linking/Makefile

    diff --git a/tests/ghci/linking/Makefile b/tests/ghci/linking/Makefile
    index fe34e63..a4e719e 100644
    a b TOP=../../.. 
    22include $(TOP)/mk/boilerplate.mk
    33include $(TOP)/mk/test.mk
    44
    5 LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF)
     5LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF)
    66
    77# Test 1: ghci -Ldir -lfoo
    88#   with dir/libfoo.a
    ghcilink004 : 
    6363        echo 'library-dirs: $${pkgroot}' >>$(PKG004)
    6464        echo 'extra-libraries: foo' >>$(PKG004)
    6565        echo '[]' >$(LOCAL_PKGCONF004)
    66         '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF004) register $(PKG004) -v0
     66        '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF004) register $(PKG004) -v0
    6767        #
    6868        "$(TEST_HC)" -c f.c -o dir004/foo.o
    6969        "$(AR)" cqs dir004/libfoo.a dir004/foo.o
    70         echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-conf $(LOCAL_PKGCONF004) -package test TestLink.hs
    71 
     70        echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF004) -package test TestLink.hs
    7271
    7372# Test 5:
    7473#   package P
    ghcilink005 : 
    9190        echo 'library-dirs: $${pkgroot}' >>$(PKG005)
    9291        echo 'extra-libraries: foo' >>$(PKG005)
    9392        echo '[]' >$(LOCAL_PKGCONF005)
    94         '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF005) register $(PKG005) -v0
     93        '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF005) register $(PKG005) -v0
    9594        #
    9695        "$(TEST_HC)" -c -dynamic f.c -o dir005/foo.o
    9796        "$(TEST_HC)" -shared -o dir005/$(call DLL,foo) dir005/foo.o
    98         echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-conf $(LOCAL_PKGCONF005) -package test TestLink.hs
     97        echo "test" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF005) -package test TestLink.hs
    9998
    10099# Test 6:
    101100#   package P
    ghcilink006 : 
    114113        echo "id: test-XXX" >>$(PKG006)
    115114        echo "extra-libraries: stdc++" >>$(PKG006)
    116115        echo "[]" >$(LOCAL_PKGCONF006)
    117         '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF006) register $(PKG006) -v0
     116        '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF006) register $(PKG006) -v0
    118117        #
    119         echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-conf $(LOCAL_PKGCONF006) -package test
     118        echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF006) -package test
    120119
  • tests/plugins/Makefile

    diff --git a/tests/plugins/Makefile b/tests/plugins/Makefile
    index 7506f93..79b1217 100644
    a b plugins01: 
    1313        # Suggestions to make this better gratefully recieved.
    1414        (cd simple-plugin; make package)
    1515        $(RM) plugins01.hi plugins01.o
    16         "$(TEST_HC)" $(HC_OPTS) --make -v0 plugins01.hs -package-conf simple-plugin/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
     16        "$(TEST_HC)" $(HC_OPTS) --make -v0 plugins01.hs -package-db simple-plugin/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
    1717        ./plugins01
    1818
    1919clean:
  • tests/plugins/all.T

    diff --git a/tests/plugins/all.T b/tests/plugins/all.T
    index 2929a0a..ccbe011 100644
    a b setTestOpts(f) 
    66setTestOpts(compose(alone, if_compiler_lt('ghc', '7.1', skip)))
    77
    88test('plugins01', normal, run_command, ['$MAKE -s --no-print-directory plugins01'])
    9 test('plugins02', normal, compile_fail, ['-package-conf simple-plugin/local.package.conf -fplugin Simple.BadlyTypedPlugin -package simple-plugin'])
    10 test('plugins03', normal, compile_fail, ['-package-conf simple-plugin/local.package.conf -fplugin Simple.NonExistantPlugin -package simple-plugin'])
     9test('plugins02', normal, compile_fail, ['-package-db simple-plugin/local.package.conf -fplugin Simple.BadlyTypedPlugin -package simple-plugin'])
     10test('plugins03', normal, compile_fail, ['-package-db simple-plugin/local.package.conf -fplugin Simple.NonExistantPlugin -package simple-plugin'])
    1111
    1212test('plugins04', extra_clean(['HomePackagePlugin.hi', 'HomePackagePlugin.o']), multimod_compile_fail, ['plugins04', '-package ghc -fplugin HomePackagePlugin'])
    1313test('plugins05',
  • tests/rename/prog006/Makefile

    diff --git a/tests/rename/prog006/Makefile b/tests/rename/prog006/Makefile
    index 1e643fd..0e0a60b 100644
    a b include $(TOP)/mk/test.mk 
    1616# using the supplied Cabal configuration.
    1717
    1818LOCAL_PKGCONF=local.package.conf
    19 LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF)
     19LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF)
    2020
    2121rn.prog006:
    2222        rm -f A.hi A.o B/C.hi B/C.o Main.hi Main.o pkg.conf
    rn.prog006: 
    3131        echo "exposed-modules: B.C" >>pkg.conf
    3232        echo "[]" >$(LOCAL_PKGCONF)
    3333        $(LOCAL_GHC_PKG) register pkg.conf -v0
    34         '$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i
     34        '$(TEST_HC)' $(TEST_HC_OPTS) -c -package-db $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i
    3535# The -i clears the search path, so A.hs will find B.C from package test
    36         -'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs
     36        -'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-db $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs
    3737# No -i when compiling Main, so a from-scratch search would find a home-pkg module B.C
    3838# However, A.hi remembers that B.C came from package test, so all is ok.
    3939
  • tests/safeHaskell/check/pkg01/Makefile

    diff --git a/tests/safeHaskell/check/pkg01/Makefile b/tests/safeHaskell/check/pkg01/Makefile
    index 3f3dea6..858f18c 100644
    a b PREFIX := $(abspath install) 
    1818$(eval $(call canonicalise,PREFIX))
    1919
    2020PKGCONF = local.db
    21 LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)'
     21LGHC_PKG = '$(GHC_PKG)' --no-user-package-db -f '$(PKGCONF)'
    2222
    2323safePkg01:
    2424        '$(MAKE)' cleanSafePkg01
  • tests/safeHaskell/check/pkg01/all.T

    diff --git a/tests/safeHaskell/check/pkg01/all.T b/tests/safeHaskell/check/pkg01/all.T
    index aff23eb..f4afd3c 100644
    a b test('ImpSafe01', normal, compile_fail, ['-fpackage-trust -distrust base']) 
    2424# Succeed since we don't enable package trust
    2525test('ImpSafe02', normal, compile, ['-distrust base'])
    2626
    27 test('ImpSafeOnly01', [normal, alone], compile, ['-package-conf local.db -trust base'])
     27test('ImpSafeOnly01', [normal, alone], compile, ['-package-db local.db -trust base'])
    2828
    29 test('ImpSafeOnly02', [normal, alone], compile, ['-package-conf local.db -trust base -trust safePkg01'])
     29test('ImpSafeOnly02', [normal, alone], compile, ['-package-db local.db -trust base -trust safePkg01'])
    3030
    3131# Fail since we enable package trust
    32 test('ImpSafeOnly03', [normal, alone], compile_fail, ['-fpackage-trust -package-conf local.db -trust base'])
     32test('ImpSafeOnly03', [normal, alone], compile_fail, ['-fpackage-trust -package-db local.db -trust base'])
    3333
    3434# Succeed since we don't enable package trust
    35 test('ImpSafeOnly04', [normal, alone], compile, ['-package-conf local.db -trust base'])
     35test('ImpSafeOnly04', [normal, alone], compile, ['-package-db local.db -trust base'])
    3636
  • tests/typecheck/bug1465/Makefile

    diff --git a/tests/typecheck/bug1465/Makefile b/tests/typecheck/bug1465/Makefile
    index 965b21e..849bd73 100644
    a b clean: 
    1616bug1465:
    1717        $(MAKE) clean
    1818        $(MAKE) prep
    19         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c C.hs || exit 0
     19        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c C.hs || exit 0
    2020        $(MAKE) clean
    2121
    2222prep:
    2323        echo "[]" >$(LOCAL_PKGCONF)
    2424        $(MAKE) prep.v1
    2525        $(MAKE) prep.v2
    26         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-1.0 B1.hs
    27         '$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs
     26        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c -package $(PKG)-1.0 B1.hs
     27        '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs
    2828
    2929prep.%:
    3030        cd $* && '$(TEST_HC)' -v0 --make -o setup Setup.hs