From f3ebd8bb80609cbf8c9a9644baefda40c78a44f1 Mon Sep 17 00:00:00 2001 From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:20:44 -0700 Subject: [PATCH] Add placeholders for further testing (#10336) * Fix comments in cmake test files * Add placeholder tests --- kokoro/linux/cmake/build.sh | 2 +- kokoro/linux/cmake_install/build.sh | 2 +- kokoro/linux/cmake_ninja/build.sh | 2 +- kokoro/linux/cmake_shared/build.sh | 7 +++++++ kokoro/linux/cmake_shared/continuous.cfg | 11 +++++++++++ kokoro/linux/cmake_shared/presubmit.cfg | 11 +++++++++++ kokoro/windows/bazel/build.bat | 4 ++++ kokoro/windows/bazel/continuous.cfg | 5 +++++ kokoro/windows/bazel/presubmit.cfg | 5 +++++ kokoro/windows/cmake_shared/build.bat | 4 ++++ kokoro/windows/cmake_shared/continuous.cfg | 5 +++++ kokoro/windows/cmake_shared/presubmit.cfg | 5 +++++ 12 files changed, 60 insertions(+), 3 deletions(-) create mode 100755 kokoro/linux/cmake_shared/build.sh create mode 100644 kokoro/linux/cmake_shared/continuous.cfg create mode 100644 kokoro/linux/cmake_shared/presubmit.cfg create mode 100644 kokoro/windows/bazel/build.bat create mode 100644 kokoro/windows/bazel/continuous.cfg create mode 100644 kokoro/windows/bazel/presubmit.cfg create mode 100644 kokoro/windows/cmake_shared/build.bat create mode 100644 kokoro/windows/cmake_shared/continuous.cfg create mode 100644 kokoro/windows/cmake_shared/presubmit.cfg diff --git a/kokoro/linux/cmake/build.sh b/kokoro/linux/cmake/build.sh index 1b0ebfc5fa..523253da25 100755 --- a/kokoro/linux/cmake/build.sh +++ b/kokoro/linux/cmake/build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Build file to set up and run tests based on distribution archive +# Build file to set up and run tests using CMake set -eux diff --git a/kokoro/linux/cmake_install/build.sh b/kokoro/linux/cmake_install/build.sh index 6fdafa557e..7fdf267f74 100755 --- a/kokoro/linux/cmake_install/build.sh +++ b/kokoro/linux/cmake_install/build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Build file to set up and run tests based on distribution archive +# Build file to build, install, and test using CMake. set -eux diff --git a/kokoro/linux/cmake_ninja/build.sh b/kokoro/linux/cmake_ninja/build.sh index d3a281f9ec..21cc01e56a 100755 --- a/kokoro/linux/cmake_ninja/build.sh +++ b/kokoro/linux/cmake_ninja/build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Build file to set up and run tests based on distribution archive +# Build file to set up and run tests using CMake with the Ninja generator. set -eux diff --git a/kokoro/linux/cmake_shared/build.sh b/kokoro/linux/cmake_shared/build.sh new file mode 100755 index 0000000000..87dde411c7 --- /dev/null +++ b/kokoro/linux/cmake_shared/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash +# +# Build file to set up and run tests via CMake using shared libraries + +set -eux + +# TODO(mkruskal) Implement this. \ No newline at end of file diff --git a/kokoro/linux/cmake_shared/continuous.cfg b/kokoro/linux/cmake_shared/continuous.cfg new file mode 100644 index 0000000000..f03bd3945f --- /dev/null +++ b/kokoro/linux/cmake_shared/continuous.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cmake_shared/presubmit.cfg b/kokoro/linux/cmake_shared/presubmit.cfg new file mode 100644 index 0000000000..f03bd3945f --- /dev/null +++ b/kokoro/linux/cmake_shared/presubmit.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/windows/bazel/build.bat b/kokoro/windows/bazel/build.bat new file mode 100644 index 0000000000..52b83f4666 --- /dev/null +++ b/kokoro/windows/bazel/build.bat @@ -0,0 +1,4 @@ +@rem enter repo root +cd /d %~dp0\..\..\.. + +@rem TODO(mkruskal) Implement tests diff --git a/kokoro/windows/bazel/continuous.cfg b/kokoro/windows/bazel/continuous.cfg new file mode 100644 index 0000000000..37e89e068b --- /dev/null +++ b/kokoro/windows/bazel/continuous.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/bazel/presubmit.cfg b/kokoro/windows/bazel/presubmit.cfg new file mode 100644 index 0000000000..37e89e068b --- /dev/null +++ b/kokoro/windows/bazel/presubmit.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake_shared/build.bat b/kokoro/windows/cmake_shared/build.bat new file mode 100644 index 0000000000..52b83f4666 --- /dev/null +++ b/kokoro/windows/cmake_shared/build.bat @@ -0,0 +1,4 @@ +@rem enter repo root +cd /d %~dp0\..\..\.. + +@rem TODO(mkruskal) Implement tests diff --git a/kokoro/windows/cmake_shared/continuous.cfg b/kokoro/windows/cmake_shared/continuous.cfg new file mode 100644 index 0000000000..37e89e068b --- /dev/null +++ b/kokoro/windows/cmake_shared/continuous.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake_shared/presubmit.cfg b/kokoro/windows/cmake_shared/presubmit.cfg new file mode 100644 index 0000000000..37e89e068b --- /dev/null +++ b/kokoro/windows/cmake_shared/presubmit.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake/build.bat" +timeout_mins: 1440