[Libreoffice-commits] dev-tools.git: test-bugzilla-files/config test-bugzilla-files/new-control.py
test-bugzilla-files/config |1 +
test-bugzilla-files/new-control.py |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3a2e47818088f661183d195131dac0bdbeebc49a
Author: Gabor Kelemen
AuthorDate: Tue Nov 15 10:20:18 2022 +0100
Commit: Caolán McNamara
CommitDate: Tue Nov 15 20:48:56 2022 +0100
Make number of files processed by a worker configurable
Many files on a worker may result in a few longer running
processes thus not utilizing the available parallelism.
This option may be most useful in smaller file sets in testing runs.
Change-Id: I48a18fd79195634320df8ff73985ba735f9c3ea9
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/142729
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config
index e52aecd..5f81cee 100644
--- a/test-bugzilla-files/config
+++ b/test-bugzilla-files/config
@@ -5,6 +5,7 @@ export INSTDIR=$BUILDDIR/instdir
export USERDIR=/home/$USER/.config
export WORKERS=72
export DTPATH=~/source/dev-tools/
+export FILESNR=100
# Warning limits
export DISKSPACELIMIT=5 # Remaining disk space warning limit in GiB.
diff --git a/test-bugzilla-files/new-control.py
b/test-bugzilla-files/new-control.py
index 60010ca..2a95970 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -150,7 +150,7 @@ if __name__ == "__main__":
print("no valid directory")
sys.exit(1)
-task_size = 100
+task_size = int(os.environ["FILESNR"])
workers = int(os.environ["WORKERS"])
if asan == 1:
workers = 64
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/config test-bugzilla-files/new-control.py
test-bugzilla-files/config |1 + test-bugzilla-files/new-control.py |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit de8c1b014eb8834eb99d3b631bb803ed64bf1127 Author: Gabor Kelemen AuthorDate: Fri Aug 19 16:07:39 2022 +0200 Commit: Caolán McNamara CommitDate: Wed Sep 14 11:47:11 2022 +0200 Make number of worker processes configurable Change-Id: Ifce496acbab12f0ca4f5b68e78cdcf22ee24488d Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/138721 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config index f069e32..199b191 100644 --- a/test-bugzilla-files/config +++ b/test-bugzilla-files/config @@ -3,6 +3,7 @@ export SRCDIR=/home/$USER/source/libo-core export BUILDDIR=/home/$USER/build export INSTDIR=$BUILDDIR/instdir export USERDIR=/home/$USER/.config +export WORKERS=30 # Warning limits export DISKSPACELIMIT=5 # Remaining disk space warning limit in GiB. diff --git a/test-bugzilla-files/new-control.py b/test-bugzilla-files/new-control.py index cda4cb7..59dcebe 100644 --- a/test-bugzilla-files/new-control.py +++ b/test-bugzilla-files/new-control.py @@ -150,7 +150,7 @@ if __name__ == "__main__": sys.exit(1) task_size = 100 -workers = 30 +workers = int(os.environ["WORKERS"]) if asan == 1: workers = 64
[Libreoffice-commits] dev-tools.git: test-bugzilla-files/config test-bugzilla-files/new-control.py
test-bugzilla-files/config |5 +
test-bugzilla-files/new-control.py | 11 ++-
2 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit fefe99d83597e44f994c95aeaa36609cbda79400
Author: Gülşah Köse
AuthorDate: Fri Oct 8 10:29:17 2021 +0300
Commit: Miklos Vajna
CommitDate: Fri Oct 8 13:16:30 2021 +0200
Read limit values from config file.
Remaining disk space, memory usage and CPU load limit values are moved
to config file.
Change-Id: Ia5a416d24dfa23a5c20f57eca6104f91f5388f64
Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/123248
Tested-by: Miklos Vajna
Reviewed-by: Miklos Vajna
diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config
index 3605bed..9622054 100644
--- a/test-bugzilla-files/config
+++ b/test-bugzilla-files/config
@@ -3,6 +3,11 @@ export SRCDIR=/home/$USER/source/libo-core
export INSTDIR=/home/$USER/build/instdir
export USERDIR=/home/$USER/.config
+# Warning limits
+export DISKSPACELIMIT=5 # Remaining disk space warning limit in GiB.
+export MEMORYLIMIT=90# Memory usage warning limit in percent.
+export CPULOADAVGLIMIT=0.9 # CPU load average limit for per core in last
minute. min 0, max 1.
+
# For development purposes:
# Don't touch the core.git source/build directory:
# export CRASHTEST_READONLY_CORE=1
diff --git a/test-bugzilla-files/new-control.py
b/test-bugzilla-files/new-control.py
index ab82a08..ee8befe 100644
--- a/test-bugzilla-files/new-control.py
+++ b/test-bugzilla-files/new-control.py
@@ -83,7 +83,8 @@ def get_list_of_files(directory_name):
def checkDiskSpace():
total, used, free = disk_usage(os.environ["CRASHTESTDATA"])
freeGiB = free // (2**30)
-if freeGiB <= 5:
+disk_space_limit = int(os.environ["DISKSPACELIMIT"])
+if freeGiB <= disk_space_limit:
diskusagefile = open("/srv/crashtestdata/diskusageinfo.txt", "w")
diskusagefile.write(str(freeGiB))
diskusagefile.close()
@@ -91,9 +92,9 @@ def checkDiskSpace():
def checkCPULoadAverage():
cpuload, _, _ = os.getloadavg()
cpuload /= float(os.cpu_count())
-limit = 0.9
+cpu_loadavg_limit = float(os.environ["CPULOADAVGLIMIT"])
-if cpuload > limit:
+if cpuload > cpu_loadavg_limit:
cpuusagefile = open("/srv/crashtestdata/cpuusageinfo.txt", "w")
cpuusagefile.write(str(cpuload))
cpuusagefile.close()
@@ -106,9 +107,9 @@ def checkMemoryUsage():
usage = used_memory / total_memory
usage_in_percent = round(round(usage, 2)*100)
-limit = 90
+memory_limit = int(os.environ["MEMORYLIMIT"])
-if usage_in_percent > limit:
+if usage_in_percent > memory_limit:
memoryusagefile =
open(os.environ["CRASHTESTDATA"]+"/memoryusageinfo.txt", "w")
memoryusagefile.write(str(usage_in_percent)+'%')
memoryusagefile.close()
