ezelkow1 commented on code in PR #13892: URL: https://github.com/apache/trafficserver/pull/13892#discussion_r4383108308
########## tests/Makefile.am: ########## @@ -30,17 +30,28 @@ AM_LDFLAGS += $(TS_PLUGIN_LD_FLAGS) # generation of so objects for these test files. AM_LDFLAGS += -rpath $(abs_builddir) -include gold_tests/bigobj/Makefile.inc -include gold_tests/at_headers/plugins/Makefile.inc -include gold_tests/continuations/plugins/Makefile.inc -include gold_tests/chunked_encoding/Makefile.inc -include gold_tests/pluginTest/tsapi/Makefile.inc -include gold_tests/timeout/Makefile.inc -include gold_tests/tls/Makefile.inc +include uranium_tests/bigobj/Makefile.inc +include uranium_tests/at_headers/plugins/Makefile.inc +include uranium_tests/continuations/plugins/Makefile.inc +include uranium_tests/chunked_encoding/Makefile.inc +include uranium_tests/pluginTest/tsapi/Makefile.inc +include uranium_tests/timeout/Makefile.inc +include uranium_tests/tls/Makefile.inc include tools/plugins/Makefile.inc TESTS = $(check_PROGRAMS) +.PHONY: urtest urtest-replay +urtest: + bash ./urtest.sh $(URTEST_OPTIONS) + +urtest-replay: + bash ./urtest.sh -m replay $(URTEST_OPTIONS) + +EXTRA_DIST = urtest.sh urtest.sh.in pyproject.toml uv.lock Review Comment: Looks good overall. One packaging nit with `urtest.sh` in `EXTRA_DIST`: When `configure` runs from a separate build directory, `configure.ac` (around L2397) generates `tests/urtest.sh` in that build directory. In-tree builds generate `urtest-configured.sh` instead. Automake's `distdir` takes `EXTRA_DIST` files from the build directory before the source directory, so an out-of-tree `make dist` ships the *generated* `urtest.sh`, with the builder's absolute src/build/prefix paths baked in, instead of the tracked launcher. If you unpack that tarball and configure in-tree, you get `urtest-configured.sh`. But `make urtest` runs the shipped `urtest.sh`, which is the stale generated copy, not the launcher. So it never hands off to `urtest-configured.sh` and points at paths that don't exist on your machine. A couple of possible fixes: - Always generate `urtest-configured.sh`, whether in-tree or out-of-tree, so the generated file never shadows the tracked one. The out-of-tree case would then need the `urtest`/`urtest-replay` targets to run the configured script from the build dir, since the tracked launcher only looks for it next to itself. - Or, as a minimal fix, add a `dist-hook` that copies `$(srcdir)/urtest.sh` over `$(distdir)/urtest.sh`. The first one seems cleaner to me, but either works. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
