always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bazel: rework tests

Browse Source
This commit is contained in:
Corentin Le Molgat
2022-07-27 16:45:14 +02:00
parent cd19d9bb9d
commit 1c95a2c00e
12 changed files with 69 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ortools/algorithms/samples/code_samples.bzl
View File

@@ -15,7 +15,7 @@
def code_sample_cc(name):
native.cc_binary(
name = name,
name = name + "_cc",
srcs = [name + ".cc"],
deps = [
"//ortools/algorithms:knapsack_solver_lib",
@@ -23,11 +23,11 @@ def code_sample_cc(name):
)
native.cc_test(
name = name + "_test",
name = name + "_cc_test",
size = "small",
srcs = [name + ".cc"],
deps = [
":" + name,
":" + name + "_cc",
"//ortools/algorithms:knapsack_solver_lib",
],
)

6
ortools/constraint_solver/samples/code_samples.bzl
View File

@@ -15,7 +15,7 @@
def code_sample_cc(name):
native.cc_binary(
name = name,
name = name + "_cc",
srcs = [name + ".cc"],
deps = [
"//ortools/base",
@@ -27,11 +27,11 @@ def code_sample_cc(name):
)
native.cc_test(
name = name + "_test",
name = name + "_cc_test",
size = "small",
srcs = [name + ".cc"],
deps = [
":" + name,
":" + name + "_cc",
"//ortools/base",
"//ortools/constraint_solver:cp",
"//ortools/constraint_solver:routing",

6
ortools/glop/samples/code_samples.bzl
View File

@@ -15,7 +15,7 @@
def code_sample_cc(name):
native.cc_binary(
name = name,
name = name + "_cc",
srcs = [name + ".cc"],
deps = [
"//ortools/base",
@@ -25,11 +25,11 @@ def code_sample_cc(name):
)
native.cc_test(
name = name + "_test",
name = name + "_cc_test",
size = "small",
srcs = [name + ".cc"],
deps = [
":" + name,
":" + name + "_cc",
"//ortools/base",
"//ortools/glop:lp_solver",
"//ortools/lp_data",

33
ortools/graph/samples/code_samples.bzl
View File

@@ -13,7 +13,6 @@
"""Helper macro to compile and test code samples."""
load("@rules_python//python:defs.bzl", "py_binary")
load("@ortools_deps//:requirements.bzl", "requirement")
def code_sample_cc(name):
@@ -31,18 +30,24 @@ def code_sample_cc(name):
],
)
native.sh_test(
native.cc_test(
name = name + "_cc_test",
size = "small",
srcs = ["code_samples_cc_test.sh"],
args = [name],
data = [
srcs = [name + ".cc"],
deps = [
":" + name + "_cc",
"//ortools/base",
"//ortools/graph:assignment",
"//ortools/graph:ebert_graph",
"//ortools/graph:linear_assignment",
"//ortools/graph:max_flow",
"//ortools/graph:min_cost_flow",
"//ortools/graph:shortestpaths",
],
)
def code_sample_py(name):
py_binary(
native.py_binary(
name = name + "_py3",
srcs = [name + ".py"],
main = name + ".py",
@@ -59,14 +64,22 @@ def code_sample_py(name):
srcs_version = "PY3",
)
native.sh_test(
native.py_test(
name = name + "_py_test",
size = "small",
srcs = ["code_samples_py_test.sh"],
args = [name],
srcs = [name + ".py"],
main = name + ".py",
data = [
":" + name + "_py3",
"//ortools/graph/python:linear_sum_assignment.so",
"//ortools/graph/python:min_cost_flow.so",
"//ortools/graph/python:max_flow.so",
],
deps = [
requirement("absl-py"),
requirement("numpy"),
],
python_version = "PY3",
srcs_version = "PY3",
)
def code_sample_cc_py(name):

22
ortools/graph/samples/code_samples_cc_test.sh
View File

@@ -1,22 +0,0 @@
#!/usr/bin/env bash
# Copyright 2010-2022 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
declare -r DIR="${TEST_SRCDIR}/com_google_ortools/ortools/graph/samples"
function test::ortools::code_samples_graph_cc() {
"${DIR}/$1_cc"
}
test::ortools::code_samples_graph_cc $1

22
ortools/graph/samples/code_samples_py_test.sh
View File

@@ -1,22 +0,0 @@
#!/usr/bin/env bash
# Copyright 2010-2022 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
declare -r DIR="${TEST_SRCDIR}/com_google_ortools/ortools/graph/samples"
function test::ortools::code_samples_graph_py() {
"${DIR}/$1_py3"
}
test::ortools::code_samples_graph_py $1

6
ortools/linear_solver/samples/code_samples.bzl
View File

@@ -2,7 +2,7 @@
def code_sample_cc(name):
native.cc_binary(
name = name,
name = name + "_cc",
srcs = [name + ".cc"],
deps = [
"//ortools/base",
@@ -12,11 +12,11 @@ def code_sample_cc(name):
)
native.cc_test(
name = name+"_test",
name = name + "_cc_test",
size = "small",
srcs = [name + ".cc"],
deps = [
":"+name,
":" + name + "_cc",
"//ortools/base",
"//ortools/linear_solver",
"//ortools/linear_solver:linear_solver_cc_proto",

26
ortools/model_builder/samples/code_samples.bzl
View File

@@ -14,11 +14,10 @@
"""Helper macro to compile and test code samples."""
load("@ortools_deps//:requirements.bzl", "requirement")
load("@rules_python//python:defs.bzl", "py_binary")
def code_sample_cc(name):
native.cc_binary(
name = name,
name = name + "_cc",
srcs = [name + ".cc"],
deps = [
"//ortools/base",
@@ -28,11 +27,11 @@ def code_sample_cc(name):
)
native.cc_test(
name = name + "_test",
name = name + "_cc_test",
size = "small",
srcs = [name + ".cc"],
deps = [
":" + name,
":" + name + "_cc",
"//ortools/base",
"//ortools/linear_solver",
"//ortools/linear_solver:linear_solver_cc_proto",
@@ -40,7 +39,7 @@ def code_sample_cc(name):
)
def code_sample_py(name):
py_binary(
native.py_binary(
name = name + "_py3",
srcs = [name + ".py"],
main = name + ".py",
@@ -52,12 +51,21 @@ def code_sample_py(name):
srcs_version = "PY3",
)
native.sh_test(
native.py_test(
name = name + "_py_test",
size = "small",
srcs = ["code_samples_py_test.sh"],
args = [name],
srcs = [name + ".py"],
main = name + ".py",
data = [
":" + name + "_py3",
"//ortools/model_builder/python:model_builder",
],
deps = [
requirement("absl-py"),
],
python_version = "PY3",
srcs_version = "PY3",
)
def code_sample_cc_py(name):
code_sample_cc(name = name)
code_sample_py(name = name)

22
ortools/model_builder/samples/code_samples_py_test.sh
View File

@@ -1,22 +0,0 @@
#!/usr/bin/env bash
# Copyright 2010-2022 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
declare -r DIR="${TEST_SRCDIR}/com_google_ortools/ortools/model_builder/samples"
function test::ortools::code_samples_model_builder_py() {
"${DIR}/$1_py3"
}
test::ortools::code_samples_model_builder_py $1

27
ortools/sat/samples/code_samples.bzl
View File

@@ -13,7 +13,6 @@
"""Helper macro to compile and test code samples."""
load("@rules_python//python:defs.bzl", "py_binary")
load("@ortools_deps//:requirements.bzl", "requirement")
def code_sample_cc(name):
@@ -28,18 +27,21 @@ def code_sample_cc(name):
],
)
native.sh_test(
native.cc_test(
name = name + "_cc_test",
size = "small",
srcs = ["code_samples_cc_test.sh"],
args = [name],
data = [
srcs = [name + ".cc"],
deps = [
":" + name + "_cc",
"//ortools/sat:cp_model",
"//ortools/sat:cp_model_solver",
"//ortools/util:sorted_interval_list",
"@com_google_absl//absl/types:span",
],
)
def code_sample_py(name):
py_binary(
native.py_binary(
name = name + "_py3",
srcs = [name + ".py"],
main = name + ".py",
@@ -51,14 +53,19 @@ def code_sample_py(name):
srcs_version = "PY3",
)
native.sh_test(
native.py_test(
name = name + "_py_test",
size = "small",
srcs = ["code_samples_py_test.sh"],
args = [name],
srcs = [name + ".py"],
main = name + ".py",
data = [
":" + name + "_py3",
"//ortools/sat/python:cp_model",
],
deps = [
requirement("absl-py"),
],
python_version = "PY3",
srcs_version = "PY3",
)
def code_sample_cc_py(name):

21
ortools/sat/samples/code_samples_cc_test.sh
View File

@@ -1,21 +0,0 @@
#!/usr/bin/env bash
# Copyright 2010-2022 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
declare -r DIR="${TEST_SRCDIR}/com_google_ortools/ortools/sat/samples"
function test::ortools::code_samples_sat_cc() {
"${DIR}/$1_cc"
}
test::ortools::code_samples_sat_cc $1

21
ortools/sat/samples/code_samples_py_test.sh
View File

@@ -1,21 +0,0 @@
#!/usr/bin/env bash
# Copyright 2010-2022 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
declare -r DIR="${TEST_SRCDIR}/com_google_ortools/ortools/sat/samples"
function test::ortools::code_samples_sat_py() {
"${DIR}/$1_py3"
}
test::ortools::code_samples_sat_py $1