Browse Source

Replace ExampleTests with direct builds of the Echo and Simple examples in "make test".

Tim Burks 8 years ago
parent
commit
6462c1db79
5 changed files with 5 additions and 48 deletions
  1. 1 2
      .travis.yml
  2. 0 11
      ExampleTests/Makefile
  3. 0 34
      ExampleTests/Package.swift
  4. 0 1
      ExampleTests/Sources/Echo
  5. 4 0
      Makefile

+ 1 - 2
.travis.yml

@@ -43,5 +43,4 @@ script:
   - make test
   - make test
   - cd Plugin
   - cd Plugin
   - make test
   - make test
-  - cd ../ExampleTests
-  - make
+  - cd ..

+ 0 - 11
ExampleTests/Makefile

@@ -1,11 +0,0 @@
-
-all:
-	swift build -c release
-
-project:
-	swift package generate-xcodeproj
-
-clean :
-	rm -rf Packages googleapis .build
-	rm -f Package.pins
-	rm -rf Package.resolved ExampleTests.xcodeproj ExampleTests

+ 0 - 34
ExampleTests/Package.swift

@@ -1,34 +0,0 @@
-// swift-tools-version:4.0
-
-/*
- * Copyright 2017, gRPC Authors All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import PackageDescription
-
-let package = Package(
-  name: "ExampleTests",
-  dependencies: [
-    .package(url: "../", .branch("HEAD")),
-    .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.0.2"),
-    .package(url: "https://github.com/kylef/Commander.git", from: "0.8.0")
-  ],
-  targets: [
-    .target(name: "Echo",
-            dependencies: [
-              "SwiftGRPC",
-              "SwiftProtobuf",
-              "Commander"
-            ])
-  ])

+ 0 - 1
ExampleTests/Sources/Echo

@@ -1 +0,0 @@
-../../Examples/Echo/PackageManager/Sources/

+ 4 - 0
Makefile

@@ -8,9 +8,13 @@ all:
 test:
 test:
 	swift build -v $(CFLAGS)
 	swift build -v $(CFLAGS)
 	swift test -v $(CFLAGS)
 	swift test -v $(CFLAGS)
+	cd Examples/Echo/PackageManager; make
+	cd Examples/Simple/PackageManager; make
 
 
 clean:
 clean:
 	rm -rf Packages
 	rm -rf Packages
 	rm -rf .build
 	rm -rf .build
 	rm -rf SwiftGRPC.xcodeproj
 	rm -rf SwiftGRPC.xcodeproj
 	rm -rf Package.pins Package.resolved
 	rm -rf Package.pins Package.resolved
+	cd Examples/Echo/PackageManager; make clean
+	cd Examples/Simple/PackageManager; make clean