aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell/integration/BUILD
diff options
context:
space:
mode:
authorGravatar Luis Fernando Pino Duque <lpino@google.com>2016-10-18 14:28:42 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2016-10-19 08:26:02 +0000
commitfa389066641ac7f92b220ef232f23e757704318d (patch)
treecfedd733426e8b7b95b87105bd6344a6c0154983 /src/test/shell/integration/BUILD
parentaecf826aa0cd12d25a8f6d69604d721f50d940f0 (diff)
Create a proper wrapper script for executing "bazel" in the integration tests.
Currently a call to "bazel" in an integration test means calling a (quite hidden) function in test-setup.sh which actually calls "$bazel" defined in "shell/bazel/testenv.sh" which is equal to "$(rlocation io_bazel/src/bazel)". This is extremely confusing and error prone. The new mechanism is to add a wrapper script to shell/bin called bazel and export this directory to the PATH. Moreover, not every test loads the same test environment, for instance consider how bazel_query_test loads the test environment: - Load shell/integration/testenv.sh which loads, - shell/bazel/test-setup.sh which loads, - shell/bazel/testenv.sh which loads, - shell/unittest.bash which loads, - shell/testenv.sh Again this is error prone and specially hard to understand, in fact each test writer needs to decide which of these testenv to load. This change fixes all of this by having only one testenv.sh and summarizing the test setup in integration_test_setup.sh. Namely, for any new integration test, the developer needs to load integration_test_setup to get the environment set up including the unittest framework (also it helps to attract contributions). This change also allows to open sourcing client_sigint_test: Since bazel was a function client_sigint_test was using a wrong process id to interrupt the build. The problem is that $! returns bash's id instead of the id of the process running in the background when using a function instead of an executable. A few tests needed to be adapted to the new infrastructure. -- MOS_MIGRATED_REVID=136470360
Diffstat (limited to 'src/test/shell/integration/BUILD')
-rw-r--r--src/test/shell/integration/BUILD11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 8549758013..eb131b11c6 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -10,7 +10,6 @@ filegroup(
name = "test-deps",
testonly = 1,
srcs = [
- "testenv.sh",
"//src/test/shell/bazel:test-deps",
],
)
@@ -126,6 +125,16 @@ sh_test(
)
sh_test(
+ name = "client_sigint_test",
+ size = "medium",
+ srcs = ["client_sigint_test.sh"],
+ data = [":test-deps"],
+ # This test doesn't work with the sandbox on, see the source file
+ # for details.
+ tags = ["local"],
+)
+
+sh_test(
name = "ide_info_generation",
size = "large",
srcs = ["ide_info_generation.sh"],