Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Tests Fix #3638

Closed
wants to merge 4 commits into from
Closed

Integration Tests Fix #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d240add
chore(tests): integration changes
geyslan Oct 30, 2023
12228df
fix(tests): integration timeout handling
geyslan Oct 30, 2023
0650e61
fix(tests): on error stop tracee gracefully
geyslan Oct 31, 2023
a8d94ad
chore: bring some colour into tests life
geyslan Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 38 additions & 5 deletions Makefile
View file
Open in desktop
Expand Up @@ -704,6 +704,31 @@ clean-e2e-inst-signatures:
#
$(CMD_RM) -rf $(OUTPUT_DIR)/e2e-inst-signatures


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a no for me, sorry. I love colors but dont want to start having to deal with ansi color codes and bugs born from that. Also, makes the makefile very ugly, hope you dont mind removing this.

AWK_CMD_TEST_COLOR = '{ \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comment below. I'm +1 without the colors/awk change in Makefile. I'm giving +1, feel free to merge, but please remove the colors logic (we have -1 other changes that did similar things in the past).

if (/^===/) { \
match($$0, /^=== [^ ]+/); \
printf "\033[34m%s\033[0m", substr($$0, 1, RLENGTH); \
printf "\033[38;5;208m%s\033[0m\n", substr($$0, RLENGTH + 1); \
} else if (/^--- PASS:/) { \
printf "\033[32m%s\033[0m", substr($$0, 1, 4); \
match($$0, /PASS/); \
printf "\033[42;30m%s\033[0m", substr($$0, RSTART, RLENGTH); \
printf "\033[32m%s\033[0m\n", substr($$0, RSTART + RLENGTH); \
} else if (/^PASS$$/) { \
printf "\033[42;30m%s\033[0m\n", $$0; \
} else if (/^--- FAIL:/) { \
printf "\033[91m%s\033[0m", substr($$0, 1, 4); \
match($$0, /FAIL/); \
printf "\033[41;37m%s\033[0m", substr($$0, RSTART, RLENGTH); \
printf "\033[91m%s\033[0m\n", substr($$0, RSTART + RLENGTH); \
} else if (/^FAIL$$/) { \
printf "\033[41m\033[97m%s\033[0m\n", $$0; \
} else { \
print \
} \
}'

#
# unit tests
#
Expand All @@ -712,7 +737,8 @@ clean-e2e-inst-signatures:
test-unit: \
.checkver_$(CMD_GO) \
tracee-ebpf \
test-types
test-types \
| .check_$(CMD_AWK)
#
@$(GO_ENV_EBPF) \
$(CMD_GO) test \
Expand All @@ -725,10 +751,12 @@ test-unit: \
./cmd/... \
./pkg/... \
./signatures/... \
| awk $(AWK_CMD_TEST_COLOR)

.PHONY: test-types
test-types: \
.checkver_$(CMD_GO)
.checkver_$(CMD_GO) \
| .check_$(CMD_AWK)
#
# Note that we must changed the directory here because types is a standalone Go module.
@cd ./types && $(CMD_GO) test \
Expand All @@ -737,7 +765,8 @@ test-types: \
-shuffle on \
-v \
-coverprofile=coverage.txt \
./...
./... \
| awk $(AWK_CMD_TEST_COLOR)

#
# integration tests
Expand All @@ -755,7 +784,8 @@ $(OUTPUT_DIR)/syscaller: \
test-integration: \
.checkver_$(CMD_GO) \
$(OUTPUT_DIR)/syscaller \
tracee-ebpf
tracee-ebpf \
| .check_$(CMD_AWK)
#
@$(GO_ENV_EBPF) \
$(CMD_GO) test \
Expand All @@ -770,6 +800,7 @@ test-integration: \
-p 1 \
-count=1 \
./tests/integration/... \
| awk $(AWK_CMD_TEST_COLOR)

.PHONY: test-signatures
test-signatures: \
Expand All @@ -791,7 +822,8 @@ test-upstream-libbpfgo: \
.PHONY: test-performance
test-performance: \
.checkver_$(CMD_GO) \
tracee
tracee \
| .check_$(CMD_AWK)
#
@$(GO_ENV_EBPF) \
$(CMD_GO) test \
Expand All @@ -806,6 +838,7 @@ test-performance: \
-p 1 \
-count=1 \
./tests/perftests/... \
| awk $(AWK_CMD_TEST_COLOR)

#
# code checkers (hidden from help on purpose)
Expand Down