Skip to content

Commit d24351e

Browse files
leana8959leana8959
committed
test: update expected
This result can be compared against test accessor-test branch to see that the accessor behaviour hasn't changed.
1 parent b29953a commit d24351e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+19218
-18770
lines changed

‎Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr‎

Lines changed: 234 additions & 217 deletions
Large diffs are not rendered by default.

‎Cabal-tests/tests/ParserTests/regressions/anynone.expr‎

Lines changed: 85 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
`(,,,,,,)`
2-
GenericPackageDescription {
3-
packageDescription =
2+
GenericPackageDescription' {
3+
packageDescriptionInternal =
44
PackageDescription {
55
specVersion = CabalSpecV3_0,
66
package = PackageIdentifier {
@@ -35,91 +35,96 @@
3535
extraTmpFiles = [],
3636
extraDocFiles = [],
3737
extraFiles = []},
38-
gpdScannedVersion = Nothing,
39-
genPackageFlags = [],
40-
condLibrary = Just
38+
gpdScannedVersionInternal =
39+
Nothing,
40+
genPackageFlagsInternal = [],
41+
gpdCommonStanzas = Map.fromList
42+
[],
43+
condLibraryUnmerged = Just
4144
CondNode {
42-
condTreeData = Library {
43-
libName = LMainLibName,
44-
exposedModules = [
45-
ModuleName "AnyNone"],
46-
reexportedModules = [],
47-
signatures = [],
48-
libExposed = True,
49-
libVisibility =
50-
LibraryVisibilityPublic,
51-
libBuildInfo = BuildInfo {
52-
buildable = True,
53-
buildTools = [],
54-
buildToolDepends = [],
55-
cppOptions = [],
56-
asmOptions = [],
57-
cmmOptions = [],
58-
ccOptions = [],
59-
cxxOptions = [],
60-
jsppOptions = [],
61-
ldOptions = [],
62-
hsc2hsOptions = [],
63-
pkgconfigDepends = [],
64-
frameworks = [],
65-
extraFrameworkDirs = [],
66-
asmSources = [],
67-
cmmSources = [],
68-
cSources = [],
69-
cxxSources = [],
70-
jsSources = [],
71-
hsSourceDirs = [],
72-
otherModules = [],
73-
virtualModules = [],
74-
autogenModules = [],
75-
defaultLanguage = Just
76-
Haskell2010,
77-
otherLanguages = [],
78-
defaultExtensions = [],
79-
otherExtensions = [],
80-
oldExtensions = [],
81-
extraLibs = [],
82-
extraLibsStatic = [],
83-
extraGHCiLibs = [],
84-
extraBundledLibs = [],
85-
extraLibFlavours = [],
86-
extraDynLibFlavours = [],
87-
extraLibDirs = [],
88-
extraLibDirsStatic = [],
89-
includeDirs = [],
90-
includes = [],
91-
autogenIncludes = [],
92-
installIncludes = [],
93-
options = PerCompilerFlavor
94-
[]
95-
[],
96-
profOptions = PerCompilerFlavor
97-
[]
98-
[],
99-
sharedOptions =
100-
PerCompilerFlavor [] [],
101-
profSharedOptions =
102-
PerCompilerFlavor [] [],
103-
staticOptions =
104-
PerCompilerFlavor [] [],
105-
customFieldsBI = [],
106-
targetBuildDepends = [
107-
Dependency
108-
(PackageName "base")
109-
(OrLaterVersion (mkVersion [0]))
110-
mainLibSet],
111-
mixins = []}},
45+
condTreeData = WithImports {
46+
getImportNames = [],
47+
unImportNames = Library {
48+
libName = LMainLibName,
49+
exposedModules = [
50+
ModuleName "AnyNone"],
51+
reexportedModules = [],
52+
signatures = [],
53+
libExposed = True,
54+
libVisibility =
55+
LibraryVisibilityPublic,
56+
libBuildInfo = BuildInfo {
57+
buildable = True,
58+
buildTools = [],
59+
buildToolDepends = [],
60+
cppOptions = [],
61+
asmOptions = [],
62+
cmmOptions = [],
63+
ccOptions = [],
64+
cxxOptions = [],
65+
jsppOptions = [],
66+
ldOptions = [],
67+
hsc2hsOptions = [],
68+
pkgconfigDepends = [],
69+
frameworks = [],
70+
extraFrameworkDirs = [],
71+
asmSources = [],
72+
cmmSources = [],
73+
cSources = [],
74+
cxxSources = [],
75+
jsSources = [],
76+
hsSourceDirs = [],
77+
otherModules = [],
78+
virtualModules = [],
79+
autogenModules = [],
80+
defaultLanguage = Just
81+
Haskell2010,
82+
otherLanguages = [],
83+
defaultExtensions = [],
84+
otherExtensions = [],
85+
oldExtensions = [],
86+
extraLibs = [],
87+
extraLibsStatic = [],
88+
extraGHCiLibs = [],
89+
extraBundledLibs = [],
90+
extraLibFlavours = [],
91+
extraDynLibFlavours = [],
92+
extraLibDirs = [],
93+
extraLibDirsStatic = [],
94+
includeDirs = [],
95+
includes = [],
96+
autogenIncludes = [],
97+
installIncludes = [],
98+
options = PerCompilerFlavor
99+
[]
100+
[],
101+
profOptions = PerCompilerFlavor
102+
[]
103+
[],
104+
sharedOptions =
105+
PerCompilerFlavor [] [],
106+
profSharedOptions =
107+
PerCompilerFlavor [] [],
108+
staticOptions =
109+
PerCompilerFlavor [] [],
110+
customFieldsBI = [],
111+
targetBuildDepends = [
112+
Dependency
113+
(PackageName "base")
114+
(OrLaterVersion (mkVersion [0]))
115+
mainLibSet],
116+
mixins = []}}},
112117
condTreeConstraints = [
113118
Dependency
114119
(PackageName "base")
115120
(OrLaterVersion (mkVersion [0]))
116121
mainLibSet],
117122
condTreeComponents = []},
118-
condSubLibraries = [],
119-
condForeignLibs = [],
120-
condExecutables = [],
121-
condTestSuites = [],
122-
condBenchmarks = []}
123+
condSubLibrariesUnmerged = [],
124+
condForeignLibsUnmerged = [],
125+
condExecutablesUnmerged = [],
126+
condTestSuitesUnmerged = [],
127+
condBenchmarksUnmerged = []}
123128
(Just
124129
CondNode {
125130
condTreeData = Library {

‎Cabal-tests/tests/ParserTests/regressions/big-version.expr‎

Lines changed: 80 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
`(,,,,,,)`
2-
GenericPackageDescription {
3-
packageDescription =
2+
GenericPackageDescription' {
3+
packageDescriptionInternal =
44
PackageDescription {
55
specVersion = CabalSpecV3_0,
66
package = PackageIdentifier {
@@ -37,82 +37,87 @@
3737
extraTmpFiles = [],
3838
extraDocFiles = [],
3939
extraFiles = []},
40-
gpdScannedVersion = Nothing,
41-
genPackageFlags = [],
42-
condLibrary = Just
40+
gpdScannedVersionInternal =
41+
Nothing,
42+
genPackageFlagsInternal = [],
43+
gpdCommonStanzas = Map.fromList
44+
[],
45+
condLibraryUnmerged = Just
4346
CondNode {
44-
condTreeData = Library {
45-
libName = LMainLibName,
46-
exposedModules = [],
47-
reexportedModules = [],
48-
signatures = [],
49-
libExposed = True,
50-
libVisibility =
51-
LibraryVisibilityPublic,
52-
libBuildInfo = BuildInfo {
53-
buildable = True,
54-
buildTools = [],
55-
buildToolDepends = [],
56-
cppOptions = [],
57-
asmOptions = [],
58-
cmmOptions = [],
59-
ccOptions = [],
60-
cxxOptions = [],
61-
jsppOptions = [],
62-
ldOptions = [],
63-
hsc2hsOptions = [],
64-
pkgconfigDepends = [],
65-
frameworks = [],
66-
extraFrameworkDirs = [],
67-
asmSources = [],
68-
cmmSources = [],
69-
cSources = [],
70-
cxxSources = [],
71-
jsSources = [],
72-
hsSourceDirs = [],
73-
otherModules = [],
74-
virtualModules = [],
75-
autogenModules = [],
76-
defaultLanguage = Just
77-
Haskell2010,
78-
otherLanguages = [],
79-
defaultExtensions = [],
80-
otherExtensions = [],
81-
oldExtensions = [],
82-
extraLibs = [],
83-
extraLibsStatic = [],
84-
extraGHCiLibs = [],
85-
extraBundledLibs = [],
86-
extraLibFlavours = [],
87-
extraDynLibFlavours = [],
88-
extraLibDirs = [],
89-
extraLibDirsStatic = [],
90-
includeDirs = [],
91-
includes = [],
92-
autogenIncludes = [],
93-
installIncludes = [],
94-
options = PerCompilerFlavor
95-
[]
96-
[],
97-
profOptions = PerCompilerFlavor
98-
[]
99-
[],
100-
sharedOptions =
101-
PerCompilerFlavor [] [],
102-
profSharedOptions =
103-
PerCompilerFlavor [] [],
104-
staticOptions =
105-
PerCompilerFlavor [] [],
106-
customFieldsBI = [],
107-
targetBuildDepends = [],
108-
mixins = []}},
47+
condTreeData = WithImports {
48+
getImportNames = [],
49+
unImportNames = Library {
50+
libName = LMainLibName,
51+
exposedModules = [],
52+
reexportedModules = [],
53+
signatures = [],
54+
libExposed = True,
55+
libVisibility =
56+
LibraryVisibilityPublic,
57+
libBuildInfo = BuildInfo {
58+
buildable = True,
59+
buildTools = [],
60+
buildToolDepends = [],
61+
cppOptions = [],
62+
asmOptions = [],
63+
cmmOptions = [],
64+
ccOptions = [],
65+
cxxOptions = [],
66+
jsppOptions = [],
67+
ldOptions = [],
68+
hsc2hsOptions = [],
69+
pkgconfigDepends = [],
70+
frameworks = [],
71+
extraFrameworkDirs = [],
72+
asmSources = [],
73+
cmmSources = [],
74+
cSources = [],
75+
cxxSources = [],
76+
jsSources = [],
77+
hsSourceDirs = [],
78+
otherModules = [],
79+
virtualModules = [],
80+
autogenModules = [],
81+
defaultLanguage = Just
82+
Haskell2010,
83+
otherLanguages = [],
84+
defaultExtensions = [],
85+
otherExtensions = [],
86+
oldExtensions = [],
87+
extraLibs = [],
88+
extraLibsStatic = [],
89+
extraGHCiLibs = [],
90+
extraBundledLibs = [],
91+
extraLibFlavours = [],
92+
extraDynLibFlavours = [],
93+
extraLibDirs = [],
94+
extraLibDirsStatic = [],
95+
includeDirs = [],
96+
includes = [],
97+
autogenIncludes = [],
98+
installIncludes = [],
99+
options = PerCompilerFlavor
100+
[]
101+
[],
102+
profOptions = PerCompilerFlavor
103+
[]
104+
[],
105+
sharedOptions =
106+
PerCompilerFlavor [] [],
107+
profSharedOptions =
108+
PerCompilerFlavor [] [],
109+
staticOptions =
110+
PerCompilerFlavor [] [],
111+
customFieldsBI = [],
112+
targetBuildDepends = [],
113+
mixins = []}}},
109114
condTreeConstraints = [],
110115
condTreeComponents = []},
111-
condSubLibraries = [],
112-
condForeignLibs = [],
113-
condExecutables = [],
114-
condTestSuites = [],
115-
condBenchmarks = []}
116+
condSubLibrariesUnmerged = [],
117+
condForeignLibsUnmerged = [],
118+
condExecutablesUnmerged = [],
119+
condTestSuitesUnmerged = [],
120+
condBenchmarksUnmerged = []}
116121
(Just
117122
CondNode {
118123
condTreeData = Library {

0 commit comments

Comments
 (0)