diff options
| author |  Yun Peng <pcloudy@google.com> | 2016-08-10 17:12:31 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-08-11 09:14:08 +0000 |
| commit | f5c46c4a99291d2c53d8cbd0fb079c77bf15d8ce (patch) | |
| tree | 39e9eeadbe2d5549168cf1f3eadd9c9b897122f1 /src/test/shell/bazel/bazel_windows_example_test.sh | |
| parent | c511cb53595cd724900fff026c45b2702950f115 (diff) | |
Put runfiles tree under 'runfiles' directory to avoid conflict
Currently, in python executable zip file, the default workspace
name "__main__" conflicts with __main__.py file.
This change fixes it.
Also refactored the bazel_windows_example_test
--
Change-Id: I8b9d64d72335148dba41032ce93643d34670a771
Reviewed-on: https://bazel-review.googlesource.com/#/c/5351
MOS_MIGRATED_REVID=129879570
Diffstat (limited to 'src/test/shell/bazel/bazel_windows_example_test.sh')
| -rwxr-xr-x | src/test/shell/bazel/bazel_windows_example_test.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/test/shell/bazel/bazel_windows_example_test.sh b/src/test/shell/bazel/bazel_windows_example_test.sh index ab31786199..2d62c57007 100755 --- a/src/test/shell/bazel/bazel_windows_example_test.sh +++ b/src/test/shell/bazel/bazel_windows_example_test.sh @@ -85,13 +85,8 @@ function test_java_test() { } function test_native_python() { - assert_build //examples/py_native:bin --python2_path=python - assert_test_ok //examples/py_native:test --python2_path=python - assert_test_fails //examples/py_native:fail --python2_path=python -} - -function test_native_python_with_zip() { - assert_build //examples/py_native:bin --python2_path=python --build_python_zip + # On windows, we build a python executable zip as the python binary + assert_build //examples/py_native:bin # run the python package directly ./bazel-bin/examples/py_native/bin >& $TEST_log \ || fail "//examples/py_native:bin execution failed" @@ -100,8 +95,8 @@ function test_native_python_with_zip() { python ./bazel-bin/examples/py_native/bin >& $TEST_log \ || fail "//examples/py_native:bin execution failed" expect_log "Fib(5) == 8" - assert_test_ok //examples/py_native:test --python2_path=python --build_python_zip - assert_test_fails //examples/py_native:fail --python2_path=python --build_python_zip + assert_test_ok //examples/py_native:test + assert_test_fails //examples/py_native:fail } run_suite "examples on Windows" |