From 2274627436257c28a82cedec28e18398a517b51d Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Wed, 29 May 2024 13:01:01 +0200 Subject: test: Use own installed just and just-mr targets... ...which do not stage also the debug source and header files (while in debug mode), as this is unnecessary bloat in the tests. As the tool-under-test and mr-tool-under-test targets should be used instead of the regular install targets also in the various extra rules in end-to-end and utils, move their definition in the outmost test TARGETS file. --- test/end-to-end/cli/TARGETS | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'test/end-to-end/cli/TARGETS') diff --git a/test/end-to-end/cli/TARGETS b/test/end-to-end/cli/TARGETS index b0c97bc8..03f1db49 100644 --- a/test/end-to-end/cli/TARGETS +++ b/test/end-to-end/cli/TARGETS @@ -2,67 +2,63 @@ { "type": ["@", "rules", "shell/test", "script"] , "name": ["defaults"] , "test": ["defaults.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "pwd": { "type": ["@", "rules", "shell/test", "script"] , "name": ["pwd"] , "test": ["pwd.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "install": { "type": ["@", "rules", "shell/test", "script"] , "name": ["install"] , "test": ["install.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "analyse": { "type": ["@", "rules", "shell/test", "script"] , "name": ["analyse"] , "test": ["analyse.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "build -P": { "type": ["@", "rules", "shell/test", "script"] , "name": ["build-P"] , "test": ["build-p.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "git cas -P": { "type": ["@", "rules", "shell/test", "script"] , "name": ["git-cas-P"] , "test": ["git-cas-p.sh"] - , "deps": - [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]] + , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] } , "just-mr reporting": { "type": ["@", "rules", "shell/test", "script"] , "name": ["just-mr-reporting"] , "test": ["just-mr-reporting.sh"] - , "deps": - [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]] + , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] , "keep": ["log/warning.txt"] } , "install --archive": { "type": ["@", "rules", "shell/test", "script"] , "name": ["install-archive"] , "test": ["install-archive.sh"] - , "deps": - [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]] + , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] , "keep": ["src.tar", "reconstructed.tar", "fromstdout.tar"] } , "conflict report": { "type": ["@", "rules", "shell/test", "script"] , "name": ["conflict-report"] , "test": ["conflict-report.sh"] - , "deps": [["end-to-end", "tool-under-test"]] + , "deps": [["", "tool-under-test"]] } , "log limit": { "type": ["@", "rules", "shell/test", "script"] , "name": ["log-limit"] , "test": ["log-limit.sh"] - , "deps": - [["end-to-end", "tool-under-test"], ["end-to-end", "mr-tool-under-test"]] + , "deps": [["", "tool-under-test"], ["", "mr-tool-under-test"]] } , "TESTS": { "type": "install" -- cgit v1.2.3