Move Vulkan CTS scripts to external/vulkancts/scripts
Change-Id: I928d848225d08f03d93fd700a80d36ac3fbc3ada
diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md
index ec0530a..59cbcc3 100644
--- a/external/vulkancts/README.md
+++ b/external/vulkancts/README.md
@@ -113,7 +113,7 @@
For distribution, and platforms that don't support GLSL to SPIR-V compilation,
SPIR-V binaries can be pre-built with following command:
- python external/vulkancts/build_spirv_binaries.py
+ python external/vulkancts/scripts/build_spirv_binaries.py
Binaries will be written to `external/vulkancts/data/vulkan/prebuilt/`.
@@ -278,11 +278,11 @@
QualityWarning
CompatibilityWarning
-Submission package can be verified using `external/vulkancts/verify_submission.py`
+Submission package can be verified using `external/vulkancts/scripts/verify_submission.py`
script. The script takes two arguments: path to extracted submission package
and path to current mustpass list. For example:
- python external/vulkancts/verify_submission.py VK_10_Khronos_1/ external/vulkancts/mustpass/1.0.1/vk-default.txt
+ python external/vulkancts/scripts/verify_submission.py VK_10_Khronos_1/ external/vulkancts/mustpass/1.0.1/vk-default.txt
Vulkan platform port
diff --git a/external/vulkancts/build_mustpass.py b/external/vulkancts/scripts/build_mustpass.py
similarity index 98%
rename from external/vulkancts/build_mustpass.py
rename to external/vulkancts/scripts/build_mustpass.py
index 9b6c9dc..b1b1faa 100644
--- a/external/vulkancts/build_mustpass.py
+++ b/external/vulkancts/scripts/build_mustpass.py
@@ -23,7 +23,7 @@
import os
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
from build.common import DEQP_DIR
from build.config import ANY_GENERATOR
diff --git a/external/vulkancts/build_spirv_binaries.py b/external/vulkancts/scripts/build_spirv_binaries.py
similarity index 99%
rename from external/vulkancts/build_spirv_binaries.py
rename to external/vulkancts/scripts/build_spirv_binaries.py
index 2a97258..bdcfcb9 100644
--- a/external/vulkancts/build_spirv_binaries.py
+++ b/external/vulkancts/scripts/build_spirv_binaries.py
@@ -28,7 +28,7 @@
import shutil
import fnmatch
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
from build.common import *
from build.config import *
diff --git a/external/vulkancts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py
similarity index 99%
rename from external/vulkancts/gen_framework.py
rename to external/vulkancts/scripts/gen_framework.py
index c690a83..e052ab3 100644
--- a/external/vulkancts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@ -24,12 +24,12 @@
import re
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
from build.common import DEQP_DIR
from khr_util.format import indentLines, writeInlFile
-VULKAN_DIR = os.path.join(os.path.dirname(__file__), "framework", "vulkan")
+VULKAN_DIR = os.path.join(os.path.dirname(__file__), "..", "framework", "vulkan")
INL_HEADER = """\
/* WARNING: This is auto-generated file. Do not modify, since changes will
diff --git a/external/vulkancts/verify_submission.py b/external/vulkancts/scripts/verify_submission.py
similarity index 99%
rename from external/vulkancts/verify_submission.py
rename to external/vulkancts/scripts/verify_submission.py
index 338bdae..6887bdc 100644
--- a/external/vulkancts/verify_submission.py
+++ b/external/vulkancts/scripts/verify_submission.py
@@ -26,8 +26,8 @@
from fnmatch import fnmatch
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts"))
-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "scripts", "log"))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts"))
+sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts", "log"))
from build.common import readFile
from log_parser import StatusCode, BatchResultParser
diff --git a/scripts/check_build_sanity.py b/scripts/check_build_sanity.py
index 9e41180..560e20b 100644
--- a/scripts/check_build_sanity.py
+++ b/scripts/check_build_sanity.py
@@ -156,7 +156,7 @@
VSConfig("Debug"),
ANY_VS_X64_GENERATOR),
RunScript(os.path.join("scripts", "build_android_mustpass.py")),
- RunScript(os.path.join("external", "vulkancts", "build_mustpass.py")),
+ RunScript(os.path.join("external", "vulkancts", "scripts", "build_mustpass.py")),
RunScript(os.path.join("scripts", "gen_egl.py")),
RunScript(os.path.join("scripts", "opengl", "gen_all.py")),
RunScript(os.path.join("scripts", "src_util", "check_all.py")),