public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: [PATCH v5 14/14] test: Move perf.js report file to $LOGDIR/web
Date: Tue, 13 Sep 2022 14:35:29 +1000	[thread overview]
Message-ID: <20220913043529.3079003-15-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20220913043529.3079003-1-david@gibson.dropbear.id.au>

[-- Attachment #1: Type: text/plain, Size: 1970 bytes --]

The tests generate a performance report in $BASEPATH/perf.js and
hooks/pre-push copies it to the website.  To avoid cluttering the working
directory, instead put perf.js in $LOGDIR/web, since it's a test output
artefact.  Update hooks/pre-push to copy from its new location.

Signed-off-by: David Gibson <david(a)gibson.dropbear.id.au>
---
 hooks/pre-push       | 4 ++--
 test/.gitignore      | 1 -
 test/lib/perf_report | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hooks/pre-push b/hooks/pre-push
index 1c221e7..567a3e5 100755
--- a/hooks/pre-push
+++ b/hooks/pre-push
@@ -34,8 +34,8 @@ ssh "${USER_HOST}" 				"mkdir -p ${WEB} ${TEST} ${BIN}"
 cd test
 
 ./ci
-gzip -fk9 perf.js
-scp perf.js perf.js.gz				"${USER_HOST}:${WEB}/"
+gzip -fk9 test_logs/web/perf.js
+scp test_logs/web/perf.js test_logs/web/perf.js.gz "${USER_HOST}:${WEB}/"
 scp test_logs/* 				"${USER_HOST}:${TEST}/"
 ./run_demo
 
diff --git a/test/.gitignore b/test/.gitignore
index 2e75cb5..e00b544 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,4 +1,3 @@
-perf.js
 test_logs/
 mbuto/
 *.img
diff --git a/test/lib/perf_report b/test/lib/perf_report
index b4fa685..8fd0588 100755
--- a/test/lib/perf_report
+++ b/test/lib/perf_report
@@ -14,7 +14,7 @@
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
 
 PERF_LINK_COUNT=0
-PERF_JS="${BASEPATH}/perf.js"
+PERF_JS="${LOGDIR}/web/perf.js"
 
 PERF_TEMPLATE_HTML="document.write('"'
 Throughput in Gbps, latency in µs. Threads are <span style="font-family: monospace;">iperf3</span> processes, <i>passt</i> and <i>pasta</i> are currently single-threaded.<br/>
@@ -126,6 +126,7 @@ for (var i = 0; i < perf_links.length; i++) {
 
 # perf_init() - Process first part of template
 perf_init() {
+        mkdir -p "$(dirname "${PERF_JS}")"
 	echo "${PERF_TEMPLATE_HTML}" > "${PERF_JS}"
 	perf_report_sub commit "$(echo ${COMMIT} | sed "s/'/\\\'/g")"
 }
-- 
@@ -14,7 +14,7 @@
 # Author: Stefano Brivio <sbrivio(a)redhat.com>
 
 PERF_LINK_COUNT=0
-PERF_JS="${BASEPATH}/perf.js"
+PERF_JS="${LOGDIR}/web/perf.js"
 
 PERF_TEMPLATE_HTML="document.write('"'
 Throughput in Gbps, latency in µs. Threads are <span style="font-family: monospace;">iperf3</span> processes, <i>passt</i> and <i>pasta</i> are currently single-threaded.<br/>
@@ -126,6 +126,7 @@ for (var i = 0; i < perf_links.length; i++) {
 
 # perf_init() - Process first part of template
 perf_init() {
+        mkdir -p "$(dirname "${PERF_JS}")"
 	echo "${PERF_TEMPLATE_HTML}" > "${PERF_JS}"
 	perf_report_sub commit "$(echo ${COMMIT} | sed "s/'/\\\'/g")"
 }
-- 
2.37.3


      parent reply	other threads:[~2022-09-13  4:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-13  4:35 [PATCH v5 00/14] Improve handling of test temporary files David Gibson
2022-09-13  4:35 ` [PATCH v5 01/14] test: Group tests by mode then protocol, rather than the reverse David Gibson
2022-09-13  4:35 ` [PATCH v5 02/14] test: Remove unused variable FFMPEG_PID_FILE David Gibson
2022-09-13  4:35 ` [PATCH v5 03/14] test: Actually run cleanup function David Gibson
2022-09-13  4:35 ` [PATCH v5 04/14] test: Create common state directories for temporary files David Gibson
2022-09-13  4:35 ` [PATCH v5 05/14] test: Move passt_test_log_pipe to state directory David Gibson
2022-09-13  4:35 ` [PATCH v5 06/14] test: Move context temporary files to state dir David Gibson
2022-09-13  4:35 ` [PATCH v5 07/14] test: Don't redundantly regenerate small test file in pasta/tcp David Gibson
2022-09-13  4:35 ` [PATCH v5 08/14] test: Use paths in __STATEDIR__ instead of 'temp' and 'tempdir' directives David Gibson
2022-09-13  4:35 ` [PATCH v5 09/14] test: Move pause temporary file to state directory David Gibson
2022-09-13  4:35 ` [PATCH v5 10/14] test: Store pcap files in $LOGDIR instead of /tmp David Gibson
2022-09-13  4:35 ` [PATCH v5 11/14] test: Move pidfiles and nsholder sockets into state directory David Gibson
2022-09-13  4:35 ` [PATCH v5 12/14] demo: Move pidfiles to " David Gibson
2022-09-13  4:35 ` [PATCH v5 13/14] test: Move video processing files to $STATEBASE David Gibson
2022-09-13  4:35 ` David Gibson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220913043529.3079003-15-david@gibson.dropbear.id.au \
    --to=david@gibson.dropbear.id.au \
    --cc=passt-dev@passt.top \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://passt.top/passt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).