mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2371 from RafaelMarinheiro/master

Browse Source 
Use --test-root to pass files to Bazel tests.
This commit is contained in:
John Kessenich 2020-08-17 04:04:32 -06:00 committed by GitHub
commit f257e0ea6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
BUILD.bazel
View File

@ -51,7 +51,10 @@ py_binary(
genrule( genrule(
name = "gen_build_info_h", name = "gen_build_info_h",
srcs = ["CHANGES.md", "build_info.h.tmpl"], srcs = [
"CHANGES.md",
"build_info.h.tmpl",
],
outs = ["glslang/build_info.h"], outs = ["glslang/build_info.h"],
cmd = "$(location build_info) $$(dirname $(location CHANGES.md)) -i $(location build_info.h.tmpl) -o $(location glslang/build_info.h)", cmd = "$(location build_info) $$(dirname $(location CHANGES.md)) -i $(location build_info.h.tmpl) -o $(location glslang/build_info.h)",
tools = [":build_info"], tools = [":build_info"],
@ -92,10 +95,8 @@ cc_library(
) + [ ) + [
"OGLCompilersDLL/InitializeDll.cpp", "OGLCompilersDLL/InitializeDll.cpp",
] + select({ ] + select({
"@bazel_tools//src/conditions:windows": "@bazel_tools//src/conditions:windows": ["glslang/OSDependent/Windows/ossource.cpp"],
["glslang/OSDependent/Windows/ossource.cpp"], "//conditions:default": ["glslang/OSDependent/Unix/ossource.cpp"],
"//conditions:default":
["glslang/OSDependent/Unix/ossource.cpp"],
}), }),
hdrs = glob([ hdrs = glob([
"glslang/HLSL/*.h", "glslang/HLSL/*.h",
@ -118,7 +119,10 @@ cc_library(
], ],
linkopts = select({ linkopts = select({
"@bazel_tools//src/conditions:windows": [""], "@bazel_tools//src/conditions:windows": [""],
"//conditions:default": ["-lm", "-lpthread"], "//conditions:default": [
"-lm",
"-lpthread",
],
}), }),
linkstatic = 1, linkstatic = 1,
) )
@ -224,18 +228,6 @@ cc_binary(
], ],
) )
filegroup(
name = "test_files",
srcs = glob(
["Test/**"],
exclude = [
"Test/bump",
"Test/glslangValidator",
"Test/runtests",
],
),
)
cc_library( cc_library(
name = "glslang_test_lib", name = "glslang_test_lib",
testonly = 1, testonly = 1,
@ -249,16 +241,9 @@ cc_library(
"gtests/main.cpp", "gtests/main.cpp",
], ],
copts = COMMON_COPTS, copts = COMMON_COPTS,
data = [":test_files"], defines = [
defines = select({ "GLSLANG_TEST_DIRECTORY='\"USE_FLAG_INSTEAD\"'",
# Unfortunately we can't use $(location) in cc_library at the moment. ],
# See https://github.com/bazelbuild/bazel/issues/1023
# So we'll specify the path manually.
"@bazel_tools//src/conditions:windows":
["GLSLANG_TEST_DIRECTORY='\"../../../../../Test\"'"],
"//conditions:default":
["GLSLANG_TEST_DIRECTORY='\"Test\"'"],
}),
linkstatic = 1, linkstatic = 1,
deps = [ deps = [
":SPIRV", ":SPIRV",
@ -281,9 +266,13 @@ GLSLANG_TESTS = glob(
[cc_test( [cc_test(
name = test_file.replace("gtests/", "").replace(".FromFile.cpp", "") + "_test", name = test_file.replace("gtests/", "").replace(".FromFile.cpp", "") + "_test",
srcs = [test_file], srcs = [test_file],
args = [
"--test-root",
"$(rootpath Test)",
],
copts = COMMON_COPTS, copts = COMMON_COPTS,
data = [ data = [
":test_files", "Test",
], ],
deps = [ deps = [
":SPIRV", ":SPIRV",