Move cmdline arg parsing to a separate compilation unit (with tests).
This CL takes `QCHECK_OK`s (related to --public_headers,
--targets_and_headers and other cmdline parameters) from
`rs_bindings_from_cc.cc` and moves them into separate (unit-testable!)
functions in a new compilation unit. The old behavior is mostly
preserved, except for the following:
*) instead of `QCHECK`-ing the new functions return an
`absl::StatusOr<...>`.
*) --do_nothing is applied later, after validation of *all* cmdline
arguments
*) some error messages may have been tweaked
PiperOrigin-RevId: 431974972
diff --git a/rs_bindings_from_cc/test/rs_bindings_from_cc_test.sh b/rs_bindings_from_cc/test/rs_bindings_from_cc_test.sh
index 5b1dfe8..df87171 100755
--- a/rs_bindings_from_cc/test/rs_bindings_from_cc_test.sh
+++ b/rs_bindings_from_cc/test/rs_bindings_from_cc_test.sh
@@ -31,7 +31,7 @@
"\"${RS_BINDINGS_FROM_CC}\" \
--rs_out=\"${rs_out}\" \
--cc_out=\"${cc_out}\" 2>&1 | \
- grep 'please specify at least one header in --public_headers' > /dev/null" \
+ grep 'please specify --public_headers' > /dev/null" \
"generator should show help message for --public_headers"
local hdr="${TEST_TMPDIR}/hello_world.h"
@@ -65,11 +65,19 @@
function test::do_nothing() {
local rs_out="${TEST_TMPDIR}/rs_api.rs"
local cc_out="${TEST_TMPDIR}/rs_api_impl.cc"
+ local hdr="no_such_file.h"
+ local json
+ json="$(cat <<-EOT
+ [{"t": "//foo/bar:baz", "h": ["${hdr}"]}]
+EOT
+)"
EXPECT_SUCCEED \
"\"${RS_BINDINGS_FROM_CC}\" \
--rs_out=\"${rs_out}\" \
--cc_out=\"${cc_out}\" \
+ --public_headers=\"${hdr}\" \
+ --targets_and_headers=\"$(echo "${json}" | quote_escape)\" \
--do_nothing"
EXPECT_FILE_NOT_EMPTY "${rs_out}"
@@ -82,9 +90,8 @@
function test::tool_returns_nonzero_on_invalid_input() {
local rs_out="${TEST_TMPDIR}/rs_api.rs"
local cc_out="${TEST_TMPDIR}/rs_api_impl.cc"
-
- # Creating outputs so we can observe if the tool deletes them.
- touch "${rs_out}" "${cc_out}"
+ rm -rf "$rs_out"
+ rm -rf "$cc_out"
local hdr="${TEST_TMPDIR}/hello_world.h"
echo "int foo(); But this is not C++;" > "${hdr}"
@@ -101,6 +108,7 @@
--public_headers=\"${hdr}\" \
--targets_and_headers=\"$(echo "${json}" | quote_escape)\" 2>&1"
+ # No output files should be created if the C++ input was invalid.
CHECK_FILE_NOT_EXISTS "${rs_out}"
CHECK_FILE_NOT_EXISTS "${cc_out}"
}
