diff mbox series

[3/7] tools: Keep test_util and patman test files in the pip release

Message ID 20231119153611.639252-4-sjg@chromium.org
State Accepted
Commit f12465ce91ea487b64afbdcd26147c723301b792
Delegated to: Simon Glass
Headers show
Series doc: tools: Tidy up toml files for a new release | expand

Commit Message

Simon Glass Nov. 19, 2023, 3:36 p.m. UTC
The test_util module is actually imported by some tools, e.g. binman so
include it in the pip release.

The patman tool uses its test code when starting up, so keep that too.

Show a list of deleted files so it is clear what is happening.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 scripts/make_pip.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Simon Glass Dec. 13, 2023, 8:39 p.m. UTC | #1
The test_util module is actually imported by some tools, e.g. binman so
include it in the pip release.

The patman tool uses its test code when starting up, so keep that too.

Show a list of deleted files so it is clear what is happening.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 scripts/make_pip.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Applied to u-boot-dm/next, thanks!
diff mbox series

Patch

diff --git a/scripts/make_pip.sh b/scripts/make_pip.sh
index 4602dcf61c88..25a4049271c9 100755
--- a/scripts/make_pip.sh
+++ b/scripts/make_pip.sh
@@ -29,6 +29,9 @@  repo="--repository testpypi"
 # Non-empty to do the actual upload
 upload=1
 
+# Non-empty to delete files used for testing
+delete_testfiles=1
+
 tool="$1"
 shift
 flags="$*"
@@ -58,6 +61,11 @@  if [ -n "${upload}" ]; then
 	fi
 fi
 
+if [[ "${tool}" =~ ^(patman|u_boot_pylib)$ ]]; then
+	# Leave test_util.py and patman test files alone
+	delete_testfiles=
+fi
+
 # Create a temp dir to work in
 dir=$(mktemp -d)
 
@@ -91,7 +99,9 @@  find ${dest} -name __pycache__ -type f -exec rm {} \;
 find ${dest} -depth -name __pycache__ -exec rmdir 112 \;
 
 # Remove test files
-rm -rf ${dest}/*test*
+if [ -n "${delete_testfiles}" ]; then
+	rm -rfv ${dest}/*test*
+fi
 
 mkdir ${dir}/tests
 cd ${dir}