Add tests for C libraries, Rename CLang to Clang

Author: aciidgh

Fixtures/ClangModules/CLibraryFlat/Foo.c

@@ -0,0 +1,6 @@
+int foo() {
+    int a = 5;
+    int b = a;
+    a = b;
+    return a;
+}

Fixtures/ClangModules/CLibraryFlat/Package.swift

@@ -0,0 +1 @@
+int foo();

Fixtures/ClangModules/CLibraryFlat/include/abc.h

@@ -0,0 +1,5 @@
+module CLibraryFlat {
+  header "abc.h"
+  link "CLibraryFlat"
+  export *
+}

Fixtures/ClangModules/CLibraryFlat/include/module.modulemap

@@ -0,0 +1,6 @@
+int foo() {
+    int a = 5;
+    int b = a;
+    a = b;
+    return a;
+}

Fixtures/ClangModules/CLibrarySources/Package.swift

@@ -0,0 +1 @@
+int foo();

Fixtures/ClangModules/CLibrarySources/Sources/Foo.c

@@ -0,0 +1,5 @@
+module CLibrarySources {
+  header "abc.h"
+  link "CLibrarySources"
+  export *
+}

Fixtures/ClangModules/CLibrarySources/Sources/include/abc.h

@@ -0,0 +1,6 @@
+import PackageDescription
+
+let package = Package(
+    name: "SwiftCMixed",
+    targets: [Target(name: "SeaExec", dependencies: ["SeaLib"])]
+)

Fixtures/ClangModules/CLibrarySources/Sources/include/module.modulemap

@@ -0,0 +1,3 @@
+import SeaLib
+
+let a = foo(5)

Fixtures/ClangModules/SwiftCMixed/Package.swift

@@ -0,0 +1,3 @@
+int foo(int a) {
+    return a;
+}

Fixtures/ClangModules/SwiftCMixed/Sources/SeaExec/main.swift

@@ -0,0 +1 @@
+int foo(int a);

Fixtures/ClangModules/SwiftCMixed/Sources/SeaLib/Foo.c

@@ -0,0 +1,5 @@
+module SeaLib {
+  header "Foo.h"
+  link "SeaLib"
+  export *
+}

Fixtures/ClangModules/SwiftCMixed/Sources/SeaLib/include/Foo.h

@@ -0,0 +1,6 @@
+import PackageDescription
+
+let package = Package(
+    name: "Bar",
+    dependencies: [
+        .Package(url: "../Foo", majorVersion: 1)])

Fixtures/ClangModules/SwiftCMixed/Sources/SeaLib/include/module.modulemap

@@ -0,0 +1,3 @@
+import Foo
+
+foo()

Fixtures/DependencyResolution/External/SimpleCDep/Bar/Package.swift

@@ -0,0 +1,3 @@
+void foo() {
+    
+}

Fixtures/DependencyResolution/External/SimpleCDep/Bar/main.swift

@@ -0,0 +1 @@
+void foo();

Fixtures/DependencyResolution/External/SimpleCDep/Foo/Foo.c

@@ -0,0 +1,5 @@
+module Foo {
+  header "Foo.h"
+  link "Foo"
+  export *
+}

Fixtures/DependencyResolution/External/SimpleCDep/Foo/Package.swift

@@ -107,7 +107,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
     //FIXME: Probably needs more compiler options for debug and release modes
     //FIXME: Incremental builds
     //FIXME: Add support for executables
-    for case let module as CLangModule in modules {
+    for case let module as ClangModule in modules {
         let inputs = module.dependencies.map{ $0.targetName } + module.sources.paths
         let productPath = Path.join(prefix, "\(module.c99name).o")
         let wd = Path.join(prefix, "\(module.c99name).build")

Fixtures/DependencyResolution/External/SimpleCDep/Foo/include/Foo.h

@@ -32,7 +32,7 @@ extension Module {
             if let module = module as? CModule {
                 let moduleMapPath = Path.join(module.path, "module.modulemap")
                 return ["-Xcc", "-fmodule-map-file=\(moduleMapPath)"]
-            } else if let cmodule = module as? CLangModule {
+            } else if let cmodule = module as? ClangModule {
                 return ["-Xcc", "-fmodule-map-file=\(cmodule.moduleMapPath)"]
             } else {
                 return []

Fixtures/DependencyResolution/External/SimpleCDep/Foo/include/module.modulemap

@@ -70,7 +70,7 @@ public class CModule: Module {
     }
 }
 
-public class CLangModule: Module {
+public class ClangModule: Module {
     public let sources: Sources
     public let moduleMapPath: String
 

Sources/Build/describe().swift

@@ -42,7 +42,7 @@ extension Package {
                 if sourcified.isSwiftModule {
                     modules = [SwiftModule(name: self.name, sources: sourcified.sources)]
                 } else {
-                    modules = [CLangModule(name: self.name, sources: sourcified.sources)]
+                    modules = [ClangModule(name: self.name, sources: sourcified.sources)]
                 }
 
             } catch Module.Error.NoSources {
@@ -59,7 +59,7 @@ extension Package {
                 if sourcified.isSwiftModule {
                     return SwiftModule(name: name, sources: sourcified.sources)
                 }
-                return CLangModule(name: name, sources: sourcified.sources)
+                return ClangModule(name: name, sources: sourcified.sources)
             }
         }
 

Sources/Build/misc.swift

@@ -20,7 +20,7 @@ func fillModuleGraph(packages: [Package], modulesForPackage: (Package) -> [Modul
                     return false
                 case let module as SwiftModule where module.type == .Library:
                     return true
-                case is CLangModule:
+                case is ClangModule:
                     return true
                 case is CModule:
                     return true

Sources/PackageType/Module.swift

@@ -0,0 +1,62 @@
+/*
+ This source file is part of the Swift.org open source project
+
+ Copyright 2015 - 2016 Apple Inc. and the Swift project authors
+ Licensed under Apache License v2.0 with Runtime Library Exception
+
+ See http://swift.org/LICENSE.txt for license information
+ See http://swift.org/CONTRIBUTORS.txt for Swift project authors
+*/
+
+import struct Utility.Path
+import func POSIX.symlink
+import func Utility.walk
+import func POSIX.rename
+import func POSIX.mkdir
+import func POSIX.popen
+import XCTest
+
+class TestClangModulesTestCase: XCTestCase {
+    
+    func testSingleModuleFlatCLibrary() {
+        fixture(name: "ClangModules/CLibraryFlat") { prefix in
+            XCTAssertBuilds(prefix)
+            XCTAssertFileExists(prefix, ".build", "debug", "libCLibraryFlat.so")
+        }
+    }
+    
+    func testSingleModuleCLibraryInSources() {
+        fixture(name: "ClangModules/CLibrarySources") { prefix in
+            XCTAssertBuilds(prefix)
+            XCTAssertFileExists(prefix, ".build", "debug", "libCLibrarySources.so")
+        }
+    }
+    
+    func testMixedSwiftAndC() {
+        fixture(name: "ClangModules/SwiftCMixed") { prefix in
+            XCTAssertBuilds(prefix)
+            XCTAssertFileExists(prefix, ".build", "debug", "libSeaLib.so")
+        }
+    }
+    
+    func testExternalSimpleCDep() {
+        fixture(name: "DependencyResolution/External/SimpleCDep") { prefix in
+            XCTAssertBuilds(prefix, "Bar")
+            XCTAssertFileExists(prefix, "Bar/.build/debug/Bar")
+            XCTAssertFileExists(prefix, "Bar/.build/debug/libFoo.so")
+            XCTAssertDirectoryExists(prefix, "Bar/Packages/Foo-1.2.3")
+        }
+    }
+}
+
+
+extension TestClangModulesTestCase {
+    static var allTests : [(String, TestClangModulesTestCase -> () throws -> Void)] {
+        return [
+            ("testSingleModuleFlatCLibrary", testSingleModuleFlatCLibrary),
+            ("testSingleModuleCLibraryInSources", testSingleModuleCLibraryInSources),
+            ("testMixedSwiftAndC", testMixedSwiftAndC),
+            ("testExternalSimpleCDep", testExternalSimpleCDep),
+        ]
+    }
+}

Sources/Transmute/Package+modules.swift

@@ -15,6 +15,7 @@ import XCTest
 @testable import Buildtest
 
 XCTMain([
+    testCase(TestClangModulesTestCase.allTests),
     testCase(DependencyResolutionTestCase.allTests),
     testCase(FileTests.allTests),
     testCase(GetTests.allTests),