Skip to content

Commit 0326cfe

Browse files
committed
Fix the Concatenate.swift test on Linux
Looks like on Linux, GNU ld is more agressive at removing internal stdlib symbols, so -disable-access-control is even less useful. Swift SVN r25855
1 parent 2b209f8 commit 0326cfe

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

stdlib/core/Concatenate.swift.gyb

+6-4
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,29 @@ struct _ConcatenateSequenceGenerator<
6767

6868
/// A `SequenceType` whose elements consist of those *contained in* in
6969
/// the elements of its `Base` sequence.
70+
public // @testable
7071
struct _ConcatenateSequenceView<
7172
Base: SequenceType where Base.Generator.Element: SequenceType
7273
> : SequenceType {
7374

74-
7575
/// Present the elmeents of the elements of `base`
76-
init(_ base: Base) {
76+
public init(_ base: Base) {
7777
self._base = base
7878
}
7979

8080
/// Return a *generator* over the elements of this *sequence*.
8181
///
8282
/// Complexity: O(1)
83-
func generate() -> _ConcatenateSequenceGenerator<Base.Generator> {
83+
public func generate() -> _ConcatenateSequenceGenerator<Base.Generator> {
8484
return _ConcatenateSequenceGenerator(_base.generate())
8585
}
8686

87-
var _base: Base
87+
internal var _base: Base
8888
}
8989

9090
/// Return a sequence that is a concatenation of the elements of
9191
/// `source`\ 's elements
92+
public // @testable
9293
func _lazyConcatenate<
9394
S:SequenceType
9495
where S.Generator.Element: SequenceType
@@ -98,6 +99,7 @@ func _lazyConcatenate<
9899

99100
/// Return an `Array` containing the results of mapping `transform`
100101
/// over `source`.
102+
public // @testable
101103
func _concatenate<
102104
S:SequenceType
103105
where S.Generator.Element: SequenceType

validation-test/stdlib/Concatenate.swift

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
1010
//
1111
//===----------------------------------------------------------------------===//
12-
// RUN: %target-run-stdlib-swift
12+
// RUN: %target-run-simple-swift
1313

14-
// XFAIL: linux
15-
16-
import Swift
1714
import StdlibUnittest
1815

1916
var ConcatenateTests = TestSuite("ConcatenateTests")

0 commit comments

Comments
 (0)