Skip to content

Commit 3230b68

Browse files
committed
testing travis
1 parent f8f9431 commit 3230b68

File tree

9 files changed

+18
-20
lines changed

9 files changed

+18
-20
lines changed

src/test/kotlin/main/util.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package main
22

3-
val isNotGithubAction: Boolean
4-
get() = System.getenv("GITHUB_ACTIONS") != "true"
3+
val isNotCI: Boolean
4+
get() = System.getenv("GITHUB_ACTIONS") != "true" && System.getenv("TRAVIS") != "true"

src/test/kotlin/samples/InstanceExtensionProperties.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package samples
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import vkk.vk
66

77
class InstanceExtensionProperties : StringSpec() {
88

99
init {
10-
if (isNotGithubAction)
10+
if (isNotCI)
1111
"InstanceExtensionProperties" {
1212

1313
val extensionProperties = vk.enumerateInstanceExtensionProperties()

src/test/kotlin/samples/InstanceLayerExtensionProperties.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package samples
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import vkk._10.structs.ExtensionProperties
66
import vkk._10.structs.LayerProperties
77
import vkk.vk
@@ -11,7 +11,7 @@ class InstanceLayerExtensionProperties : StringSpec() {
1111
class PropertyData(val layerProperties: LayerProperties, val extensionProperties: Array<ExtensionProperties>)
1212

1313
init {
14-
if (isNotGithubAction)
14+
if (isNotCI)
1515
"InstanceLayerExtensionProperties" {
1616

1717
val layerProperties = vk.enumerateInstanceLayerProperties()

src/test/kotlin/samples/InstanceLayerProperties.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package samples
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import vkk.vk
66

77
class InstanceLayerProperties : StringSpec() {
88

99
init {
10-
if (isNotGithubAction)
10+
if (isNotCI)
1111
"InstanceLayerProperties" {
1212

1313
val layerProperties = vk.enumerateInstanceLayerProperties()

src/test/kotlin/samples/InstanceVersion.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package samples
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import org.lwjgl.vulkan.VK10
66
import org.lwjgl.vulkan.VK10.VK_VERSION_MINOR
77
import org.lwjgl.vulkan.VK10.VK_VERSION_PATCH
@@ -12,7 +12,7 @@ class InstanceVersion : StringSpec() {
1212
fun decodeAPIVersion(apiVersion: Int) = "${VK10.VK_VERSION_MAJOR(apiVersion)}.${VK_VERSION_MINOR(apiVersion)}.${VK_VERSION_PATCH(apiVersion)}"
1313

1414
init {
15-
if (isNotGithubAction)
15+
if (isNotCI)
1616
"InstanceVersion" {
1717
val apiVersion = vk.enumerateInstanceVersion
1818
println("APIVersion = ${decodeAPIVersion(apiVersion)}")

src/test/kotlin/tests/01 initInstance.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package tests
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import org.lwjgl.system.Configuration
66
import org.lwjgl.vulkan.VK11.VK_API_VERSION_1_1
77
import vkk._10.structs.ApplicationInfo
@@ -15,7 +15,7 @@ class `01 initInstance` : StringSpec() {
1515

1616
init {
1717
Configuration.DEBUG_LOADER.set(true)
18-
if (isNotGithubAction)
18+
if (isNotCI)
1919
"01 initInstance" {
2020
vkUnique {
2121
// initialize the vk::ApplicationInfo structure

src/test/kotlin/tests/02 enumerateDevices.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package tests
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import org.lwjgl.system.Configuration
66
import vkk.vu
77

@@ -12,7 +12,7 @@ class `02 enumerateDevices` : StringSpec() {
1212

1313
init {
1414
Configuration.DEBUG_LOADER.set(true)
15-
if (isNotGithubAction)
15+
if (isNotCI)
1616
"02 enumerateDevices" {
1717

1818
val instance = vu.createInstance(appName, engineName)

src/test/kotlin/tests/03 initDevice.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package tests
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
4+
import main.isNotCI
55
import vkk.VkQueueFlag
6-
import vkk._10.structs.DeviceCreateInfo
76
import vkk._10.structs.DeviceQueueCreateInfo
87
import vkk.has
98
import vkk.vu
@@ -14,7 +13,7 @@ class `03 initDevice` : StringSpec() {
1413
val engineName = "Vulkan.hpp"
1514

1615
init {
17-
if (isNotGithubAction)
16+
if (isNotCI)
1817
"03 initDevice" {
1918

2019
val instance = vu.createInstance(appName, engineName)

src/test/kotlin/tests/04 initCommandBuffer.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package tests
22

33
import io.kotlintest.specs.StringSpec
4-
import main.isNotGithubAction
5-
import vkk._10.structs.CommandPoolCreateInfo
4+
import main.isNotCI
65
import vkk.vu
76

87
class `04 initCommandBuffer` : StringSpec() {
@@ -11,7 +10,7 @@ class `04 initCommandBuffer` : StringSpec() {
1110
val engineName = "Vulkan.hpp"
1211

1312
init {
14-
if (isNotGithubAction)
13+
if (isNotCI)
1514
"04 initCommandBuffer" {
1615

1716
val instance = vu.createInstance(appName, engineName)

0 commit comments

Comments
 (0)