From 5122d532bb98ebeead420d3e0d4eff2c3cee5dc6 Mon Sep 17 00:00:00 2001 From: Amir Mohammad Saied <amirsaied@gmail.com> Date: Sun, 16 Jul 2017 11:25:50 +0100 Subject: [PATCH] Update fixtures for default optimization level --- .../PackageTests/BuildDeps/InternalLibrary1/cabal.out | 2 +- .../UseLocalPackage/use-local-version-of-package.out | 2 +- cabal-testsuite/PackageTests/BuildToolDepends/setup.out | 2 +- cabal-testsuite/PackageTests/BuildTools/External/cabal.out | 2 +- cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out | 2 +- cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out | 2 +- .../PackageTests/CustomWithoutCabalDefaultMain/cabal.out | 2 +- cabal-testsuite/PackageTests/Exec/cabal.out | 2 +- cabal-testsuite/PackageTests/ExecModern/cabal.out | 2 +- cabal-testsuite/PackageTests/InternalLibraries/cabal.out | 2 +- .../PackageTests/NewBuild/MonitorCabalFiles/cabal.out | 4 ++-- cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out | 2 +- cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out | 2 +- cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out | 2 +- .../NewConfigure/LocalConfigOverwrite/cabal.out | 2 +- cabal-testsuite/PackageTests/Regression/T3436/cabal.out | 2 +- .../Regression/T4154/install-time-with-constraint.out | 2 +- cabal-testsuite/PackageTests/Regression/T4202/cabal.out | 6 +++--- .../PackageTests/TestSuiteTests/ExeV10/cabal.out | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out index 1a390a98be..ea250859fd 100644 --- a/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out +++ b/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - InternalLibrary1-0.1 (exe:lemon) (first run) Configuring InternalLibrary1-0.1... diff --git a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out index 808fb52eb1..7e5b855987 100644 --- a/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out +++ b/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out @@ -2,7 +2,7 @@ Downloading the latest package list from test-local-repo # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - pkg-1.0 (exe:my-exe) (first run) Configuring pkg-1.0... diff --git a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out index 57493f50d6..06c2569b50 100644 --- a/cabal-testsuite/PackageTests/BuildToolDepends/setup.out +++ b/cabal-testsuite/PackageTests/BuildToolDepends/setup.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - pre-proc-999.999.999 (exe:zero-to-one) (first run) - client-0.1.0.0 (exe:hello-world) (first run) diff --git a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out index 9eab0ac040..a5f63dfc3d 100644 --- a/cabal-testsuite/PackageTests/BuildTools/External/cabal.out +++ b/cabal-testsuite/PackageTests/BuildTools/External/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - happy-999.999.999 (exe:happy) (first run) - client-0.1.0.0 (exe:hello-world) (first run) diff --git a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out index 37de994b1f..98472f0fc7 100644 --- a/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out +++ b/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - foo-0.1.0.0 (exe:my-cpp) (first run) - foo-0.1.0.0 (lib) (first run) diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out index 534f8f60cf..e89cb50a8e 100644 --- a/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out +++ b/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Warning: <ROOT>/custom-setup-without-cabal.cabal: This package requires at least Cabal version 99999 Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - custom-setup-without-cabal-1.0 (lib:custom-setup-without-cabal) (first run) diff --git a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out index 485f8a076e..f2bdafb5af 100644 --- a/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out +++ b/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out @@ -1,5 +1,5 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - custom-setup-without-cabal-defaultMain-1.0 (lib:custom-setup-without-cabal-defaultMain) (first run) diff --git a/cabal-testsuite/PackageTests/Exec/cabal.out b/cabal-testsuite/PackageTests/Exec/cabal.out index 5dcd67280f..d97b711ea6 100644 --- a/cabal-testsuite/PackageTests/Exec/cabal.out +++ b/cabal-testsuite/PackageTests/Exec/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - my-0.1 (exe:my-executable) (first run) Configuring my-0.1... diff --git a/cabal-testsuite/PackageTests/ExecModern/cabal.out b/cabal-testsuite/PackageTests/ExecModern/cabal.out index 97ddcc4a38..da01911bbb 100644 --- a/cabal-testsuite/PackageTests/ExecModern/cabal.out +++ b/cabal-testsuite/PackageTests/ExecModern/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - my-0.1 (exe:my-executable) (first run) Configuring executable 'my-executable' for my-0.1.. diff --git a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out index 4184d77d82..8017e6948a 100644 --- a/cabal-testsuite/PackageTests/InternalLibraries/cabal.out +++ b/cabal-testsuite/PackageTests/InternalLibraries/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-0.1.0.0 (lib:q) (first run) - p-0.1.0.0 (exe:foo) (first run) diff --git a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out index f2e8d3aa66..b50c5b0981 100644 --- a/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - q-0.1.0.0 (exe:q) (first run) Configuring executable 'q' for q-0.1.0.0.. @@ -8,7 +8,7 @@ Preprocessing executable 'q' for q-0.1.0.0.. Building executable 'q' for q-0.1.0.0.. # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) (first run) - q-0.1.0.0 (exe:q) (configuration changed) diff --git a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out index 8bcea1b9ca..9c41558a2b 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) --enable-library-profiling (first run) - q-1.0 (exe:q) --enable-profiling (first run) diff --git a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out index dfb2122bd1..5b7f60b72d 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) (first run) - q-1.0 (lib) (first run) diff --git a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out index c5b0e61092..397196d0f1 100644 --- a/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out +++ b/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) (first run) - q-1.0 (lib) (first run) diff --git a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out index e232a9d9f7..1ccfa17174 100644 --- a/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out +++ b/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out @@ -1,6 +1,6 @@ # cabal new-configure 'cabal.project.local' file already exists. Now overwriting it. Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following would be built: - NewConfigure-0.1.0.0 (lib) (first run) diff --git a/cabal-testsuite/PackageTests/Regression/T3436/cabal.out b/cabal-testsuite/PackageTests/Regression/T3436/cabal.out index 8e7c356c90..511ff7d839 100644 --- a/cabal-testsuite/PackageTests/Regression/T3436/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T3436/cabal.out @@ -1,7 +1,7 @@ # cabal new-build Warning: <ROOT>/custom-setup/custom-setup.cabal: This package requires at least Cabal version 99999 Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - Cabal-99999 (lib:Cabal) (first run) - custom-setup-1.0 (lib:custom-setup) (first run) diff --git a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out index aa3cd7a8fe..1f99758a98 100644 --- a/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out +++ b/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out @@ -2,7 +2,7 @@ Downloading the latest package list from test-local-repo # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following would be built: - Cabal-99999 (lib) (requires download & build) - time-99999 (lib:time) (first run) diff --git a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out index ed138d86b1..cd2b164ab4 100644 --- a/cabal-testsuite/PackageTests/Regression/T4202/cabal.out +++ b/cabal-testsuite/PackageTests/Regression/T4202/cabal.out @@ -1,6 +1,6 @@ # cabal new-build Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) (first run) - q-1.0 (exe:qexe) (first run) @@ -11,13 +11,13 @@ Configuring executable 'qexe' for q-1.0.. Preprocessing executable 'qexe' for q-1.0.. Building executable 'qexe' for q-1.0.. # cabal new-build -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - p-1.0 (lib) (file P.hs changed) Preprocessing library for p-1.0.. Building library for p-1.0.. # cabal new-build -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - q-1.0 (exe:qexe) (file <ROOT>/cabal.dist/work/dist/build/<ARCH>/ghc-<GHCVER>/p-1.0/cache/build changed) Preprocessing executable 'qexe' for q-1.0.. diff --git a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out index b53e34eec4..10afdfa3bd 100644 --- a/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out +++ b/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out @@ -1,6 +1,6 @@ # cabal new-test Resolving dependencies... -Build profile: with-compiler: ghc-<GHCVER>, optimization: MaximumOptimisation +Build profile: with-compiler: ghc-<GHCVER>, optimization: NormalOptimisation In order, the following will be built: - my-0.1 (lib) (first run) - my-0.1 (test:test-Short) (first run) -- GitLab