test structure fixed by swiftlang/swift-package-manager#1259

Author: tayloraswift

.travis.yml

@@ -2,10 +2,9 @@ language: generic
 sudo: required
 dist: trusty
 env:
-- SWIFT_BRANCH=swift-4.0-branch SWIFT_VERSION=swift-4.0-DEVELOPMENT-SNAPSHOT-2017-06-23-a
+- SWIFT_BRANCH=swift-4.0-branch SWIFT_VERSION=swift-4.0-DEVELOPMENT-SNAPSHOT-2017-07-06-a
 install:
 - mkdir swift
 - curl https://swift.org/builds/$SWIFT_BRANCH/ubuntu1404/$SWIFT_VERSION/$SWIFT_VERSION-ubuntu14.04.tar.gz -s | tar xz -C swift &> /dev/null
 script:
-- env PATH=$(pwd)/swift/$SWIFT_VERSION-ubuntu14.04/usr/bin:$PATH swift build -c release
-- .build/release/tests
+- env PATH=$(pwd)/swift/$SWIFT_VERSION-ubuntu14.04/usr/bin:$PATH swift test -c release

Package.swift

@@ -5,8 +5,7 @@ import PackageDescription
 let package = Package(
     name: "Noise",
     products: [
-        .library(name: "Noise", targets: ["Noise"]),
-        .executable(name: "tests", targets: ["tests"]),
+        .library(name: "Noise", targets: ["Noise"])
     ],
     dependencies: [
         .package(url: "https://github.com/kelvin13/maxpng", from: "2.0.0")
@@ -15,8 +14,8 @@ let package = Package(
         .target(
             name: "Noise",
             path: "sources/noise"),
-        .target(
-            name: "tests",
+        .testTarget(
+            name: "Tests",
             dependencies: ["Noise", "MaxPNG"],
             path: "tests/noise"),
     ]

tests/LinuxMain.swift

@@ -0,0 +1,73 @@
+import Noise
+import MaxPNG
+
+import Tests
+
+import func Glibc.clock
+
+banners(width: 700, ratio: 5)
+
+calibrate_noise(width: 256, height: 256)
+
+var t0:Int
+
+let viewer_size:Int = 1024
+var pixbuf:[UInt8]
+let png_properties:PNGProperties = PNGProperties(width: viewer_size, height: viewer_size, bit_depth: 8, color: .grayscale, interlaced: false)!
+
+var poisson = DiskSampler2D(seed: 0)
+t0 = clock()
+pixbuf = [UInt8](repeating: 0, count: viewer_size * viewer_size)
+for point:(x:Double, y:Double) in poisson.generate(radius: 10, width: viewer_size, height: viewer_size)
+{
+    pixbuf[Int(point.y) * viewer_size + Int(point.x)] = 255
+}
+print(clock() - t0)
+try png_encode(path: "tests/disk2d.png", raw_data: pixbuf, properties: png_properties)
+
+
+let V:CellNoise2D = CellNoise2D(amplitude: 255, frequency: 0.01)
+t0 = clock()
+for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
+{
+    pixbuf[i] = UInt8(max(0, min(255, V.evaluate(x, y))))
+}
+print(clock() - t0)
+try png_encode(path: "tests/cell2d.png", raw_data: pixbuf, properties: png_properties)
+
+let V3:CellNoise3D = CellNoise3D(amplitude: 255, frequency: 0.01)
+t0 = clock()
+for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
+{
+    pixbuf[i] = UInt8(max(0, min(255, V3.evaluate(x, y))))
+}
+print(clock() - t0)
+try png_encode(path: "tests/cell3d.png", raw_data: pixbuf, properties: png_properties)
+
+let P:FBM<ClassicNoise3D> = FBM<ClassicNoise3D>(ClassicNoise3D(amplitude: 255, frequency: 0.001), octaves: 10, persistence: 0.62)
+t0 = clock()
+for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
+{
+    pixbuf[i] = UInt8(max(0, min(255, P.evaluate(x, y) + 127.5)))
+}
+print(clock() - t0)
+try png_encode(path: "tests/classic3d.png", raw_data: pixbuf, properties: png_properties)
+
+
+let SS:FBM<GradientNoise2D> = FBM<GradientNoise2D>(GradientNoise2D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
+t0 = clock()
+for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
+{
+    pixbuf[i] = UInt8(max(0, min(255, SS.evaluate(x, y) + 127.5)))
+}
+print(clock() - t0)
+try png_encode(path: "tests/gradient2d.png", raw_data: pixbuf, properties: png_properties)
+
+let SS3D:FBM<GradientNoise3D> = FBM<GradientNoise3D>(GradientNoise3D(amplitude: 180, frequency: 0.001), octaves: 10, persistence: 0.62)
+t0 = clock()
+for (i, (x, y)) in Domain2D(samples_x: viewer_size, samples_y: viewer_size).enumerated()
+{
+    pixbuf[i] = UInt8(max(0, min(255, SS3D.evaluate(x, y) + 127.5)))
+}
+print(clock() - t0)
+try png_encode(path: "tests/gradient3d.png", raw_data: pixbuf, properties: png_properties)

tests/noise/calibrate.blend1

@@ -22,6 +22,7 @@ func grayscale_noise_png(noise:Noise, width:Int, height:Int, value_offset:Double
             color: .grayscale)
 }
 
+public 
 func calibrate_noise(width:Int, height:Int, seed:Int = 0)
 {
     grayscale_noise_png(noise: GradientNoise2D(amplitude: 0.5*255, frequency: 4, seed: seed),