azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabled cross targets for the produce dynamic test.

Browse Source 
MIPS and WASM32 need more attention.
This commit is contained in:
alexander-gorshenev
2017-12-14 19:16:35 +03:00
parent bf612fdbdc
commit e2040f9b5d
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/util/util.kt
+1 -1
View File
@@ -41,7 +41,7 @@ fun String.prefixIfNot(prefix: String) =
if (this.startsWith(prefix)) this else "$prefix$this" if (this.startsWith(prefix)) this else "$prefix$this"
fun String.prefixBaseNameIfNot(prefix: String): String { fun String.prefixBaseNameIfNot(prefix: String): String {
val file = File(this) val file = File(this).absoluteFile
val name = file.name val name = file.name
val directory = file.parent val directory = file.parent
return "$directory/${name.prefixIfNot(prefix)}" return "$directory/${name.prefixIfNot(prefix)}"
backend.native/konan.properties
+3
View File
@@ -149,6 +149,7 @@ libGcc.raspberrypi = lib/gcc/arm-linux-gnueabihf/4.8.3
llvmLtoFlags.raspberrypi = -float-abi=hard -mcpu=arm1136jf-s llvmLtoFlags.raspberrypi = -float-abi=hard -mcpu=arm1136jf-s
llvmLtoOptFlags.raspberrypi = -O3 -function-sections llvmLtoOptFlags.raspberrypi = -O3 -function-sections
llvmLtoNooptFlags.raspberrypi = -O1 llvmLtoNooptFlags.raspberrypi = -O1
llvmLtoDynamicFlags.raspberrypi = -relocation-model=pic
dynamicLinker.raspberrypi = /lib/ld-linux-armhf.so.3 dynamicLinker.raspberrypi = /lib/ld-linux-armhf.so.3
# targetSysRoot relative # targetSysRoot relative
abiSpecificLibraries.raspberrypi = \ abiSpecificLibraries.raspberrypi = \
@@ -177,6 +178,7 @@ libGcc.linux_mips32 = lib/gcc/mips-unknown-linux-gnu/4.9.4
llvmLtoFlags.linux_mips32 = llvmLtoFlags.linux_mips32 =
llvmLtoOptFlags.linux_mips32 = -O3 -function-sections llvmLtoOptFlags.linux_mips32 = -O3 -function-sections
llvmLtoNooptFlags.linux_mips32 = -O1 llvmLtoNooptFlags.linux_mips32 = -O1
llvmLtoDynamicFlags.linux_mips32 = -relocation-model=pic
dynamicLinker.linux_mips32 = /lib/ld.so.1 dynamicLinker.linux_mips32 = /lib/ld.so.1
# targetSysRoot relative # targetSysRoot relative
abiSpecificLibraries.linux_mips32 = abiSpecificLibraries.linux_mips32 =
@@ -202,6 +204,7 @@ libGcc.linux_mipsel32 = lib/gcc/mipsel-unknown-linux-gnu/4.9.4
llvmLtoFlags.linux_mipsel32 = llvmLtoFlags.linux_mipsel32 =
llvmLtoOptFlags.linux_mipsel32 = -O3 -function-sections llvmLtoOptFlags.linux_mipsel32 = -O3 -function-sections
llvmLtoNooptFlags.linux_mipsel32 = -O1 llvmLtoNooptFlags.linux_mipsel32 = -O1
llvmLtoDynamicFlags.linux_mipsel32 = -relocation-model=pic
dynamicLinker.linux_mipsel32 = /lib/ld.so.1 dynamicLinker.linux_mipsel32 = /lib/ld.so.1
# targetSysRoot relative # targetSysRoot relative
abiSpecificLibraries.linux_mipsel32 = abiSpecificLibraries.linux_mipsel32 =
backend.native/tests/build.gradle
+1
View File
@@ -2337,6 +2337,7 @@ if (isMac()) {
} }
task produce_dynamic(type: DynamicKonanTest) { task produce_dynamic(type: DynamicKonanTest) {
disabled = (project.testTarget != null && project.testTarget != project.hostName)
source = "produce_dynamic/simple/hello.kt" source = "produce_dynamic/simple/hello.kt"
cSource = "$projectDir/produce_dynamic/simple/main.c" cSource = "$projectDir/produce_dynamic/simple/main.c"
goldValue = "Hello, dynamic!\n" goldValue = "Hello, dynamic!\n"