libbeat/scripts: make testsuite target re-runnable #3925
Conversation
Right now when you run `make testsuite` multiple times, it usually fails for a couple of reasons:
- `${BEAT_NAME}.template*.json` may or may not be there
- `make clean` and `make update` step on each other
I resolved the former by adding a `-f` to the `rm` command, and the latter by having `make clean` and `make update` run
serially in `make testsuite` instead of in parallel.
| @@ -118,7 +118,7 @@ clean:: ## @build Cleans up all files generated by the build steps | |||
| # Clean index pattern | |||
| rm -f $(PWD)/_meta/kibana/index-pattern/${BEAT_NAME}.json | |||
| # Remove temp templates | |||
| -rm ${BEAT_NAME}.template*.json | |||
There was a problem hiding this comment.
This should not be needed anymore on master as no templates are generated anymore. All are loaded dynamically from fields.yml.
There was a problem hiding this comment.
Ok I'll remove it completely
There was a problem hiding this comment.
I should have been more accurate here. It is still possible to generate the template through make index-template so removing can be still needed. But it (should) have no effect on the build as it is not used.
libbeat/scripts/Makefile
Outdated
| @@ -209,7 +209,8 @@ test: unit | |||
|
|
|||
| .PHONY: testsuite | |||
| testsuite: ## @testing Runs all tests and generates the coverage reports | |||
| testsuite: clean update | |||
There was a problem hiding this comment.
what is the difference here?
There was a problem hiding this comment.
clean and update won't run in parallel, right now from what I can tell (on my laptop) they end up running in parallel and update tries to invoke activate from the build dir right after clean deleted all of it
|
It might be we try to fix a similar issue? #3922 |
libbeat/scripts/Makefile
Outdated
| @@ -209,7 +209,8 @@ test: unit | |||
|
|
|||
| .PHONY: testsuite | |||
| testsuite: ## @testing Runs all tests and generates the coverage reports | |||
| testsuite: clean update | |||
There was a problem hiding this comment.
clean and update won't run in parallel, right now from what I can tell (on my laptop) they end up running in parallel and update tries to invoke activate from the build dir right after clean deleted all of it
| @@ -118,7 +118,7 @@ clean:: ## @build Cleans up all files generated by the build steps | |||
| # Clean index pattern | |||
| rm -f $(PWD)/_meta/kibana/index-pattern/${BEAT_NAME}.json | |||
| # Remove temp templates | |||
| -rm ${BEAT_NAME}.template*.json | |||
|
@7AC It would make sense to add somewhere a note that we don't support -j. |
Right now when you run
make testsuitemultiple times, it sometimes fails if${BEAT_NAME}.template*.jsonis not there. I added a-fto thermcommand.