From patchwork Tue Feb 2 22:13:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Bird, Tim" X-Patchwork-Id: 8196261 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D6A669F4DD for ; Tue, 2 Feb 2016 22:14:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05EAC202D1 for ; Tue, 2 Feb 2016 22:13:52 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1BC842026D for ; Tue, 2 Feb 2016 22:13:37 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 04E92F29; Tue, 2 Feb 2016 22:13:37 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 5F72BF28 for ; Tue, 2 Feb 2016 22:13:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from SELDSEGREL01.sonyericsson.com (seldsegrel01.sonyericsson.com [37.139.156.29]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D8C9D16C for ; Tue, 2 Feb 2016 22:13:18 +0000 (UTC) To: "ltsi-dev@lists.linuxfoundation.org" From: Tim Bird Message-ID: <56B129F0.3080806@sonymobile.com> Date: Tue, 2 Feb 2016 14:13:04 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Subject: [LTSI-dev] patches for JTA->Fuego rename X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP Well I've made an attempt to rename the project from JTA to Fuego. Attached to this e-mail are 2 patches, one for the jta-public repository and one for the jta-core repository (one one shell script, explained in the PS below). Normally, patches are included in the body of a message as inline text, but these are big enough (and against separate repositories) that I decided it was easiest to just attach them. Here are some notes: The repositories need to be renamed as well: * jta-public should be renamed to fuego-public (this is not critical, but should be done for consistency) * jta-core should be renamed to fuego-core (this is in the Dockerfile, so this matters) * meta-jta should be renamed to meta-fuego (this was changed in documentation) Obviously, I couldn't do a repository rename in a patch file. So you'll have to do this manually. I did not change anything about the following files: jta-public/docs/How-to-Add-Test-Cases-on-JTA.docx jta-public/docs/How-to-Add-Test-Cases-on-JTA.pdf jta-public/docs/jta-docs.pdf It appears that jta-docs.pdf is checked-in to the repository, while having the same content as jta-guide.pdf (now fuego-guide.pdf), which is generated by the Makefile in docs. I could find no build step that copies jta-guide.pdf to jta-docs.pdf, so I assume this is a manual step by someone? If so, then fuego-guide.pdf should be re-built, and copied over fuego-docs.pdf. I did not do this myself manually, because I think the build stamp (which is reflected in the document) should be from Cogent. Finally, jta-docs.pdf should be removed from the repository. Better yet would be to modify the Makefile to create fuego-docs.pdf by copying fuego-guide.pdf, and remove the pdf from source code control. The file fuego-core/engine/scripts/common.pyc is also a generated file. I did no subsitutions on it, because it really should be removed and regenerated by loading common.py into the python interpreter. I'm not sure this should even be in the repository, as it is generated automatically by the interpreter, but I imagine you have your reasons for this. Please remove common.pyc, regenerate it from common.py, and check it in as a replacement for the previous common.pyc. Please apply these patches, make the repository renames, perform the manual steps listed above, and let me know how it goes. Since you'll have new repositories, if you want you can create them side-by-side with the old repositories, and let me test them before we unleash them onto the rest of the world (and take down the old repositories.) Thanks, -- Tim Bird Senior Software Engineer, Sony Mobile Communications, Inc. P.S. Note that I used a script to automatically perform (most of) the rename tasks. I'm attaching that script so if there are files in your local repositories that are not yet reflected in the published repositories, you can use the scripts to do renames for those as well. The script should be self-explanatory. :-) From 6d1d6a93a4826c661dc6c98df5984199675a30c3 Mon Sep 17 00:00:00 2001 From: Tim Bird Date: Tue, 2 Feb 2016 11:42:04 -0800 Subject: [PATCH] Rename jta to fuego in core repository --- engine/overlays/base/README | 6 +- engine/overlays/base/base-board.fuegoclass | 46 +++++++++++++ engine/overlays/base/base-board.jtaclass | 46 ------------- engine/overlays/base/base-distrib.fuegoclass | 47 +++++++++++++ engine/overlays/base/base-distrib.jtaclass | 47 ------------- engine/overlays/base/base-funcs.fuegoclass | 11 ++++ engine/overlays/base/base-funcs.jtaclass | 11 ---- engine/overlays/base/base-params.fuegoclass | 10 +++ engine/overlays/base/base-params.jtaclass | 10 --- engine/overlays/distribs/nologger.dist | 2 +- engine/overlays/test_specs/Benchmark.bonnie.spec | 2 +- engine/overlays/test_specs/Benchmark.ffsb.spec | 2 +- engine/overlays/test_specs/Benchmark.fio.spec | 2 +- engine/overlays/test_specs/Benchmark.iozone.spec | 2 +- engine/overlays/test_specs/Benchmark.tiobench.spec | 2 +- .../overlays/test_specs/Functional.aiostress.spec | 2 +- .../overlays/test_specs/Functional.synctest.spec | 2 +- engine/scripts/benchmark.sh | 6 +- engine/scripts/common.sh | 18 ++--- engine/scripts/environment.sh | 2 +- engine/scripts/functional.sh | 6 +- engine/scripts/functions.sh | 76 +++++++++++----------- engine/scripts/overlays.sh | 8 +-- engine/scripts/ovgen/ovgen.py | 8 +-- engine/scripts/params.sh | 2 +- engine/scripts/parser/common.py | 8 +-- engine/scripts/parser/dataload.py | 2 +- engine/scripts/parser/tests/check_plotdata.py | 2 +- engine/scripts/postbuild.groovy | 2 +- engine/scripts/reports.sh | 14 ++-- engine/scripts/stress.sh | 6 +- engine/scripts/test.sh | 6 +- engine/tests/Benchmark.Dhrystone/Dhrystone.sh | 6 +- engine/tests/Benchmark.Dhrystone/parser.py | 2 +- engine/tests/Benchmark.GLMark/GLMark.sh | 6 +- engine/tests/Benchmark.GLMark/parser.py | 2 +- engine/tests/Benchmark.GLMark/reference.log | 2 +- engine/tests/Benchmark.IOzone/iozone.sh | 12 ++-- engine/tests/Benchmark.IOzone/parser.py | 2 +- engine/tests/Benchmark.IOzone/reference.log | 2 +- engine/tests/Benchmark.Interbench/interbench.sh | 6 +- engine/tests/Benchmark.Interbench/parser.py | 2 +- engine/tests/Benchmark.Interbench/reference.log | 2 +- engine/tests/Benchmark.Java/java_perf.sh | 18 ++--- engine/tests/Benchmark.Java/parser.py | 2 +- engine/tests/Benchmark.Java/reference.log | 2 +- engine/tests/Benchmark.OpenSSL/openssl-bench.sh | 4 +- engine/tests/Benchmark.OpenSSL/parser.py | 2 +- engine/tests/Benchmark.Stream/parser.py | 2 +- engine/tests/Benchmark.Stream/reference.log | 2 +- engine/tests/Benchmark.Stream/stream.sh | 6 +- engine/tests/Benchmark.Whetstone/Whetstone.sh | 6 +- engine/tests/Benchmark.Whetstone/parser.py | 2 +- engine/tests/Benchmark.aim7/aim7.sh | 14 ++-- engine/tests/Benchmark.aim7/parser.py | 2 +- engine/tests/Benchmark.bc/bc-script.sh | 6 +- engine/tests/Benchmark.bc/parser.py | 2 +- engine/tests/Benchmark.blobsallad/blobsallad.sh | 8 +-- engine/tests/Benchmark.blobsallad/parser.py | 2 +- engine/tests/Benchmark.bonnie/bonnie++.sh | 6 +- engine/tests/Benchmark.bonnie/parser.py | 4 +- engine/tests/Benchmark.cyclictest/cyclictest.sh | 6 +- engine/tests/Benchmark.cyclictest/parser.py | 2 +- engine/tests/Benchmark.dbench/dbench.sh | 6 +- engine/tests/Benchmark.dbench/parser.py | 2 +- engine/tests/Benchmark.dbench/reference.log | 2 +- engine/tests/Benchmark.ebizzy/ebizzy.sh | 6 +- engine/tests/Benchmark.ebizzy/parser.py | 2 +- engine/tests/Benchmark.ffsb/ffsb.sh | 10 +-- engine/tests/Benchmark.ffsb/parser.py | 2 +- engine/tests/Benchmark.fio/fio.sh | 12 ++-- engine/tests/Benchmark.fio/parser.py | 2 +- engine/tests/Benchmark.fio/reference.log | 2 +- engine/tests/Benchmark.gtkperf/gtkperf.sh | 12 ++-- engine/tests/Benchmark.gtkperf/parser.py | 2 +- engine/tests/Benchmark.gtkperf/reference.log | 2 +- engine/tests/Benchmark.hackbench/hackbench.sh | 6 +- engine/tests/Benchmark.hackbench/parser.py | 2 +- engine/tests/Benchmark.himeno/himeno.sh | 6 +- engine/tests/Benchmark.himeno/parser.py | 2 +- engine/tests/Benchmark.iperf/iperf.sh | 6 +- engine/tests/Benchmark.iperf/parser.py | 4 +- engine/tests/Benchmark.iperf/reference.log | 2 +- engine/tests/Benchmark.linpack/linpack.sh | 6 +- engine/tests/Benchmark.linpack/parser.py | 2 +- engine/tests/Benchmark.lmbench2/lmbench.sh | 12 ++-- engine/tests/Benchmark.lmbench2/parser.py | 4 +- engine/tests/Benchmark.lmbench2/reference.log | 2 +- engine/tests/Benchmark.nbench-byte/nbench-byte.sh | 6 +- engine/tests/Benchmark.nbench-byte/parser.py | 2 +- engine/tests/Benchmark.nbench_byte/nbench_byte.sh | 6 +- engine/tests/Benchmark.nbench_byte/parser.py | 2 +- engine/tests/Benchmark.netperf/netperf-bench.sh | 6 +- engine/tests/Benchmark.netperf/parser.py | 2 +- engine/tests/Benchmark.netpipe/NetPIPE.sh | 8 +-- engine/tests/Benchmark.reboot/parser.py | 2 +- engine/tests/Benchmark.reboot/reboot.sh | 6 +- engine/tests/Benchmark.reboot/reference.log | 2 +- engine/tests/Benchmark.signaltest/parser.py | 2 +- engine/tests/Benchmark.signaltest/signaltest.sh | 6 +- engine/tests/Benchmark.tiobench/parser.py | 2 +- engine/tests/Benchmark.tiobench/reference.log | 2 +- engine/tests/Benchmark.tiobench/tiobench.sh | 8 +-- engine/tests/Benchmark.x11perf/parser.py | 2 +- engine/tests/Benchmark.x11perf/x11perf.sh | 6 +- engine/tests/Functional.LTP.Devices/ltp-devices.sh | 8 +-- .../Functional.LTP.Filesystem/ltp-filesystem.sh | 8 +-- .../Functional.LTP.Open_Posix/ltp-open_posix.sh | 8 +-- engine/tests/Functional.OpenSSL/openssl-func.sh | 4 +- engine/tests/Functional.aiostress/aiostress.sh | 6 +- engine/tests/Functional.bzip2/bzip2.sh | 6 +- engine/tests/Functional.crashme/crashme.sh | 6 +- engine/tests/Functional.expat/expat.sh | 14 ++-- engine/tests/Functional.fontconfig/fontconfig.sh | 6 +- engine/tests/Functional.ft2demos/ft2demos.sh | 10 +-- engine/tests/Functional.glib/glib2.sh | 8 +-- engine/tests/Functional.ipv6connect/ipv6connect.sh | 6 +- engine/tests/Functional.jpeg/jpeg.sh | 6 +- .../tests/Functional.linus_stress/linus_stress.sh | 6 +- engine/tests/Functional.netperf/netperf-func.sh | 6 +- engine/tests/Functional.pi_tests/pi_tests.sh | 6 +- .../Functional.posixtestsuite/posixtestsuite.sh | 6 +- engine/tests/Functional.rmaptest/rmaptest.sh | 6 +- engine/tests/Functional.scifab/scifab.sh | 2 +- engine/tests/Functional.scrashme/scrashme.sh | 6 +- engine/tests/Functional.sdhi_0/sdhi_0.sh | 2 +- engine/tests/Functional.stress/stress.sh | 6 +- engine/tests/Functional.synctest/synctest.sh | 6 +- engine/tests/Functional.zlib/zlib.sh | 6 +- engine/tests/LTP/ltp.sh | 30 ++++----- engine/tests/OpenSSL/openssl.sh | 10 +-- engine/tests/netperf/netperf.sh | 12 ++-- jobs/Benchmark.Dhrystone/config.xml | 12 ++-- jobs/Benchmark.GLMark/config.xml | 12 ++-- jobs/Benchmark.IOzone/config.xml | 12 ++-- jobs/Benchmark.Interbench/config.xml | 12 ++-- jobs/Benchmark.Java/config.xml | 12 ++-- jobs/Benchmark.OpenSSL/config.xml | 12 ++-- jobs/Benchmark.Stream/config.xml | 12 ++-- jobs/Benchmark.Whetstone/config.xml | 12 ++-- jobs/Benchmark.aim7/config.xml | 12 ++-- jobs/Benchmark.bc/config.xml | 12 ++-- jobs/Benchmark.blobsallad/config.xml | 12 ++-- jobs/Benchmark.bonnie/config.xml | 12 ++-- jobs/Benchmark.cyclictest/config.xml | 12 ++-- jobs/Benchmark.dbench/config.xml | 12 ++-- jobs/Benchmark.ebizzy/config.xml | 12 ++-- jobs/Benchmark.ffsb/config.xml | 12 ++-- jobs/Benchmark.fio/config.xml | 12 ++-- jobs/Benchmark.gtkperf/config.xml | 12 ++-- jobs/Benchmark.hackbench/config.xml | 12 ++-- jobs/Benchmark.himeno/config.xml | 12 ++-- jobs/Benchmark.iperf/config.xml | 12 ++-- jobs/Benchmark.linpack/config.xml | 12 ++-- jobs/Benchmark.lmbench2/config.xml | 12 ++-- jobs/Benchmark.nbench-byte/config.xml | 12 ++-- jobs/Benchmark.netperf/config.xml | 12 ++-- jobs/Benchmark.netpipe/config.xml | 12 ++-- jobs/Benchmark.reboot/config.xml | 12 ++-- jobs/Benchmark.signaltest/config.xml | 12 ++-- jobs/Benchmark.tiobench/config.xml | 12 ++-- jobs/Benchmark.x11perf/config.xml | 12 ++-- jobs/Functional.LTP.Devices/config.xml | 10 +-- jobs/Functional.LTP.Filesystem/config.xml | 10 +-- jobs/Functional.LTP.Open_Posix/config.xml | 10 +-- jobs/Functional.OpenSSL/config.xml | 10 +-- jobs/Functional.aiostress/config.xml | 10 +-- jobs/Functional.arch_timer/config.xml | 8 +-- jobs/Functional.bzip2/config.xml | 10 +-- jobs/Functional.cmt/config.xml | 8 +-- jobs/Functional.crashme/config.xml | 10 +-- jobs/Functional.expat/config.xml | 10 +-- jobs/Functional.fontconfig/config.xml | 10 +-- jobs/Functional.ft2demos/config.xml | 10 +-- jobs/Functional.glib/config.xml | 12 ++-- jobs/Functional.ipv6connect/config.xml | 10 +-- jobs/Functional.jpeg/config.xml | 10 +-- jobs/Functional.libpng/config.xml | 22 +++---- jobs/Functional.linus_stress/config.xml | 10 +-- jobs/Functional.netperf/config.xml | 10 +-- jobs/Functional.pi_tests/config.xml | 10 +-- jobs/Functional.posixtestsuite/config.xml | 10 +-- jobs/Functional.rmaptest/config.xml | 10 +-- jobs/Functional.scifab/config.xml | 8 +-- jobs/Functional.scrashme/config.xml | 10 +-- jobs/Functional.sdhi_0/config.xml | 8 +-- jobs/Functional.stress/config.xml | 10 +-- jobs/Functional.synctest/config.xml | 10 +-- jobs/Functional.zlib/config.xml | 10 +-- jobs/Matrix.Nightly/config.xml | 2 +- jobs/Matrix.Official/config.xml | 2 +- jobs/Reports.make_pdf/config.xml | 2 +- jobs/Run ALL tests on ALL targets/config.xml | 2 +- jobs/Run ALL tests on SELECTED targets/config.xml | 2 +- .../config.xml | 8 +-- jobs/Service.ReloadConfiguration/config.xml | 2 +- plugins-conf/sidebar-link.xml | 2 +- 197 files changed, 804 insertions(+), 804 deletions(-) create mode 100644 engine/overlays/base/base-board.fuegoclass delete mode 100644 engine/overlays/base/base-board.jtaclass create mode 100644 engine/overlays/base/base-distrib.fuegoclass delete mode 100644 engine/overlays/base/base-distrib.jtaclass create mode 100644 engine/overlays/base/base-funcs.fuegoclass delete mode 100644 engine/overlays/base/base-funcs.jtaclass create mode 100644 engine/overlays/base/base-params.fuegoclass delete mode 100644 engine/overlays/base/base-params.jtaclass diff --git a/engine/overlays/base/README b/engine/overlays/base/README index 425671d..a24100f 100644 --- a/engine/overlays/base/README +++ b/engine/overlays/base/README @@ -1,5 +1,5 @@ This catalogue contains base classes with definitions of variables & functions that can be overriden in overlay files -base-board.jtaclass - basic board definitions (methods for communicating with boards etc) -base-distrib.jtaclass - basic board distribution definitions (methods for rebooting, logging, getting state etc) -base-params.jtaclass - basic functions and variables (server ip, ssh methods etc) +base-board.fuegoclass - basic board definitions (methods for communicating with boards etc) +base-distrib.fuegoclass - basic board distribution definitions (methods for rebooting, logging, getting state etc) +base-params.fuegoclass - basic functions and variables (server ip, ssh methods etc) diff --git a/engine/overlays/base/base-board.fuegoclass b/engine/overlays/base/base-board.fuegoclass new file mode 100644 index 0000000..4e63898 --- /dev/null +++ b/engine/overlays/base/base-board.fuegoclass @@ -0,0 +1,46 @@ +OF.NAME="base-board" +OF.DESCRIPTION="Basic board file" +SSH_PORT=22 +SRV_IP="`/sbin/ip a s |awk -F ' +|/' '/inet / && $3 != "127.0.0.1" { print $3; exit; }'`" + +# $1 = local file (destination); $2 = remote file (source) +function ov_transport_get () { + case "$TRANSPORT" in + "ssh") + $SCP $LOGIN@${DEVICE}:"$1" "${*:2}" + ;; + "serial") + ;; + *) + abort_job "Error reason: TRANSPORT" + ;; + esac +} + +# $1 = local file (source); $2 = remote file (destination) +function ov_transport_put () { + case "$TRANSPORT" in + "ssh") + $SCP "${@:1:$(($#-1))}" $LOGIN@$DEVICE:"${@: -1}" + ;; + "serial") + ;; + *) + abort_job "Error reason: TRANSPORT" + ;; + esac +} + +# $1 = command for remote execution +function ov_transport_cmd() { + case "$TRANSPORT" in + "ssh") + ${SSH}${DEVICE} "$@" + ;; + "serial") + ;; + *) + abort_job "Error reason: TRANSPORT" + ;; + esac +} \ No newline at end of file diff --git a/engine/overlays/base/base-board.jtaclass b/engine/overlays/base/base-board.jtaclass deleted file mode 100644 index 4e63898..0000000 --- a/engine/overlays/base/base-board.jtaclass +++ /dev/null @@ -1,46 +0,0 @@ -OF.NAME="base-board" -OF.DESCRIPTION="Basic board file" -SSH_PORT=22 -SRV_IP="`/sbin/ip a s |awk -F ' +|/' '/inet / && $3 != "127.0.0.1" { print $3; exit; }'`" - -# $1 = local file (destination); $2 = remote file (source) -function ov_transport_get () { - case "$TRANSPORT" in - "ssh") - $SCP $LOGIN@${DEVICE}:"$1" "${*:2}" - ;; - "serial") - ;; - *) - abort_job "Error reason: TRANSPORT" - ;; - esac -} - -# $1 = local file (source); $2 = remote file (destination) -function ov_transport_put () { - case "$TRANSPORT" in - "ssh") - $SCP "${@:1:$(($#-1))}" $LOGIN@$DEVICE:"${@: -1}" - ;; - "serial") - ;; - *) - abort_job "Error reason: TRANSPORT" - ;; - esac -} - -# $1 = command for remote execution -function ov_transport_cmd() { - case "$TRANSPORT" in - "ssh") - ${SSH}${DEVICE} "$@" - ;; - "serial") - ;; - *) - abort_job "Error reason: TRANSPORT" - ;; - esac -} \ No newline at end of file diff --git a/engine/overlays/base/base-distrib.fuegoclass b/engine/overlays/base/base-distrib.fuegoclass new file mode 100644 index 0000000..19c4793 --- /dev/null +++ b/engine/overlays/base/base-distrib.fuegoclass @@ -0,0 +1,47 @@ +OF.NAME="base-distrib" +OF.DESCRIPTION="Base distribution commands" + +function ov_get_firmware() { + FW=`cmd "uname -r | xargs echo "` || abort_job "Unable to get firmware version" +} + +function ov_rootfs_reboot() { + cmd "/sbin/reboot &" +} + +function ov_rootfs_state() { + cmd "echo; uptime; echo; free; echo; df -h; echo; mount; echo; ps |grep -Fv ' ['; echo; cat /proc/interrupts; echo" || abort_job "Error while ROOTFS_STATE command execution on target" +} + +function ov_logger() { + cmd "logger $@" || abort_job "Could not execute ROOTFS_LOGGER command" +} + +function ov_rootfs_sync() { + cmd "sync" || abort_job "Unable to flush buffers on target" +} + +function ov_rootfs_drop_caches() { + cmd "echo 3 > /proc/sys/vm/drop_caches" || abort_job "Unable to drop filesystem caches" +} + +function ov_rootfs_oom() { + cmd "echo 15 > /proc/\$\$/oom_adj" || abort_job "Unable to setup OOM adj." +} + +# Kill any stale processes if requested to do so. +# First, issue normal kill, and finally, if stale process was found, force its termination with signal 9. +function ov_rootfs_kill() { + [ -n "$2" ] && cmd "pkill $2 && sleep 2 && pkill -9 $2; true" + [ -n "$3" ] && cmd "pkill $3 && sleep 2 && pkill -9 $3; true" + [ -n "$4" ] && cmd "pkill $4 && sleep 2 && pkill -9 $4; true" + true +} + + +# We create /tmp/${2} dir in any case to capture target logs and prevent +# log dump to $FUEGO_HOME dir. +function ov_rootfs_logread() { + cmd "mkdir -p /tmp/fuego.${1} && cd /tmp/fuego.${1} && /sbin/logread > ${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.$2" || abort_job "Error while ROOTFS_LOGREAD command execution on target" +} + diff --git a/engine/overlays/base/base-distrib.jtaclass b/engine/overlays/base/base-distrib.jtaclass deleted file mode 100644 index 8e1dbe2..0000000 --- a/engine/overlays/base/base-distrib.jtaclass +++ /dev/null @@ -1,47 +0,0 @@ -OF.NAME="base-distrib" -OF.DESCRIPTION="Base distribution commands" - -function ov_get_firmware() { - FW=`cmd "uname -r | xargs echo "` || abort_job "Unable to get firmware version" -} - -function ov_rootfs_reboot() { - cmd "/sbin/reboot &" -} - -function ov_rootfs_state() { - cmd "echo; uptime; echo; free; echo; df -h; echo; mount; echo; ps |grep -Fv ' ['; echo; cat /proc/interrupts; echo" || abort_job "Error while ROOTFS_STATE command execution on target" -} - -function ov_logger() { - cmd "logger $@" || abort_job "Could not execute ROOTFS_LOGGER command" -} - -function ov_rootfs_sync() { - cmd "sync" || abort_job "Unable to flush buffers on target" -} - -function ov_rootfs_drop_caches() { - cmd "echo 3 > /proc/sys/vm/drop_caches" || abort_job "Unable to drop filesystem caches" -} - -function ov_rootfs_oom() { - cmd "echo 15 > /proc/\$\$/oom_adj" || abort_job "Unable to setup OOM adj." -} - -# Kill any stale processes if requested to do so. -# First, issue normal kill, and finally, if stale process was found, force its termination with signal 9. -function ov_rootfs_kill() { - [ -n "$2" ] && cmd "pkill $2 && sleep 2 && pkill -9 $2; true" - [ -n "$3" ] && cmd "pkill $3 && sleep 2 && pkill -9 $3; true" - [ -n "$4" ] && cmd "pkill $4 && sleep 2 && pkill -9 $4; true" - true -} - - -# We create /tmp/${2} dir in any case to capture target logs and prevent -# log dump to $JTA_HOME dir. -function ov_rootfs_logread() { - cmd "mkdir -p /tmp/jta.${1} && cd /tmp/jta.${1} && /sbin/logread > ${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.$2" || abort_job "Error while ROOTFS_LOGREAD command execution on target" -} - diff --git a/engine/overlays/base/base-funcs.fuegoclass b/engine/overlays/base/base-funcs.fuegoclass new file mode 100644 index 0000000..bed222d --- /dev/null +++ b/engine/overlays/base/base-funcs.fuegoclass @@ -0,0 +1,11 @@ +OF.NAME="base-funcs" +OF.DESCRIPTION="Default functions implementations" + +function default_target_route_setup() { + assert_define "LINK_NET" + assert_define "LINK_NETMASK" + assert_define "LINK_GATEWAY" + assert_define "LINK_TARGET_IFACE" + + target_setup_route_to_host $LINK_NET $LINK_NETMASK $LINK_GATEWAY $LINK_TARGET_IFACE +} diff --git a/engine/overlays/base/base-funcs.jtaclass b/engine/overlays/base/base-funcs.jtaclass deleted file mode 100644 index bed222d..0000000 --- a/engine/overlays/base/base-funcs.jtaclass +++ /dev/null @@ -1,11 +0,0 @@ -OF.NAME="base-funcs" -OF.DESCRIPTION="Default functions implementations" - -function default_target_route_setup() { - assert_define "LINK_NET" - assert_define "LINK_NETMASK" - assert_define "LINK_GATEWAY" - assert_define "LINK_TARGET_IFACE" - - target_setup_route_to_host $LINK_NET $LINK_NETMASK $LINK_GATEWAY $LINK_TARGET_IFACE -} diff --git a/engine/overlays/base/base-params.fuegoclass b/engine/overlays/base/base-params.fuegoclass new file mode 100644 index 0000000..cf46edf --- /dev/null +++ b/engine/overlays/base/base-params.fuegoclass @@ -0,0 +1,10 @@ +OF.NAME="base-params" +OF.DESCRIPTION="Basic parameters which are included after board/base-class" + +DEVICE="$IPADDR" + +PATH="/usr/local/bin:$PATH" +SSH="sshpass -e ssh -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=15 -p $SSH_PORT $LOGIN@" +SCP="sshpass -e scp -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=15 -P $SSH_PORT" + + diff --git a/engine/overlays/base/base-params.jtaclass b/engine/overlays/base/base-params.jtaclass deleted file mode 100644 index cf46edf..0000000 --- a/engine/overlays/base/base-params.jtaclass +++ /dev/null @@ -1,10 +0,0 @@ -OF.NAME="base-params" -OF.DESCRIPTION="Basic parameters which are included after board/base-class" - -DEVICE="$IPADDR" - -PATH="/usr/local/bin:$PATH" -SSH="sshpass -e ssh -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=15 -p $SSH_PORT $LOGIN@" -SCP="sshpass -e scp -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectTimeout=15 -P $SSH_PORT" - - diff --git a/engine/overlays/distribs/nologger.dist b/engine/overlays/distribs/nologger.dist index a287d3e..818b17d 100644 --- a/engine/overlays/distribs/nologger.dist +++ b/engine/overlays/distribs/nologger.dist @@ -1,4 +1,4 @@ inherit "base-distrib" override-func ov_rootfs_logread() { - cmd "mkdir -p /tmp/jta.${1} && cd /tmp/jta.${1} && cat /var/log/messages > ${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.$2" || abort_job "Error while ROOTFS_LOGREAD command execution on target" + cmd "mkdir -p /tmp/fuego.${1} && cd /tmp/fuego.${1} && cat /var/log/messages > ${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.$2" || abort_job "Error while ROOTFS_LOGREAD command execution on target" } \ No newline at end of file diff --git a/engine/overlays/test_specs/Benchmark.bonnie.spec b/engine/overlays/test_specs/Benchmark.bonnie.spec index 93b657f..832651d 100644 --- a/engine/overlays/test_specs/Benchmark.bonnie.spec +++ b/engine/overlays/test_specs/Benchmark.bonnie.spec @@ -26,7 +26,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "SIZE":"32", "RAM":"0" } diff --git a/engine/overlays/test_specs/Benchmark.ffsb.spec b/engine/overlays/test_specs/Benchmark.ffsb.spec index 1b7df0d..73de2ae 100644 --- a/engine/overlays/test_specs/Benchmark.ffsb.spec +++ b/engine/overlays/test_specs/Benchmark.ffsb.spec @@ -20,7 +20,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work" + "MOUNT_POINT":"$FUEGO_HOME/work" } ] } diff --git a/engine/overlays/test_specs/Benchmark.fio.spec b/engine/overlays/test_specs/Benchmark.fio.spec index 65ae310..b36acb4 100644 --- a/engine/overlays/test_specs/Benchmark.fio.spec +++ b/engine/overlays/test_specs/Benchmark.fio.spec @@ -23,7 +23,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "TIMEOUT":"10" } diff --git a/engine/overlays/test_specs/Benchmark.iozone.spec b/engine/overlays/test_specs/Benchmark.iozone.spec index 382f0e7..e5ddb75 100644 --- a/engine/overlays/test_specs/Benchmark.iozone.spec +++ b/engine/overlays/test_specs/Benchmark.iozone.spec @@ -23,7 +23,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "FILE_SIZE":"2M" } ] diff --git a/engine/overlays/test_specs/Benchmark.tiobench.spec b/engine/overlays/test_specs/Benchmark.tiobench.spec index 2699cff..b9b4b49 100644 --- a/engine/overlays/test_specs/Benchmark.tiobench.spec +++ b/engine/overlays/test_specs/Benchmark.tiobench.spec @@ -26,7 +26,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "THREADS":"4", "SIZE":"10" } diff --git a/engine/overlays/test_specs/Functional.aiostress.spec b/engine/overlays/test_specs/Functional.aiostress.spec index dbd5c0b..b8227f7 100644 --- a/engine/overlays/test_specs/Functional.aiostress.spec +++ b/engine/overlays/test_specs/Functional.aiostress.spec @@ -23,7 +23,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "MOUNT_POINT":"$USB_MP", "SIZE":"20M" } diff --git a/engine/overlays/test_specs/Functional.synctest.spec b/engine/overlays/test_specs/Functional.synctest.spec index 2ac53fa..dd2a884 100644 --- a/engine/overlays/test_specs/Functional.synctest.spec +++ b/engine/overlays/test_specs/Functional.synctest.spec @@ -26,7 +26,7 @@ { "name":"default", "MOUNT_BLOCKDEV":"ROOT", - "MOUNT_POINT":"$JTA_HOME/work", + "MOUNT_POINT":"$FUEGO_HOME/work", "LEN":"10", "LOOP":"10" } diff --git a/engine/scripts/benchmark.sh b/engine/scripts/benchmark.sh index 5512c56..3ffd51b 100644 --- a/engine/scripts/benchmark.sh +++ b/engine/scripts/benchmark.sh @@ -21,12 +21,12 @@ # DESCRIPTION # This script contains a sequence of calls that are needed for running benchmakr test -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/functions.sh -source $JTA_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/reports.sh pre_test $TESTDIR diff --git a/engine/scripts/common.sh b/engine/scripts/common.sh index 42c9dcb..cb37586 100644 --- a/engine/scripts/common.sh +++ b/engine/scripts/common.sh @@ -38,7 +38,7 @@ function abort_job { set +x echo -e "\n*** ABORTED ***\n" - [ -n "$1" ] && echo -e "JTA error reason: $1\n" + [ -n "$1" ] && echo -e "Fuego error reason: $1\n" wget -qO- ${BUILD_URL}/stop > /dev/null while true; do sleep 5; done @@ -53,15 +53,15 @@ function assert_define () { fi } -assert_define "JTA_ENGINE_PATH" -export JTA_ENGINE_PATH=$JTA_ENGINE_PATH -export JTA_PARSER_PATH=$JTA_SCRIPTS_PATH/parser +assert_define "FUEGO_ENGINE_PATH" +export FUEGO_ENGINE_PATH=$FUEGO_ENGINE_PATH +export FUEGO_PARSER_PATH=$FUEGO_SCRIPTS_PATH/parser TESTDIR="${JOB_NAME}" -TEST_HOME="$JTA_TESTS_PATH/${JOB_NAME}" +TEST_HOME="$FUEGO_TESTS_PATH/${JOB_NAME}" TRIPLET="${JOB_NAME}-$PLATFORM" -assert_define "JTA_ENGINE_PATH" -assert_define "JTA_SCRIPTS_PATH" -assert_define "JTA_LOGS_PATH" -assert_define "JTA_TESTS_PATH" +assert_define "FUEGO_ENGINE_PATH" +assert_define "FUEGO_SCRIPTS_PATH" +assert_define "FUEGO_LOGS_PATH" +assert_define "FUEGO_TESTS_PATH" diff --git a/engine/scripts/environment.sh b/engine/scripts/environment.sh index 30aa0e4..e00a925 100755 --- a/engine/scripts/environment.sh +++ b/engine/scripts/environment.sh @@ -28,7 +28,7 @@ SCP=scp -o ServerAliveInterval=30 -o StrictHostKeyChecking=no -o UserKnownHostsF # echo "using $BATCH_TESTPLAN batch testplan" # TESTPLAN=$BATCH_TESTPLAN -# source $JTA_SCRIPTS_PATH/overlays.sh +# source $FUEGO_SCRIPTS_PATH/overlays.sh # set_overlay_vars # touch $OF_ROOT/work/use_batch_prolog diff --git a/engine/scripts/functional.sh b/engine/scripts/functional.sh index 6574727..8f91c74 100644 --- a/engine/scripts/functional.sh +++ b/engine/scripts/functional.sh @@ -21,11 +21,11 @@ # DESCRIPTION # This script contains a sequence of calls that are needed for running functional test -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh index e383b05..2d23bc0 100755 --- a/engine/scripts/functions.sh +++ b/engine/scripts/functions.sh @@ -19,11 +19,11 @@ # THE SOFTWARE. # DESCRIPTION -# This script contains core functions of JTA that needed for running tests +# This script contains core functions of Fuego that needed for running tests # These are supporting functions for test suites building process. -. $JTA_SCRIPTS_PATH/params.sh -. $JTA_SCRIPTS_PATH/common.sh +. $FUEGO_SCRIPTS_PATH/params.sh +. $FUEGO_SCRIPTS_PATH/common.sh # Unpacks $tarball_path/$tarball into current directory. # $1 - optional flag; if set to "nostrip", @@ -51,8 +51,8 @@ function is_empty { } function report_devlog() { - mkdir -p $JTA_LOGS_PATH/$JOB_NAME/devlogs - devlog_file="$JTA_LOGS_PATH/${JOB_NAME}/devlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.txt" + mkdir -p $FUEGO_LOGS_PATH/$JOB_NAME/devlogs + devlog_file="$FUEGO_LOGS_PATH/${JOB_NAME}/devlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.txt" echo "$@" >> $devlog_file } @@ -90,7 +90,7 @@ function report { RETCODE=/tmp/$$-${RANDOM} if [ -z $2 ]; then echo "WARNING: test log file parameter empty, so will use default" - safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee $JTA_HOME/jta.$TESTDIR/$TESTDIR.log; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" + safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee $FUEGO_HOME/fuego.$TESTDIR/$TESTDIR.log; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" else safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee $2; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" fi @@ -104,7 +104,7 @@ function report_append { RETCODE=/tmp/$$-${RANDOM} if [ -z $2 ]; then echo "WARNING: test log file parameter empty, so will use default" - safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee -a $JTA_HOME/jta.$TESTDIR/$TESTDIR.log; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" + safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee -a $FUEGO_HOME/fuego.$TESTDIR/$TESTDIR.log; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" else safe_cmd "{ $1; echo \$? > $RETCODE; } 2>&1 | tee -a $2; exit \$(cat $RETCODE; rm $RETCODE &>/dev/null)" fi @@ -117,7 +117,7 @@ function dump_syslogs { is_empty $2 # We create /tmp/${2} dir in any case to capture target logs and prevent - # log dump to $JTA_HOME dir. + # log dump to $FUEGO_HOME dir. ov_rootfs_logread "$@" } @@ -147,7 +147,7 @@ function build_error () { # Build scripts must call this function in the beginning. # $1 is passed directly to unpack(). function pre_build { - source $JTA_SCRIPTS_PATH/tools.sh + source $FUEGO_SCRIPTS_PATH/tools.sh upName=`echo "${JOB_NAME^^}"| tr '.' '_'` spec_tarball="${upName}_TARBALL_NAME" @@ -248,9 +248,9 @@ function pre_test { # It is needed to create directory for test logs and system logs - mkdir -p $JTA_LOGS_PATH/$JOB_NAME/testlogs - mkdir -p $JTA_LOGS_PATH/$JOB_NAME/systemlogs - mkdir -p $JTA_LOGS_PATH/$JOB_NAME/devlogs + mkdir -p $FUEGO_LOGS_PATH/$JOB_NAME/testlogs + mkdir -p $FUEGO_LOGS_PATH/$JOB_NAME/systemlogs + mkdir -p $FUEGO_LOGS_PATH/$JOB_NAME/devlogs # /tmp/${1} is needed to save logs on different partition @@ -263,7 +263,7 @@ function pre_test { ov_rootfs_state - cmd "rm -rf $JTA_HOME/jta.$1 /tmp/$1; mkdir -p $JTA_HOME/jta.$1 /tmp/jta.$1" || abort_job "Could not create $1 and /tmp/$1 on $DEVICE" + cmd "rm -rf $FUEGO_HOME/fuego.$1 /tmp/$1; mkdir -p $FUEGO_HOME/fuego.$1 /tmp/fuego.$1" || abort_job "Could not create $1 and /tmp/$1 on $DEVICE" # Log test name ov_logger "logger \"Starting test ${JOB_NAME}\"" @@ -285,15 +285,15 @@ function bench_processing { echo -e "\n RESULT ANALYSIS \n" # Get the test results - get_testlog $TESTDIR $JTA_HOME/jta.$TESTDIR/$TESTDIR.log - DATA_FILE=$JTA_LOGS_PATH/${JOB_NAME}/plot.data - REF_FILE=$JTA_TESTS_PATH/${JOB_NAME}/reference.log + get_testlog $TESTDIR $FUEGO_HOME/fuego.$TESTDIR/$TESTDIR.log + DATA_FILE=$FUEGO_LOGS_PATH/${JOB_NAME}/plot.data + REF_FILE=$FUEGO_TESTS_PATH/${JOB_NAME}/reference.log PYTHON_ARGS="-W ignore::DeprecationWarning -W ignore::UserWarning" # The first command checks thresholds, and exits with appropriate return code. # Jenkins aborts script execution on any failure, but the second command needs to be executed in any case, and after the first one. # Therefore, this trick with 'rc' variable is required to always execute both commands, and pass proper status to Jenkins at the same time. - run_python $PYTHON_ARGS $JTA_TESTS_PATH/${JOB_NAME}/parser.py $JOB_NAME $PLATFORM $BUILD_ID $BUILD_NUMBER $FW $PLATFORM $NODE_NAME && rc=0 || rc=1 - run_python $PYTHON_ARGS $JTA_SCRIPTS_PATH/parser/dataload.py $JOB_NAME $DATA_FILE $REF_FILE + run_python $PYTHON_ARGS $FUEGO_TESTS_PATH/${JOB_NAME}/parser.py $JOB_NAME $PLATFORM $BUILD_ID $BUILD_NUMBER $FW $PLATFORM $NODE_NAME && rc=0 || rc=1 + run_python $PYTHON_ARGS $FUEGO_SCRIPTS_PATH/parser/dataload.py $JOB_NAME $DATA_FILE $REF_FILE if [ $rc -eq 1 ]; then false else @@ -304,8 +304,8 @@ function bench_processing { # search in test log for {!JOB_NAME}_FAIL_PATTERN_n fail cases and abort with message {!JOB_NAME}_FAIL_MESSAGE_n if found # args: $1 - path to test log function fail_check_cases () { - testlog=$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log - slog_prefix="$JTA_LOGS_PATH/${JOB_NAME}/systemlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}" + testlog=$FUEGO_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log + slog_prefix="$FUEGO_LOGS_PATH/${JOB_NAME}/systemlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}" upName=`echo "${JOB_NAME^^}"| tr '.' '_'` fcname="${upName}"_FAIL_CASE_COUNT @@ -333,7 +333,7 @@ function fail_check_cases () { if [ ! -z "$fpslog" ] then - if diff -ua ${slog_prefix}.before ${slog_prefix}.after | grep -vEf "$JTA_SCRIPTS_PATH/syslog.ignore" | grep -E -e $fptemplate; + if diff -ua ${slog_prefix}.before ${slog_prefix}.after | grep -vEf "$FUEGO_SCRIPTS_PATH/syslog.ignore" | grep -E -e $fptemplate; then echo "Located failing message in syslog diff" abort_job "Detected fail message in syslog diff: $fpmessage" @@ -352,11 +352,11 @@ function fail_check_cases () { function post_test { # source generated prolog.sh file since post_test is called separately - source $JTA_ENGINE_PATH/work/${NODE_NAME}_prolog.sh + source $FUEGO_ENGINE_PATH/work/${NODE_NAME}_prolog.sh export SSHPASS=$PASSWORD # re-source params to set correct DEVICE, LOGIN, SSH vars - source $JTA_SCRIPTS_PATH/params.sh + source $FUEGO_SCRIPTS_PATH/params.sh # $1 - tarball template, $2,$3,$4 - optional process names to kill @@ -368,10 +368,10 @@ function post_test { dump_syslogs $1 "after" # Get syslogs - get /tmp/jta.${1}/*.${BUILD_ID}.* $JTA_LOGS_PATH/${JOB_NAME}/systemlogs/ + get /tmp/fuego.${1}/*.${BUILD_ID}.* $FUEGO_LOGS_PATH/${JOB_NAME}/systemlogs/ # Remove work and log dirs - cmd "rm -rf $JTA_HOME/jta.$1 /tmp/jta.$1" + cmd "rm -rf $FUEGO_HOME/fuego.$1 /tmp/fuego.$1" # log test completion message. cmd "logger \"Test $1 is finished\"" @@ -383,7 +383,7 @@ function post_test { } function target_cleanup { - cmd "rm -rf $JTA_HOME/* /tmp/* $JTA_HOME/.local" + cmd "rm -rf $FUEGO_HOME/* /tmp/* $FUEGO_HOME/.local" } function target_reboot { @@ -406,7 +406,7 @@ function build_cleanup { function log_compare { # 1 - tarball template, 2 - number of results, 3 - Criteria, 4 - n/p (i.e. negative or possitive) - cd "$JTA_LOGS_PATH/${JOB_NAME}/testlogs" + cd "$FUEGO_LOGS_PATH/${JOB_NAME}/testlogs" LOGFILE="${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log" PARSED_LOGFILE="${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.{4}.log" @@ -416,7 +416,7 @@ function log_compare { cat $LOGFILE | grep -E "${3}" | tee "$PARSED_LOGFILE" local TMP_P=`diff -u ${WORKSPACE}/../ref_logs/${JOB_NAME}/${1}_${4}.log "$PARSED_LOGFILE" 2>&1` if [ $? -ne 0 ];then - echo -e "\nJTA error reason: Unexpected test log output:\n$TMP_P\n" + echo -e "\nFuego error reason: Unexpected test log output:\n$TMP_P\n" check_create_functional_logrun "test error" false else @@ -424,12 +424,12 @@ function log_compare { true fi else - echo -e "\nJTA error reason: Mismatch in expected ($2) and actual ($current_count) pos/neg ($4) results. (pattern: $3)\n" + echo -e "\nFuego error reason: Mismatch in expected ($2) and actual ($current_count) pos/neg ($4) results. (pattern: $3)\n" check_create_functional_logrun "failed" false fi else - echo -e "\nJTA error reason: 'logs/${JOB_NAME}/testlogs/$LOGFILE' is missing.\n" + echo -e "\nFuego error reason: 'logs/${JOB_NAME}/testlogs/$LOGFILE' is missing.\n" check_create_functional_logrun "test error" false fi @@ -441,26 +441,26 @@ function get_testlog { # $1 - tarball template, $2 - full path to logfile # XXX: It will be unified if [ -n "$2" ]; then - get ${2} $JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log + get ${2} $FUEGO_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log else - get $JTA_HOME/jta.$1/$1.log $JTA_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log + get $FUEGO_HOME/fuego.$1/$1.log $FUEGO_LOGS_PATH/${JOB_NAME}/testlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.log fi; } function syslog_cmp { # $1 - TESTDIR - PREFIX="$JTA_LOGS_PATH/${JOB_NAME}/systemlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}" + PREFIX="$FUEGO_LOGS_PATH/${JOB_NAME}/systemlogs/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}" rc=0 if [ -f ${PREFIX}.before ]; then - if diff -ua ${PREFIX}.before ${PREFIX}.after | grep -vEf "$JTA_SCRIPTS_PATH/syslog.ignore" | grep -E -e '\.(Bug:|Oops)'; then + if diff -ua ${PREFIX}.before ${PREFIX}.after | grep -vEf "$FUEGO_SCRIPTS_PATH/syslog.ignore" | grep -E -e '\.(Bug:|Oops)'; then rc=1 fi # else # special case for "reboot" test - # if grep -vE -e '\.(info|notice|debug|warn)|Boot Reason: Warm' -f "$JTA_SCRIPTS_PATH/syslog.ignore" ${PREFIX}.after; then + # if grep -vE -e '\.(info|notice|debug|warn)|Boot Reason: Warm' -f "$FUEGO_SCRIPTS_PATH/syslog.ignore" ${PREFIX}.after; then # rc=1 # fi fi - [ $rc -eq 1 ] && echo -e "\nJTA error reason: Unexpected syslog messages.\n" + [ $rc -eq 1 ] && echo -e "\nFuego error reason: Unexpected syslog messages.\n" return $rc } @@ -484,7 +484,7 @@ function hd_test_mount_prepare () { cmd "mount $HD_MOUNT_BLOCKDEV $HD_MOUNT_POINT" fi - cmd "mkdir -p $HD_MOUNT_POINT/jta.$TESTDIR" + cmd "mkdir -p $HD_MOUNT_POINT/fuego.$TESTDIR" } @@ -492,7 +492,7 @@ function hd_test_clean_umount() { HD_MOUNT_BLOCKDEV=$1 HD_MOUNT_POINT=$2 - cmd "rm -rf $HD_MOUNT_POINT/jta.$TESTDIR" + cmd "rm -rf $HD_MOUNT_POINT/fuego.$TESTDIR" if [ "$HD_MOUNT_BLOCKDEV" != "ROOT" ] then diff --git a/engine/scripts/overlays.sh b/engine/scripts/overlays.sh index 01fca45..0b4b62a 100644 --- a/engine/scripts/overlays.sh +++ b/engine/scripts/overlays.sh @@ -22,9 +22,9 @@ # This script contains overlay functionality: checking necessary overlay variables and generating prolog.sh file -. $JTA_SCRIPTS_PATH/common.sh +. $FUEGO_SCRIPTS_PATH/common.sh -OF_ROOT=$JTA_ENGINE_PATH/overlays/ +OF_ROOT=$FUEGO_ENGINE_PATH/overlays/ OF_CLASSDIR="$OF_ROOT/base" OF_DEFAULT_SPECDIR=$OF_ROOT/test_specs/ OF_OVFILES="" @@ -35,11 +35,11 @@ OF_TESTPLAN_ARGS="" OF_SPECDIR_ARGS="--specdir $OF_DEFAULT_SPECDIR" assert_define "NODE_NAME" -OF_OUTPUT_FILE="$JTA_ENGINE_PATH/work/${NODE_NAME}_prolog.sh" +OF_OUTPUT_FILE="$FUEGO_ENGINE_PATH/work/${NODE_NAME}_prolog.sh" OF_OUTPUT_FILE_ARGS="--output $OF_OUTPUT_FILE" OF_DISTRIB_FILE="" -OF_OVGEN="$JTA_SCRIPTS_PATH/ovgen/ovgen.py" +OF_OVGEN="$FUEGO_SCRIPTS_PATH/ovgen/ovgen.py" function set_overlay_vars() { echo "board overlay: $BOARD_OVERLAY" diff --git a/engine/scripts/ovgen/ovgen.py b/engine/scripts/ovgen/ovgen.py index 7f14795..26fab58 100755 --- a/engine/scripts/ovgen/ovgen.py +++ b/engine/scripts/ovgen/ovgen.py @@ -196,7 +196,7 @@ def baseParseFunction(line, f, ofc): # parse base file definitions def parseBaseFile(baseFilePath, ofc): - debug_print ("\n------------\nparsing " + baseFilePath + " jtaclass ...\n") + debug_print ("\n------------\nparsing " + baseFilePath + " fuegoclass ...\n") f = open(baseFilePath) while 1: line = f.readline() @@ -214,10 +214,10 @@ def parseBaseFile(baseFilePath, ofc): # parse all base files in dir def parseBaseDir(baseDirPath, ofcls): - debug_print ("\n------------\nparsing " + baseDirPath + " jtaclass dir ...\n") - jtaFiles = glob.glob(baseDirPath + "/*.jtaclass") + debug_print ("\n------------\nparsing " + baseDirPath + " fuegoclass dir ...\n") + fuegoFiles = glob.glob(baseDirPath + "/*.fuegoclass") - for f in jtaFiles: + for f in fuegoFiles: ofc = OFClass() parseBaseFile(f, ofc) debug_print ("parsed %s class\n------------\n" % (ofc.name)) diff --git a/engine/scripts/params.sh b/engine/scripts/params.sh index 8bb9cef..565e86e 100755 --- a/engine/scripts/params.sh +++ b/engine/scripts/params.sh @@ -1 +1 @@ -# this file used to hold ssh etc params. now they are in base-params.jtaclass +# this file used to hold ssh etc params. now they are in base-params.fuegoclass diff --git a/engine/scripts/parser/common.py b/engine/scripts/parser/common.py index b1838e1..3228af9 100644 --- a/engine/scripts/parser/common.py +++ b/engine/scripts/parser/common.py @@ -39,7 +39,7 @@ import matplotlib matplotlib.use('Agg') import pylab as plot -JENKINS_HOME=os.environ['JTA_ENGINE_PATH'] +JENKINS_HOME=os.environ['FUEGO_ENGINE_PATH'] JOB_NAME=sys.argv[1] PLATFORM=sys.argv[2] # ignored for backward compatibility @@ -92,7 +92,7 @@ def write_report_results(rep_data): def process_data(ref_section_pat, cur_dict, m, label): if not cur_dict: - print "\nJTA error reason: could not parse test results in %s\n" % CUR_LOG + print "\nFuego error reason: could not parse test results in %s\n" % CUR_LOG sys.exit(1) if custom_write_report == False: @@ -185,7 +185,7 @@ def store_plot_data(r_dict, c_dict): if (data[-1].split()[1] != BUILD_NUMBER): # Check presents of build data in file fill_data (plot_file,r_dict,c_dict) else: - print "\nJTA error reason: %s already contains data for build #%s\n" % (PLOT_DATA, BUILD_NUMBER) + print "\nFuego error reason: %s already contains data for build #%s\n" % (PLOT_DATA, BUILD_NUMBER) else: plot_file = open(PLOT_DATA,"w") # Create new fill_data (plot_file,r_dict,c_dict) @@ -434,7 +434,7 @@ def compare(ref_dict,cur_dict,crit_dict): print "For test "+key+" current value is "+cur_split[i]+", reference value - "+ref_split[i]+". Result - OK.\nComparison criteria is \""+crit_string+"\".\n" if rc == 1: - print "JTA error reason: Unmet threshold(s)" + print "Fuego error reason: Unmet threshold(s)" return rc diff --git a/engine/scripts/parser/dataload.py b/engine/scripts/parser/dataload.py index 57355ef..f927703 100755 --- a/engine/scripts/parser/dataload.py +++ b/engine/scripts/parser/dataload.py @@ -27,7 +27,7 @@ import simplejson as json JOB_NAME=sys.argv[1] DATAFILE=sys.argv[2] REF_DATA=sys.argv[3] -RESULT_PATH=os.environ['JTA_LOGS_PATH']+'/'+JOB_NAME+'/' +RESULT_PATH=os.environ['FUEGO_LOGS_PATH']+'/'+JOB_NAME+'/' CUR_DEVICE=os.getenv('NODE_NAME') diff --git a/engine/scripts/parser/tests/check_plotdata.py b/engine/scripts/parser/tests/check_plotdata.py index 39094fb..5efe727 100755 --- a/engine/scripts/parser/tests/check_plotdata.py +++ b/engine/scripts/parser/tests/check_plotdata.py @@ -22,7 +22,7 @@ import os, sys # Search for plot.data files -search_root = os.environ['JTA_ENGINE_PATH'] +search_root = os.environ['FUEGO_ENGINE_PATH'] for root, dirs, files in os.walk(search_root): for file in files: if 'plot.data' == file: diff --git a/engine/scripts/postbuild.groovy b/engine/scripts/postbuild.groovy index 5099169..4859232 100644 --- a/engine/scripts/postbuild.groovy +++ b/engine/scripts/postbuild.groovy @@ -5,7 +5,7 @@ if (sdk_str) { sdk_ver = sdk_str.tokenize(' / ')[1] } -def log_matcher = manager.getLogMatcher(".*[^\"n]JTA error reason: (.*)\$") +def log_matcher = manager.getLogMatcher(".*[^\"n]Fuego error reason: (.*)\$") if (log_matcher?.matches()) { abort_reason = log_matcher.group(1); manager.createSummary("error.gif").appendText("${abort_reason}", false, false, false, "red"); diff --git a/engine/scripts/reports.sh b/engine/scripts/reports.sh index fffd0a2..b6c6c4a 100644 --- a/engine/scripts/reports.sh +++ b/engine/scripts/reports.sh @@ -23,15 +23,15 @@ # This script contains report generating functionality: creating logrun files, creating test results files and producing PDF output -. $JTA_SCRIPTS_PATH/common.sh +. $FUEGO_SCRIPTS_PATH/common.sh -REP_LOGGEN="$JTA_SCRIPTS_PATH/loggen/loggen.py" -REP_DIR="$JTA_LOGS_PATH/logruns/" -OF_ROOT="$JTA_ENGINE_PATH/overlays/" -REP_GEN="$JTA_SCRIPTS_PATH/loggen/gentexml.py" +REP_LOGGEN="$FUEGO_SCRIPTS_PATH/loggen/loggen.py" +REP_DIR="$FUEGO_LOGS_PATH/logruns/" +OF_ROOT="$FUEGO_ENGINE_PATH/overlays/" +REP_GEN="$FUEGO_SCRIPTS_PATH/loggen/gentexml.py" -TESTLOG="$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.log" -TEST_RES="$JTA_LOGS_PATH/${JOB_NAME}/testlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.res.json" +TESTLOG="$FUEGO_LOGS_PATH/${JOB_NAME}/testlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.log" +TEST_RES="$FUEGO_LOGS_PATH/${JOB_NAME}/testlogs/${Device}.${BUILD_ID}.${BUILD_NUMBER}.res.json" GEN_TESTRES_FILE="" function check_create_logrun () { diff --git a/engine/scripts/stress.sh b/engine/scripts/stress.sh index 19eb2f1..965d064 100644 --- a/engine/scripts/stress.sh +++ b/engine/scripts/stress.sh @@ -21,11 +21,11 @@ # DESCRIPTION # This script contains a sequence of calls that are needed for running stress test -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR diff --git a/engine/scripts/test.sh b/engine/scripts/test.sh index 60a24fc..65f6dae 100644 --- a/engine/scripts/test.sh +++ b/engine/scripts/test.sh @@ -21,11 +21,11 @@ # DESCRIPTION # This script contains a sequence of calls that are needed for running a test -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR diff --git a/engine/tests/Benchmark.Dhrystone/Dhrystone.sh b/engine/tests/Benchmark.Dhrystone/Dhrystone.sh index ee22bcc..2524036 100644 --- a/engine/tests/Benchmark.Dhrystone/Dhrystone.sh +++ b/engine/tests/Benchmark.Dhrystone/Dhrystone.sh @@ -8,13 +8,13 @@ function test_build { } function test_deploy { - put dhrystone $JTA_HOME/jta.$TESTDIR/ || return 1 + put dhrystone $FUEGO_HOME/fuego.$TESTDIR/ || return 1 } function test_run { assert_define BENCHMARK_DHRYSTONE_LOOPS - report "cd $JTA_HOME/jta.$TESTDIR; ./dhrystone $BENCHMARK_DHRYSTONE_LOOPS" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./dhrystone $BENCHMARK_DHRYSTONE_LOOPS" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.Dhrystone/parser.py b/engine/tests/Benchmark.Dhrystone/parser.py index 03ec3e4..5a43387 100755 --- a/engine/tests/Benchmark.Dhrystone/parser.py +++ b/engine/tests/Benchmark.Dhrystone/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.GLMark/GLMark.sh b/engine/tests/Benchmark.GLMark/GLMark.sh index 9236dd5..b178ca2 100644 --- a/engine/tests/Benchmark.GLMark/GLMark.sh +++ b/engine/tests/Benchmark.GLMark/GLMark.sh @@ -12,11 +12,11 @@ function test_build { } function test_deploy { - put -r glmark data $JTA_HOME/jta.$TESTDIR/ + put -r glmark data $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - safe_cmd "{ cd $JTA_HOME/jta.$TESTDIR; export DISPLAY=:0; xrandr |awk '/\*/ {split(\$1, a, \"x\"); print a[1], a[2], 32, 1}' > params; ./glmark &> < params; } || { [ \$? -eq 142 ] && exit 0; }" + safe_cmd "{ cd $FUEGO_HOME/fuego.$TESTDIR; export DISPLAY=:0; xrandr |awk '/\*/ {split(\$1, a, \"x\"); print a[1], a[2], 32, 1}' > params; ./glmark &> < params; } || { [ \$? -eq 142 ] && exit 0; }" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.GLMark/parser.py b/engine/tests/Benchmark.GLMark/parser.py index 2c1e210..97b890f 100755 --- a/engine/tests/Benchmark.GLMark/parser.py +++ b/engine/tests/Benchmark.GLMark/parser.py @@ -3,7 +3,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.GLMark/reference.log b/engine/tests/Benchmark.GLMark/reference.log index 40fd881..c58e4fe 100644 --- a/engine/tests/Benchmark.GLMark/reference.log +++ b/engine/tests/Benchmark.GLMark/reference.log @@ -1,3 +1,3 @@ -# Automatically generated on jta by thresholds.awk based on [628, 670] build range +# Automatically generated on fuego by thresholds.awk based on [628, 670] build range [GLMark_Score|ge] 1 diff --git a/engine/tests/Benchmark.IOzone/iozone.sh b/engine/tests/Benchmark.IOzone/iozone.sh index b76625b..cf42a12 100644 --- a/engine/tests/Benchmark.IOzone/iozone.sh +++ b/engine/tests/Benchmark.IOzone/iozone.sh @@ -18,12 +18,12 @@ function test_build { function test_deploy { cd src/current - put fileop iozone pit_server $JTA_HOME/jta.$TESTDIR/ + put fileop iozone pit_server $FUEGO_HOME/fuego.$TESTDIR/ } # function test_run { -# report "cd $JTA_HOME/jta.$TESTDIR; ./iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $file_size" $JTA_HOME/jta.$TESTDIR/$TESTDIR_tmp.log -# safe_cmd "cd $JTA_HOME/jta.$TESTDIR; cat $JTA_HOME/jta.$TESTDIR/$TESTDIR_tmp.log | tail -n 139 | tee " +# report "cd $FUEGO_HOME/fuego.$TESTDIR; ./iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $file_size" $FUEGO_HOME/fuego.$TESTDIR/$TESTDIR_tmp.log +# safe_cmd "cd $FUEGO_HOME/fuego.$TESTDIR; cat $FUEGO_HOME/fuego.$TESTDIR/$TESTDIR_tmp.log | tail -n 139 | tee " # } function test_run { @@ -33,11 +33,11 @@ function test_run { hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT - report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $JTA_HOME/jta.$TESTDIR/iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $BENCHMARK_IOZONE_FILE_SIZE" $JTA_HOME/jta.$TESTDIR/Benchmark.IOzone.log - safe_cmd "cd $JTA_HOME/jta.$TESTDIR; cat $JTA_HOME/jta.$TESTDIR/Benchmark.IOzone.log | tail -n 139 | tee " + report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $FUEGO_HOME/fuego.$TESTDIR/iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $BENCHMARK_IOZONE_FILE_SIZE" $FUEGO_HOME/fuego.$TESTDIR/Benchmark.IOzone.log + safe_cmd "cd $FUEGO_HOME/fuego.$TESTDIR; cat $FUEGO_HOME/fuego.$TESTDIR/Benchmark.IOzone.log | tail -n 139 | tee " hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.IOzone/parser.py b/engine/tests/Benchmark.IOzone/parser.py index 29ad3f7..40d5318 100755 --- a/engine/tests/Benchmark.IOzone/parser.py +++ b/engine/tests/Benchmark.IOzone/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.IOzone/reference.log b/engine/tests/Benchmark.IOzone/reference.log index 01b0251..feeecdb 100644 --- a/engine/tests/Benchmark.IOzone/reference.log +++ b/engine/tests/Benchmark.IOzone/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 25 results of 0\.18\.04\. firmware regexp crossed with [787, 853] build range [2048_Kb_Record_Read.Fread|ge] 1 diff --git a/engine/tests/Benchmark.Interbench/interbench.sh b/engine/tests/Benchmark.Interbench/interbench.sh index a0b2b14..4363c53 100644 --- a/engine/tests/Benchmark.Interbench/interbench.sh +++ b/engine/tests/Benchmark.Interbench/interbench.sh @@ -6,11 +6,11 @@ function test_build { } function test_deploy { - put interbench $JTA_HOME/jta.$TESTDIR/ + put interbench $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./interbench -L 1 || ./interbench -L 1" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./interbench -L 1 || ./interbench -L 1" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.Interbench/parser.py b/engine/tests/Benchmark.Interbench/parser.py index cc8b8cf..23c4c94 100755 --- a/engine/tests/Benchmark.Interbench/parser.py +++ b/engine/tests/Benchmark.Interbench/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d._]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.Interbench/reference.log b/engine/tests/Benchmark.Interbench/reference.log index 3cd94a1..fee336d 100644 --- a/engine/tests/Benchmark.Interbench/reference.log +++ b/engine/tests/Benchmark.Interbench/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 36 results of 0\.18\.04\. firmware regexp crossed with [796, 872] build range [Audio.Burn|le] 1000 diff --git a/engine/tests/Benchmark.Java/java_perf.sh b/engine/tests/Benchmark.Java/java_perf.sh index f54292f..28217ba 100644 --- a/engine/tests/Benchmark.Java/java_perf.sh +++ b/engine/tests/Benchmark.Java/java_perf.sh @@ -5,17 +5,17 @@ function test_build { } function test_deploy { - put *.jar $JTA_HOME/jta.$TESTDIR/ + put *.jar $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; java -cp scimark2lib.jar jnt.scimark2.commandline" - report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar avrora" $JTA_HOME/ - report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar jython" - report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar luindex" - report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar lusearch" - #report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar tomcat" - report_append "cd $JTA_HOME/jta.$TESTDIR; java -jar dacapo-9.12-bach.jar xalan" + report "cd $FUEGO_HOME/fuego.$TESTDIR; java -cp scimark2lib.jar jnt.scimark2.commandline" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar avrora" $FUEGO_HOME/ + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar jython" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar luindex" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar lusearch" + #report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar tomcat" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar xalan" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.Java/parser.py b/engine/tests/Benchmark.Java/parser.py index e73b2d7..6a19607 100755 --- a/engine/tests/Benchmark.Java/parser.py +++ b/engine/tests/Benchmark.Java/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.Java/reference.log b/engine/tests/Benchmark.Java/reference.log index 7fe5c38..0b917b0 100644 --- a/engine/tests/Benchmark.Java/reference.log +++ b/engine/tests/Benchmark.Java/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 39 results of 0\.18\.05\.0002 firmware regexp crossed with [1060, 1127] build range [DaCapo.jython|le] 1000000 diff --git a/engine/tests/Benchmark.OpenSSL/openssl-bench.sh b/engine/tests/Benchmark.OpenSSL/openssl-bench.sh index 4250a5d..ec77153 100644 --- a/engine/tests/Benchmark.OpenSSL/openssl-bench.sh +++ b/engine/tests/Benchmark.OpenSSL/openssl-bench.sh @@ -1,5 +1,5 @@ -source $JTA_TESTS_PATH/OpenSSL/openssl.sh +source $FUEGO_TESTS_PATH/OpenSSL/openssl.sh -report "cd $JTA_HOME/jta.$TESTDIR; apps/openssl speed" +report "cd $FUEGO_HOME/fuego.$TESTDIR; apps/openssl speed" bench_processing diff --git a/engine/tests/Benchmark.OpenSSL/parser.py b/engine/tests/Benchmark.OpenSSL/parser.py index acef32c..3eb717e 100755 --- a/engine/tests/Benchmark.OpenSSL/parser.py +++ b/engine/tests/Benchmark.OpenSSL/parser.py @@ -3,7 +3,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\d\w_.-]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.Stream/parser.py b/engine/tests/Benchmark.Stream/parser.py index 7c9611c..04bbca9 100755 --- a/engine/tests/Benchmark.Stream/parser.py +++ b/engine/tests/Benchmark.Stream/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.Stream/reference.log b/engine/tests/Benchmark.Stream/reference.log index 36f53cb..71baaf6 100644 --- a/engine/tests/Benchmark.Stream/reference.log +++ b/engine/tests/Benchmark.Stream/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta by thresholds.awk based on [648, 688] build range +# Automatically generated on fuego by thresholds.awk based on [648, 688] build range [Add|ge] 1 [Copy|ge] diff --git a/engine/tests/Benchmark.Stream/stream.sh b/engine/tests/Benchmark.Stream/stream.sh index b4e5f58..a0e1aa3 100644 --- a/engine/tests/Benchmark.Stream/stream.sh +++ b/engine/tests/Benchmark.Stream/stream.sh @@ -5,11 +5,11 @@ function test_build { } function test_deploy { - put stream_c.exe $JTA_HOME/jta.$TESTDIR/ + put stream_c.exe $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./stream_c.exe" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./stream_c.exe" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.Whetstone/Whetstone.sh b/engine/tests/Benchmark.Whetstone/Whetstone.sh index d333f00..8799c60 100644 --- a/engine/tests/Benchmark.Whetstone/Whetstone.sh +++ b/engine/tests/Benchmark.Whetstone/Whetstone.sh @@ -6,12 +6,12 @@ function test_build { } function test_deploy { - put whetstone $JTA_HOME/jta.$TESTDIR/ + put whetstone $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define BENCHMARK_WHETSTONE_LOOPS - report "cd $JTA_HOME/jta.$TESTDIR && ./whetstone $BENCHMARK_WHETSTONE_LOOPS" + report "cd $FUEGO_HOME/fuego.$TESTDIR && ./whetstone $BENCHMARK_WHETSTONE_LOOPS" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.Whetstone/parser.py b/engine/tests/Benchmark.Whetstone/parser.py index 73203c2..4cb6d35 100755 --- a/engine/tests/Benchmark.Whetstone/parser.py +++ b/engine/tests/Benchmark.Whetstone/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.aim7/aim7.sh b/engine/tests/Benchmark.aim7/aim7.sh index f4b7304..0951dba 100644 --- a/engine/tests/Benchmark.aim7/aim7.sh +++ b/engine/tests/Benchmark.aim7/aim7.sh @@ -2,19 +2,19 @@ tarball=osdl-aim-7.0.1.13.tar.gz function test_build { ./bootstrap - PKG_CONFIG_PATH=${SDKROOT}/usr/lib/pkgconfig PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_SYSROOT_DIR=${SDKROOT} ./configure --host=$HOST --build=`uname -m`-linux-gnu LDFLAGS=-L${SDKROOT}/usr/lib CPPFLAGS=-I${SDKROOT}/usr/include CFLAGS=-I${SDKROOT}/usr/include LIBS=-laio --prefix=$JTA_HOME/$TESTDIR --datarootdir=$JTA_HOME/$TESTDIR + PKG_CONFIG_PATH=${SDKROOT}/usr/lib/pkgconfig PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG_SYSROOT_DIR=${SDKROOT} ./configure --host=$HOST --build=`uname -m`-linux-gnu LDFLAGS=-L${SDKROOT}/usr/lib CPPFLAGS=-I${SDKROOT}/usr/include CFLAGS=-I${SDKROOT}/usr/include LIBS=-laio --prefix=$FUEGO_HOME/$TESTDIR --datarootdir=$FUEGO_HOME/$TESTDIR make && touch test_suite_ready || build_error "error while building test" } function test_deploy { - put src/reaim $JTA_HOME/jta.$TESTDIR/ - put -r data $JTA_HOME/jta.$TESTDIR/ - put -r scripts $JTA_HOME/jta.$TESTDIR/ + put src/reaim $FUEGO_HOME/fuego.$TESTDIR/ + put -r data $FUEGO_HOME/fuego.$TESTDIR/ + put -r scripts $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; mkdir /tmp/diskdir; ./reaim -c ./data/reaim.config -f ./data/workfile.short" - report_append "cd $JTA_HOME/jta.$TESTDIR; ./reaim -c ./data/reaim.config -f ./data/workfile.all_utime" + report "cd $FUEGO_HOME/fuego.$TESTDIR; mkdir /tmp/diskdir; ./reaim -c ./data/reaim.config -f ./data/workfile.short" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; ./reaim -c ./data/reaim.config -f ./data/workfile.all_utime" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.aim7/parser.py b/engine/tests/Benchmark.aim7/parser.py index ef07b31..aabee07 100755 --- a/engine/tests/Benchmark.aim7/parser.py +++ b/engine/tests/Benchmark.aim7/parser.py @@ -3,7 +3,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.bc/bc-script.sh b/engine/tests/Benchmark.bc/bc-script.sh index c7ceba6..69447ce 100755 --- a/engine/tests/Benchmark.bc/bc-script.sh +++ b/engine/tests/Benchmark.bc/bc-script.sh @@ -7,13 +7,13 @@ function test_build { } function test_deploy { - put bc-device.sh $JTA_HOME/jta.$TESTDIR/ + put bc-device.sh $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define BENCHMARK_BC_EXPR1 assert_define BENCHMARK_BC_EXPR2 - report "cd $JTA_HOME/jta.$TESTDIR; ./bc-device.sh $BENCHMARK_BC_EXPR1 $BENCHMARK_BC_EXPR2" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./bc-device.sh $BENCHMARK_BC_EXPR1 $BENCHMARK_BC_EXPR2" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.bc/parser.py b/engine/tests/Benchmark.bc/parser.py index 3a0bff5..3890c14 100644 --- a/engine/tests/Benchmark.bc/parser.py +++ b/engine/tests/Benchmark.bc/parser.py @@ -2,7 +2,7 @@ import os, re, sys, json -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib cur_dict = {} diff --git a/engine/tests/Benchmark.blobsallad/blobsallad.sh b/engine/tests/Benchmark.blobsallad/blobsallad.sh index ba41e38..71ad791 100644 --- a/engine/tests/Benchmark.blobsallad/blobsallad.sh +++ b/engine/tests/Benchmark.blobsallad/blobsallad.sh @@ -9,12 +9,12 @@ function test_build { } function test_deploy { - put blobsallad $JTA_HOME/jta.$TESTDIR/ - put -r maps $JTA_HOME/jta.$TESTDIR/ + put blobsallad $FUEGO_HOME/fuego.$TESTDIR/ + put -r maps $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1, a, \"x\"); exit(system(\"./blobsallad \" a[1] a[2]))}'" + report "cd $FUEGO_HOME/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1, a, \"x\"); exit(system(\"./blobsallad \" a[1] a[2]))}'" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.blobsallad/parser.py b/engine/tests/Benchmark.blobsallad/parser.py index 6ad8113..4f64b20 100755 --- a/engine/tests/Benchmark.blobsallad/parser.py +++ b/engine/tests/Benchmark.blobsallad/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\d\w_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.bonnie/bonnie++.sh b/engine/tests/Benchmark.bonnie/bonnie++.sh index 95b97ec..5505110 100644 --- a/engine/tests/Benchmark.bonnie/bonnie++.sh +++ b/engine/tests/Benchmark.bonnie/bonnie++.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put bonnie++ $JTA_HOME/jta.$TESTDIR/ + put bonnie++ $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -17,10 +17,10 @@ function test_run { hd_test_mount_prepare $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT - report "cd $JTA_HOME/jta.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/jta.$TESTDIR -s $BENCHMARK_BONNIE_SIZE -u 0:0 -r $BENCHMARK_BONNIE_RAM" + report "cd $FUEGO_HOME/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -s $BENCHMARK_BONNIE_SIZE -u 0:0 -r $BENCHMARK_BONNIE_RAM" sleep 60 hd_test_clean_umount $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.bonnie/parser.py b/engine/tests/Benchmark.bonnie/parser.py index 0de1143..a486049 100755 --- a/engine/tests/Benchmark.bonnie/parser.py +++ b/engine/tests/Benchmark.bonnie/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w_ .]+.[gle]{2}\]" @@ -17,7 +17,7 @@ results = raw_values[-1].rstrip("\n").split(",") cur_file.close() if len(results) < 26: - sys.exit("\nJTA error reason: No results found\n") + sys.exit("\nFuego error reason: No results found\n") cur_dict["Sequential_Output.PerChr"] = results[2] cur_dict["Sequential_Output.Block"] = results[4] diff --git a/engine/tests/Benchmark.cyclictest/cyclictest.sh b/engine/tests/Benchmark.cyclictest/cyclictest.sh index db12310..3f5608b 100644 --- a/engine/tests/Benchmark.cyclictest/cyclictest.sh +++ b/engine/tests/Benchmark.cyclictest/cyclictest.sh @@ -5,12 +5,12 @@ function test_build { } function test_deploy { - put cyclictest $JTA_HOME/jta.$TESTDIR/ + put cyclictest $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define BENCHMARK_CYCLICTEST_LOOPS - report "cd $JTA_HOME/jta.$TESTDIR; ./cyclictest -t 2 -l $BENCHMARK_CYCLICTEST_LOOPS -q" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./cyclictest -t 2 -l $BENCHMARK_CYCLICTEST_LOOPS -q" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.cyclictest/parser.py b/engine/tests/Benchmark.cyclictest/parser.py index dde3967..9d10d1a 100755 --- a/engine/tests/Benchmark.cyclictest/parser.py +++ b/engine/tests/Benchmark.cyclictest/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.dbench/dbench.sh b/engine/tests/Benchmark.dbench/dbench.sh index 81dfabf..2dd4e99 100644 --- a/engine/tests/Benchmark.dbench/dbench.sh +++ b/engine/tests/Benchmark.dbench/dbench.sh @@ -7,7 +7,7 @@ function test_build { } function test_deploy { - put dbench client.txt $JTA_HOME/jta.$TESTDIR/ + put dbench client.txt $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -18,11 +18,11 @@ function test_run { hd_test_mount_prepare $BENCHMARK_DBENCH_MOUNT_BLOCKDEV $BENCHMARK_DBENCH_MOUNT_POINT - report "cd $JTA_HOME/jta.$TESTDIR; cp client.txt $BENCHMARK_DBENCH_MOUNT_POINT/jta.$TESTDIR; pwd; ./dbench -t $BENCHMARK_DBENCH_TIMELIMIT -D $BENCHMARK_DBENCH_MOUNT_POINT/jta.$TESTDIR -c $BENCHMARK_DBENCH_MOUNT_POINT/jta.$TESTDIR/client.txt $BENCHMARK_DBENCH_NPROCS; rm $BENCHMARK_DBENCH_MOUNT_POINT/jta.$TESTDIR/client.txt" + report "cd $FUEGO_HOME/fuego.$TESTDIR; cp client.txt $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR; pwd; ./dbench -t $BENCHMARK_DBENCH_TIMELIMIT -D $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR -c $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR/client.txt $BENCHMARK_DBENCH_NPROCS; rm $BENCHMARK_DBENCH_MOUNT_POINT/fuego.$TESTDIR/client.txt" sleep 5 hd_test_clean_umount $BENCHMARK_DBENCH_MOUNT_BLOCKDEV $BENCHMARK_DBENCH_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.dbench/parser.py b/engine/tests/Benchmark.dbench/parser.py index 136ee24..9df59d1 100755 --- a/engine/tests/Benchmark.dbench/parser.py +++ b/engine/tests/Benchmark.dbench/parser.py @@ -3,7 +3,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.dbench/reference.log b/engine/tests/Benchmark.dbench/reference.log index d69127a..4b056b0 100644 --- a/engine/tests/Benchmark.dbench/reference.log +++ b/engine/tests/Benchmark.dbench/reference.log @@ -1,3 +1,3 @@ -# Automatically generated on jta by thresholds.awk based on [628, 670] build range +# Automatically generated on fuego by thresholds.awk based on [628, 670] build range [Throughput|ge] 0 diff --git a/engine/tests/Benchmark.ebizzy/ebizzy.sh b/engine/tests/Benchmark.ebizzy/ebizzy.sh index b524261..2192cff 100644 --- a/engine/tests/Benchmark.ebizzy/ebizzy.sh +++ b/engine/tests/Benchmark.ebizzy/ebizzy.sh @@ -5,7 +5,7 @@ function test_build { } function test_deploy { - put ebizzy $JTA_HOME/jta.$TESTDIR/ + put ebizzy $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -14,7 +14,7 @@ function test_run { assert_define BENCHMARK_EBIZZY_TIME assert_define BENCHMARK_EBIZZY_THREADS - report "cd $JTA_HOME/jta.$TESTDIR; ./ebizzy -m -n $BENCHMARK_EBIZZY_CHUNKS -P -R -s $BENCHMARK_EBIZZY_CHUNK_SIZE -S $BENCHMARK_EBIZZY_TIME -t $BENCHMARK_EBIZZY_THREADS" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./ebizzy -m -n $BENCHMARK_EBIZZY_CHUNKS -P -R -s $BENCHMARK_EBIZZY_CHUNK_SIZE -S $BENCHMARK_EBIZZY_TIME -t $BENCHMARK_EBIZZY_THREADS" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.ebizzy/parser.py b/engine/tests/Benchmark.ebizzy/parser.py index 4a75353..8d429a3 100755 --- a/engine/tests/Benchmark.ebizzy/parser.py +++ b/engine/tests/Benchmark.ebizzy/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.ffsb/ffsb.sh b/engine/tests/Benchmark.ffsb/ffsb.sh index 4a5ff37..0a509ee 100644 --- a/engine/tests/Benchmark.ffsb/ffsb.sh +++ b/engine/tests/Benchmark.ffsb/ffsb.sh @@ -7,9 +7,9 @@ function test_build { function test_deploy { assert_define BENCHMARK_FFSB_MOUNT_POINT - sed -i "s|/mnt/test1|$BENCHMARK_FFSB_MOUNT_POINT/jta.$TESTDIR|g" examples/profile_everything - put ffsb $JTA_HOME/jta.$TESTDIR/ - put examples/profile_everything $JTA_HOME/jta.$TESTDIR/ + sed -i "s|/mnt/test1|$BENCHMARK_FFSB_MOUNT_POINT/fuego.$TESTDIR|g" examples/profile_everything + put ffsb $FUEGO_HOME/fuego.$TESTDIR/ + put examples/profile_everything $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -18,9 +18,9 @@ function test_run { hd_test_mount_prepare $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT - report "cd $JTA_HOME/jta.$TESTDIR; ./ffsb profile_everything" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./ffsb profile_everything" hd_test_clean_umount $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.ffsb/parser.py b/engine/tests/Benchmark.ffsb/parser.py index 7a834e3..f6ee6c1 100755 --- a/engine/tests/Benchmark.ffsb/parser.py +++ b/engine/tests/Benchmark.ffsb/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.fio/fio.sh b/engine/tests/Benchmark.fio/fio.sh index b64be23..dc2fdfd 100644 --- a/engine/tests/Benchmark.fio/fio.sh +++ b/engine/tests/Benchmark.fio/fio.sh @@ -21,14 +21,14 @@ function test_deploy { # libaio is not available in XXX; O_DIRECT is not supported by XXXfs. sed -i -e "s/libaio/posixaio/g" -e "/direct=/d" fsx-current ssd-test-current - sed -i -e "s|mount\-point\-of\-ssd|$BENCHMARK_FIO_MOUNT_POINT/jta.$TESTDIR|g" -e "s/1g/90m/g" ssd-test-current + sed -i -e "s|mount\-point\-of\-ssd|$BENCHMARK_FIO_MOUNT_POINT/fuego.$TESTDIR|g" -e "s/1g/90m/g" ssd-test-current # Decrease test execution time by an order of magnitude sed -i -e "/loops=/cloops=10000" fsx-current - echo "directory=$BENCHMARK_FIO_MOUNT_POINT/jta.$TESTDIR" >> fsx-current + echo "directory=$BENCHMARK_FIO_MOUNT_POINT/fuego.$TESTDIR" >> fsx-current cd - - put fio examples/fsx-current examples/ssd-test-current $JTA_HOME/jta.$TESTDIR/ + put fio examples/fsx-current examples/ssd-test-current $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -38,10 +38,10 @@ function test_run { hd_test_mount_prepare $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT - report "cd $JTA_HOME/jta.$TESTDIR; ./fio ssd-test-current --timeout=$timeout" - report_append "cd $JTA_HOME/jta.$TESTDIR; ./fio fsx-current --timeout=$BENCHMARK_FIO_TIMEOUT" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./fio ssd-test-current --timeout=$timeout" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; ./fio fsx-current --timeout=$BENCHMARK_FIO_TIMEOUT" hd_test_clean_umount $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.fio/parser.py b/engine/tests/Benchmark.fio/parser.py index ee3f8ed..6620d1f 100755 --- a/engine/tests/Benchmark.fio/parser.py +++ b/engine/tests/Benchmark.fio/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.fio/reference.log b/engine/tests/Benchmark.fio/reference.log index 8a6f5af..06396ba 100644 --- a/engine/tests/Benchmark.fio/reference.log +++ b/engine/tests/Benchmark.fio/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta by thresholds.awk based on [519, 621] build range +# Automatically generated on fuego by thresholds.awk based on [519, 621] build range [File.Read|ge] 1 [File.Write|ge] diff --git a/engine/tests/Benchmark.gtkperf/gtkperf.sh b/engine/tests/Benchmark.gtkperf/gtkperf.sh index 68b1963..e8d57d2 100644 --- a/engine/tests/Benchmark.gtkperf/gtkperf.sh +++ b/engine/tests/Benchmark.gtkperf/gtkperf.sh @@ -8,19 +8,19 @@ function test_build { patch -p0 -N -s < $TEST_HOME/gtkperf_appdata.h.patch cd .. export PATH=/usr/local/bin:$PATH - ./configure --prefix=$JTA_HOME/$TESTDIR --host=$HOST --build=`uname -m`-linux-gnu --target=$HOST + ./configure --prefix=$FUEGO_HOME/$TESTDIR --host=$HOST --build=`uname -m`-linux-gnu --target=$HOST make # || { cd src; $CC -o .libs/gtkperf support.o main.o interface.o callbacks.o tests.o timing.o -L${SDKROOT}/usr/lib ${SDKROOT}/usr/lib/libgtk-x11-2.0.so ${SDKROOT}/usr/lib/libatk-1.0.so ${SDKROOT}/usr/lib/libgio-2.0.so ${SDKROOT}/usr/lib/libpangoft2-1.0.so ${SDKROOT}/usr/lib/libfreetype.so ${SDKROOT}/usr/lib/libfontconfig.so ${SDKROOT}/usr/lib/libgdk-x11-2.0.so ${SDKROOT}/usr/lib/libgdk_pixbuf-2.0.so ${SDKROOT}/usr/lib/libpangocairo-1.0.so ${SDKROOT}/usr/lib/libpango-1.0.so ${SDKROOT}/usr/lib/libcairo.so ${SDKROOT}/usr/lib/libgobject-2.0.so ${SDKROOT}/usr/lib/libgmodule-2.0.so ${SDKROOT}/usr/lib/libglib-2.0.so -Wl,--rpath -Wl,${SDKROOT}/usr/lib -Wl,--sysroot=${SDKROOT}; } && touch ../test_suite_ready || build_error "error while building test" } function test_deploy { - cmd "gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders && pango-querymodules > /etc/pango/pango.modules && mkdir -p $JTA_HOME/jta.$TESTDIR/share/pixmaps" - put src/gtkperf $JTA_HOME/jta.$TESTDIR/ - put pixmaps/*.png $JTA_HOME/jta.$TESTDIR/share/pixmaps + cmd "gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders && pango-querymodules > /etc/pango/pango.modules && mkdir -p $FUEGO_HOME/fuego.$TESTDIR/share/pixmaps" + put src/gtkperf $FUEGO_HOME/fuego.$TESTDIR/ + put pixmaps/*.png $FUEGO_HOME/fuego.$TESTDIR/share/pixmaps } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1,a,\"x\"); exit(system(\"./gtkperf -a -x\" a[1]\" -y\" a[2]))}'" + report "cd $FUEGO_HOME/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1,a,\"x\"); exit(system(\"./gtkperf -a -x\" a[1]\" -y\" a[2]))}'" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.gtkperf/parser.py b/engine/tests/Benchmark.gtkperf/parser.py index 75a0926..260b975 100755 --- a/engine/tests/Benchmark.gtkperf/parser.py +++ b/engine/tests/Benchmark.gtkperf/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.gtkperf/reference.log b/engine/tests/Benchmark.gtkperf/reference.log index 4fba6f8..eb897dd 100644 --- a/engine/tests/Benchmark.gtkperf/reference.log +++ b/engine/tests/Benchmark.gtkperf/reference.log @@ -1,3 +1,3 @@ -# Automatically generated on jta by thresholds.awk based on [592, 632] build range +# Automatically generated on fuego by thresholds.awk based on [592, 632] build range [Total_time|le] 1000 diff --git a/engine/tests/Benchmark.hackbench/hackbench.sh b/engine/tests/Benchmark.hackbench/hackbench.sh index 928c50e..f597e30 100644 --- a/engine/tests/Benchmark.hackbench/hackbench.sh +++ b/engine/tests/Benchmark.hackbench/hackbench.sh @@ -5,11 +5,11 @@ function test_build { } function test_deploy { - put hackbench $JTA_HOME/jta.$TESTDIR/ + put hackbench $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./hackbench $groups" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./hackbench $groups" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.hackbench/parser.py b/engine/tests/Benchmark.hackbench/parser.py index 62b698b..d9d06d3 100755 --- a/engine/tests/Benchmark.hackbench/parser.py +++ b/engine/tests/Benchmark.hackbench/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.himeno/himeno.sh b/engine/tests/Benchmark.himeno/himeno.sh index 4431317..1deb992 100644 --- a/engine/tests/Benchmark.himeno/himeno.sh +++ b/engine/tests/Benchmark.himeno/himeno.sh @@ -6,11 +6,11 @@ function test_build { } function test_deploy { - put bmt $JTA_HOME/jta.$TESTDIR/ + put bmt $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR && ./bmt" + report "cd $FUEGO_HOME/fuego.$TESTDIR && ./bmt" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.himeno/parser.py b/engine/tests/Benchmark.himeno/parser.py index e9be780..ef8e309 100755 --- a/engine/tests/Benchmark.himeno/parser.py +++ b/engine/tests/Benchmark.himeno/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[\w*.[gle]{2}\]" diff --git a/engine/tests/Benchmark.iperf/iperf.sh b/engine/tests/Benchmark.iperf/iperf.sh index 7d29c01..d2b13c0 100644 --- a/engine/tests/Benchmark.iperf/iperf.sh +++ b/engine/tests/Benchmark.iperf/iperf.sh @@ -9,7 +9,7 @@ function test_build { } function test_deploy { - put src/iperf $JTA_HOME/jta.$TESTDIR/ + put src/iperf $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -34,7 +34,7 @@ function test_run { srv=$BENCHMARK_IPERF_SRV fi - report "cd $JTA_HOME/jta.$TESTDIR; ./iperf -c $srv -t 15; ./iperf -c $srv -d -t 15" $JTA_HOME/jta.$TESTDIR/${TESTDIR}.log + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./iperf -c $srv -t 15; ./iperf -c $srv -d -t 15" $FUEGO_HOME/fuego.$TESTDIR/${TESTDIR}.log } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.iperf/parser.py b/engine/tests/Benchmark.iperf/parser.py index 5d98416..cb4d3aa 100755 --- a/engine/tests/Benchmark.iperf/parser.py +++ b/engine/tests/Benchmark.iperf/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib #------------------------------------------------------------ @@ -44,4 +44,4 @@ if pat_result: if "tcp.tx" in cur_dict: sys.exit(plib.process_data(ref_section_pat, cur_dict, 's', 'Rate, MB/s')) else: - print "JTA error reason: could not parse measured bandwidth" + print "Fuego error reason: could not parse measured bandwidth" diff --git a/engine/tests/Benchmark.iperf/reference.log b/engine/tests/Benchmark.iperf/reference.log index ca7eb3f..c180bfc 100644 --- a/engine/tests/Benchmark.iperf/reference.log +++ b/engine/tests/Benchmark.iperf/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 25 results of 0\.18\.04\. firmware regexp crossed with [880, 905] build range [tcp.bi_rx|ge] 1 diff --git a/engine/tests/Benchmark.linpack/linpack.sh b/engine/tests/Benchmark.linpack/linpack.sh index 26e5f1c..feda319 100644 --- a/engine/tests/Benchmark.linpack/linpack.sh +++ b/engine/tests/Benchmark.linpack/linpack.sh @@ -6,11 +6,11 @@ function test_build { } function test_deploy { - put linpack $JTA_HOME/jta.$TESTDIR/ + put linpack $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR && ./linpack" + report "cd $FUEGO_HOME/fuego.$TESTDIR && ./linpack" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.linpack/parser.py b/engine/tests/Benchmark.linpack/parser.py index 8680bc6..29332b3 100755 --- a/engine/tests/Benchmark.linpack/parser.py +++ b/engine/tests/Benchmark.linpack/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "\[[\w]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.lmbench2/lmbench.sh b/engine/tests/Benchmark.lmbench2/lmbench.sh index 30eb54e..4dddfee 100644 --- a/engine/tests/Benchmark.lmbench2/lmbench.sh +++ b/engine/tests/Benchmark.lmbench2/lmbench.sh @@ -15,15 +15,15 @@ function test_build { } function test_deploy { - put -r * $JTA_HOME/jta.$TESTDIR/ + put -r * $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { LMBENCH_OS=`ls ./bin` - safe_cmd "rm -rf $JTA_HOME/jta.$TESTDIR/results" - safe_cmd "cd $JTA_HOME/jta.$TESTDIR/scripts; OS=$LMBENCH_OS ./config-run" - safe_cmd "cd $JTA_HOME/jta.$TESTDIR/scripts; OS=$LMBENCH_OS ./results" - report "cd $JTA_HOME/jta.$TESTDIR/scripts; ./getsummary ../results/$LMBENCH_OS/*.0" + safe_cmd "rm -rf $FUEGO_HOME/fuego.$TESTDIR/results" + safe_cmd "cd $FUEGO_HOME/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./config-run" + safe_cmd "cd $FUEGO_HOME/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./results" + report "cd $FUEGO_HOME/fuego.$TESTDIR/scripts; ./getsummary ../results/$LMBENCH_OS/*.0" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.lmbench2/parser.py b/engine/tests/Benchmark.lmbench2/parser.py index c893a98..5560aad 100755 --- a/engine/tests/Benchmark.lmbench2/parser.py +++ b/engine/tests/Benchmark.lmbench2/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d&._/()]+.[gle]{2}\]" @@ -44,7 +44,7 @@ for line in lines: cur_file.close() if len(sublist) == 0: - sys.exit("\nparser: JTA error reason: No results found\n") + sys.exit("\nparser: Fuego error reason: No results found\n") cur_dict["Basic_Integer.Bit"] = sublist[0] cur_dict["Basic_Integer.Add"] = sublist[1] diff --git a/engine/tests/Benchmark.lmbench2/reference.log b/engine/tests/Benchmark.lmbench2/reference.log index 5afc756..e95e8eb 100644 --- a/engine/tests/Benchmark.lmbench2/reference.log +++ b/engine/tests/Benchmark.lmbench2/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 37 results of 0\.18\.04\.0004 firmware regexp crossed with [901, 966] build range [Basic_Double.Add|le] 10000 diff --git a/engine/tests/Benchmark.nbench-byte/nbench-byte.sh b/engine/tests/Benchmark.nbench-byte/nbench-byte.sh index bdf37ec..98762c5 100644 --- a/engine/tests/Benchmark.nbench-byte/nbench-byte.sh +++ b/engine/tests/Benchmark.nbench-byte/nbench-byte.sh @@ -8,11 +8,11 @@ function test_build { } function test_deploy { - put hardware nbench sysinfo.sh *.DAT $JTA_HOME/jta.$TESTDIR/ + put hardware nbench sysinfo.sh *.DAT $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./nbench" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./nbench" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.nbench-byte/parser.py b/engine/tests/Benchmark.nbench-byte/parser.py index c39801e..dfee68e 100755 --- a/engine/tests/Benchmark.nbench-byte/parser.py +++ b/engine/tests/Benchmark.nbench-byte/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.nbench_byte/nbench_byte.sh b/engine/tests/Benchmark.nbench_byte/nbench_byte.sh index 20a7f39..737d9b2 100644 --- a/engine/tests/Benchmark.nbench_byte/nbench_byte.sh +++ b/engine/tests/Benchmark.nbench_byte/nbench_byte.sh @@ -8,11 +8,11 @@ function test_build { } function test_deploy { - put hardware nbench sysinfo.sh *.DAT $JTA_HOME/jta.$TESTDIR/ + put hardware nbench sysinfo.sh *.DAT $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./nbench" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./nbench" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.nbench_byte/parser.py b/engine/tests/Benchmark.nbench_byte/parser.py index c39801e..dfee68e 100755 --- a/engine/tests/Benchmark.nbench_byte/parser.py +++ b/engine/tests/Benchmark.nbench_byte/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.netperf/netperf-bench.sh b/engine/tests/Benchmark.netperf/netperf-bench.sh index c4ca933..655325a 100644 --- a/engine/tests/Benchmark.netperf/netperf-bench.sh +++ b/engine/tests/Benchmark.netperf/netperf-bench.sh @@ -1,9 +1,9 @@ -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/functions.sh -source $JTA_TESTS_PATH/netperf/netperf.sh +source $FUEGO_TESTS_PATH/netperf/netperf.sh function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./rabench_script $srv" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./rabench_script $srv" } test_run diff --git a/engine/tests/Benchmark.netperf/parser.py b/engine/tests/Benchmark.netperf/parser.py index d2dafc3..7ecc713 100755 --- a/engine/tests/Benchmark.netperf/parser.py +++ b/engine/tests/Benchmark.netperf/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.netpipe/NetPIPE.sh b/engine/tests/Benchmark.netpipe/NetPIPE.sh index 26cd14a..d2d6836 100644 --- a/engine/tests/Benchmark.netpipe/NetPIPE.sh +++ b/engine/tests/Benchmark.netpipe/NetPIPE.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put NPtcp $JTA_HOME/jta.$TESTDIR/ + put NPtcp $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -31,12 +31,12 @@ function test_run { srv=$BENCHMARK_NETPIPE_SRV fi - report "cd $JTA_HOME/jta.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $JTA_HOME/jta.$TESTDIR/${TESTDIR}.log + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $FUEGO_HOME/fuego.$TESTDIR/${TESTDIR}.log } -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/functions.sh -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars diff --git a/engine/tests/Benchmark.reboot/parser.py b/engine/tests/Benchmark.reboot/parser.py index 35b1115..9b0a6a3 100755 --- a/engine/tests/Benchmark.reboot/parser.py +++ b/engine/tests/Benchmark.reboot/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.reboot/reboot.sh b/engine/tests/Benchmark.reboot/reboot.sh index 3b5880a..3fc682f 100644 --- a/engine/tests/Benchmark.reboot/reboot.sh +++ b/engine/tests/Benchmark.reboot/reboot.sh @@ -5,12 +5,12 @@ function test_build { } function test_deploy { - put $TEST_HOME/$tarball $JTA_HOME/jta.$TESTDIR/ + put $TEST_HOME/$tarball $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { target_reboot - report "cd $JTA_HOME/jta.$TESTDIR; ./reboot" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./reboot" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.reboot/reference.log b/engine/tests/Benchmark.reboot/reference.log index 620442f..3c8e159 100755 --- a/engine/tests/Benchmark.reboot/reference.log +++ b/engine/tests/Benchmark.reboot/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta host by thresholds.awk based on +# Automatically generated on fuego host by thresholds.awk based on # 7 results of 0\.18\.04\. firmware regexp crossed with [652, 658] build range [time.init|le] 10000 diff --git a/engine/tests/Benchmark.signaltest/parser.py b/engine/tests/Benchmark.signaltest/parser.py index dde3967..9d10d1a 100755 --- a/engine/tests/Benchmark.signaltest/parser.py +++ b/engine/tests/Benchmark.signaltest/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_ .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.signaltest/signaltest.sh b/engine/tests/Benchmark.signaltest/signaltest.sh index 9b3042d..5e3b921 100644 --- a/engine/tests/Benchmark.signaltest/signaltest.sh +++ b/engine/tests/Benchmark.signaltest/signaltest.sh @@ -5,13 +5,13 @@ function test_build { } function test_deploy { - put signaltest $JTA_HOME/jta.$TESTDIR/ + put signaltest $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define BENCHMARK_SIGNALTEST_LOOPS - report "cd $JTA_HOME/jta.$TESTDIR; ./signaltest -l $BENCHMARK_SIGNALTEST_LOOPS -q" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./signaltest -l $BENCHMARK_SIGNALTEST_LOOPS -q" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.tiobench/parser.py b/engine/tests/Benchmark.tiobench/parser.py index 1e11cff..08062c0 100755 --- a/engine/tests/Benchmark.tiobench/parser.py +++ b/engine/tests/Benchmark.tiobench/parser.py @@ -2,7 +2,7 @@ import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib diff --git a/engine/tests/Benchmark.tiobench/reference.log b/engine/tests/Benchmark.tiobench/reference.log index d85c47f..5c350c0 100644 --- a/engine/tests/Benchmark.tiobench/reference.log +++ b/engine/tests/Benchmark.tiobench/reference.log @@ -1,4 +1,4 @@ -# Automatically generated on jta by thresholds.awk based on [613, 801] build range +# Automatically generated on fuego by thresholds.awk based on [613, 801] build range [Read.Sequential|ge] 0 [Read.Sequential_Random|ge] diff --git a/engine/tests/Benchmark.tiobench/tiobench.sh b/engine/tests/Benchmark.tiobench/tiobench.sh index b28f1a4..87ca841 100644 --- a/engine/tests/Benchmark.tiobench/tiobench.sh +++ b/engine/tests/Benchmark.tiobench/tiobench.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put tiotest $JTA_HOME/jta.$TESTDIR/ + put tiotest $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -17,10 +17,10 @@ function test_run { hd_test_mount_prepare $BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV $BENCHMARK_TIOBENCH_MOUNT_POINT - report "cd $JTA_HOME/jta.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –S" - report_append "cd $JTA_HOME/jta.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –W" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –S" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –W" hd_test_clean_umount $BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV $BENCHMARK_TIOBENCH_MOUNT_POINT } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Benchmark.x11perf/parser.py b/engine/tests/Benchmark.x11perf/parser.py index aa3ca8e..e3d6320 100755 --- a/engine/tests/Benchmark.x11perf/parser.py +++ b/engine/tests/Benchmark.x11perf/parser.py @@ -2,7 +2,7 @@ # See common.py for description of command-line arguments import os, re, sys -sys.path.insert(0, os.environ['JTA_PARSER_PATH']) +sys.path.insert(0, os.environ['FUEGO_PARSER_PATH']) import common as plib ref_section_pat = "^\[[\w\d_\- .]+.[gle]{2}\]" diff --git a/engine/tests/Benchmark.x11perf/x11perf.sh b/engine/tests/Benchmark.x11perf/x11perf.sh index 560b997..df52b69 100644 --- a/engine/tests/Benchmark.x11perf/x11perf.sh +++ b/engine/tests/Benchmark.x11perf/x11perf.sh @@ -12,13 +12,13 @@ function test_build { } function test_deploy { - put x11perf $JTA_HOME/jta.$TESTDIR/ + put x11perf $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define BENCHMARK_X11PERF_TIME - report "cd $JTA_HOME/jta.$TESTDIR; export DISPLAY=:0; ./x11perf -repeat 1 -time $BENCHMARK_X11PERF_TIME -dot -oddtilerect10 -seg100c2 -64poly10complex" + report "cd $FUEGO_HOME/fuego.$TESTDIR; export DISPLAY=:0; ./x11perf -repeat 1 -time $BENCHMARK_X11PERF_TIME -dot -oddtilerect10 -seg100c2 -64poly10complex" } -. $JTA_SCRIPTS_PATH/benchmark.sh +. $FUEGO_SCRIPTS_PATH/benchmark.sh diff --git a/engine/tests/Functional.LTP.Devices/ltp-devices.sh b/engine/tests/Functional.LTP.Devices/ltp-devices.sh index 9c9ea3e..e72971d 100644 --- a/engine/tests/Functional.LTP.Devices/ltp-devices.sh +++ b/engine/tests/Functional.LTP.Devices/ltp-devices.sh @@ -1,13 +1,13 @@ -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh source $TEST_HOME/../LTP/ltp.sh function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./rtc01" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./rtc01" } function test_processing { diff --git a/engine/tests/Functional.LTP.Filesystem/ltp-filesystem.sh b/engine/tests/Functional.LTP.Filesystem/ltp-filesystem.sh index 50fc3f1..ce190d2 100644 --- a/engine/tests/Functional.LTP.Filesystem/ltp-filesystem.sh +++ b/engine/tests/Functional.LTP.Filesystem/ltp-filesystem.sh @@ -1,13 +1,13 @@ -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh source $TEST_HOME/../LTP/ltp.sh function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; mkdir tmp; ./runltp -d tmp -f fs_jta" + report "cd $FUEGO_HOME/fuego.$TESTDIR; mkdir tmp; ./runltp -d tmp -f fs_fuego" } test_run diff --git a/engine/tests/Functional.LTP.Open_Posix/ltp-open_posix.sh b/engine/tests/Functional.LTP.Open_Posix/ltp-open_posix.sh index e5f9568..7be188c 100644 --- a/engine/tests/Functional.LTP.Open_Posix/ltp-open_posix.sh +++ b/engine/tests/Functional.LTP.Open_Posix/ltp-open_posix.sh @@ -1,13 +1,13 @@ -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh source $TEST_HOME/../LTP/ltp.sh function test_run { - report "cd /tmp/jta.$TESTDIR/target_bin; ./bin/run-all-posix-option-group-tests.sh" + report "cd /tmp/fuego.$TESTDIR/target_bin; ./bin/run-all-posix-option-group-tests.sh" } function test_processing { diff --git a/engine/tests/Functional.OpenSSL/openssl-func.sh b/engine/tests/Functional.OpenSSL/openssl-func.sh index 99c7e36..bf4af40 100644 --- a/engine/tests/Functional.OpenSSL/openssl-func.sh +++ b/engine/tests/Functional.OpenSSL/openssl-func.sh @@ -1,7 +1,7 @@ -source $JTA_TESTS_PATH/OpenSSL/openssl.sh +source $FUEGO_TESTS_PATH/OpenSSL/openssl.sh function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; bash run-tests.sh" + report "cd $FUEGO_HOME/fuego.$TESTDIR; bash run-tests.sh" } function test_processing { diff --git a/engine/tests/Functional.aiostress/aiostress.sh b/engine/tests/Functional.aiostress/aiostress.sh index 4a705af..4e6000d 100644 --- a/engine/tests/Functional.aiostress/aiostress.sh +++ b/engine/tests/Functional.aiostress/aiostress.sh @@ -5,7 +5,7 @@ function test_build { } function test_deploy { - put aiostress $JTA_HOME/jta.$TESTDIR/ + put aiostress $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -14,7 +14,7 @@ function test_run { assert_define FUNCTIONAL_AIOSTRESS_SIZE hd_test_mount_prepare $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT - report "cd $FUNCTIONAL_AIOSTRESS_MOUNT_POINT/jta.$TESTDIR; $JTA_HOME/jta.$TESTDIR/aiostress -s $FUNCTIONAL_AIOSTRESS_SIZE ./testfile" + report "cd $FUNCTIONAL_AIOSTRESS_MOUNT_POINT/fuego.$TESTDIR; $FUEGO_HOME/fuego.$TESTDIR/aiostress -s $FUNCTIONAL_AIOSTRESS_SIZE ./testfile" hd_test_clean_umount $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT } @@ -23,5 +23,5 @@ function test_processing { true } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.bzip2/bzip2.sh b/engine/tests/Functional.bzip2/bzip2.sh index 1f6c008..8e725c8 100644 --- a/engine/tests/Functional.bzip2/bzip2.sh +++ b/engine/tests/Functional.bzip2/bzip2.sh @@ -17,11 +17,11 @@ function test_build { } function test_deploy { - put {sample*,run-tests.sh} $JTA_HOME/jta.$TESTDIR/ + put {sample*,run-tests.sh} $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; sh -v run-tests.sh 2>&1" + report "cd $FUEGO_HOME/fuego.$TESTDIR; sh -v run-tests.sh 2>&1" } function test_processing { @@ -29,4 +29,4 @@ function test_processing { log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.crashme/crashme.sh b/engine/tests/Functional.crashme/crashme.sh index d0dc313..a7f7ff8 100644 --- a/engine/tests/Functional.crashme/crashme.sh +++ b/engine/tests/Functional.crashme/crashme.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put crashme $JTA_HOME/jta.$TESTDIR/ + put crashme $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -16,11 +16,11 @@ function test_run { assert_define FUNCTIONAL_CRASHME_NTRYS assert_define FUNCTIONAL_CRASHME_NSUB - report "cd $JTA_HOME/jta.$TESTDIR; ./crashme $FUNCTIONAL_CRASHME_NBYTES.$FUNCTIONAL_CRASHME_INC $FUNCTIONAL_CRASHME_SRAND $FUNCTIONAL_CRASHME_NTRYS $FUNCTIONAL_CRASHME_NSUB 2" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./crashme $FUNCTIONAL_CRASHME_NBYTES.$FUNCTIONAL_CRASHME_INC $FUNCTIONAL_CRASHME_SRAND $FUNCTIONAL_CRASHME_NTRYS $FUNCTIONAL_CRASHME_NSUB 2" } function test_processing { log_compare "$TESTDIR" "1" "0 ... 3000" "p" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.expat/expat.sh b/engine/tests/Functional.expat/expat.sh index 63484c2..1e43d2a 100644 --- a/engine/tests/Functional.expat/expat.sh +++ b/engine/tests/Functional.expat/expat.sh @@ -20,17 +20,17 @@ function test_build { function test_deploy { tar cf XML-Test-Suite.tar XML-Test-Suite/ - put -r XML-Test-Suite.tar tests/.libs/* tests/xmltest.sh $JTA_HOME/jta.$TESTDIR/; + put -r XML-Test-Suite.tar tests/.libs/* tests/xmltest.sh $FUEGO_HOME/fuego.$TESTDIR/; - cmd "cd $JTA_HOME/jta.$TESTDIR; tar xf XML-Test-Suite.tar" - cmd "mkdir -p $JTA_HOME/xmlwf"; + cmd "cd $FUEGO_HOME/fuego.$TESTDIR; tar xf XML-Test-Suite.tar" + cmd "mkdir -p $FUEGO_HOME/xmlwf"; - put xmlwf/.libs/xmlwf $JTA_HOME/xmlwf/xmlwf; + put xmlwf/.libs/xmlwf $FUEGO_HOME/xmlwf/xmlwf; } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./runtestspp 2>&1 | tr ',' '\n'| sed s/^\ //" - report_append "cd $JTA_HOME/jta.$TESTDIR; ./xmltest.sh" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./runtestspp 2>&1 | tr ',' '\n'| sed s/^\ //" + report_append "cd $FUEGO_HOME/fuego.$TESTDIR; ./xmltest.sh" } function test_processing { @@ -42,4 +42,4 @@ function test_processing { } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.fontconfig/fontconfig.sh b/engine/tests/Functional.fontconfig/fontconfig.sh index 1343db1..e6c62cc 100644 --- a/engine/tests/Functional.fontconfig/fontconfig.sh +++ b/engine/tests/Functional.fontconfig/fontconfig.sh @@ -5,11 +5,11 @@ function test_build { } function test_deploy { - put -r test/* $JTA_HOME/jta.$TESTDIR/ + put -r test/* $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; if ''bash run-test.sh''; then echo 'TEST PASS'; else echo 'TEST FAIL'; fi" + report "cd $FUEGO_HOME/fuego.$TESTDIR; if ''bash run-test.sh''; then echo 'TEST PASS'; else echo 'TEST FAIL'; fi" } function test_processing { @@ -17,4 +17,4 @@ function test_processing { log_compare "$TESTDIR" "0" "TEST FAIL" "n" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.ft2demos/ft2demos.sh b/engine/tests/Functional.ft2demos/ft2demos.sh index e94b51d..ee8f4e7 100644 --- a/engine/tests/Functional.ft2demos/ft2demos.sh +++ b/engine/tests/Functional.ft2demos/ft2demos.sh @@ -27,11 +27,11 @@ function test_build { } function test_deploy { - put ${tarball%.tar*}/bin/.libs/* $JTA_HOME/jta.$TESTDIR/ + put ${tarball%.tar*}/bin/.libs/* $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1" } @@ -40,11 +40,11 @@ function test_processing { log_compare "$TESTDIR" "0" "fail|error|FAIL|ERROR" "n" } -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR diff --git a/engine/tests/Functional.glib/glib2.sh b/engine/tests/Functional.glib/glib2.sh index f483454..afdf94b 100644 --- a/engine/tests/Functional.glib/glib2.sh +++ b/engine/tests/Functional.glib/glib2.sh @@ -13,7 +13,7 @@ function test_build { function test_deploy { # Makefile.am is used by 'contexts' test. XXX - why? - put gio/tests/Makefile.am `find . -name .libs | xargs -IDIRS find DIRS -not -type d -not -name '*.so*' -not -name '*.la*' -perm /u+x` $JTA_HOME/jta.$TESTDIR/ + put gio/tests/Makefile.am `find . -name .libs | xargs -IDIRS find DIRS -not -type d -not -name '*.so*' -not -name '*.la*' -perm /u+x` $FUEGO_HOME/fuego.$TESTDIR/ } # Excluded tests @@ -37,15 +37,15 @@ function test_deploy { # filter-streams function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./gtester ./objects ./readwrite ./g-file ./fileutils ./data-output-stream ./signal3 ./properties ./rand ./memory-input-stream ./sleepy-stream ./g-icon ./array-test ./strfuncs ./testgdateparser ./srvtarget ./threadtests ./keyfile ./string ./hostutils ./memory-output-stream ./objects2 ./closures ./scannerapi ./testgdate ./data-input-stream ./signal2 ./signal1 ./testgobject ./g-file-info ./simple-async-result ./buffered-input-stream ./contexts ./printf ./properties2 ./unix-streams " + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./gtester ./objects ./readwrite ./g-file ./fileutils ./data-output-stream ./signal3 ./properties ./rand ./memory-input-stream ./sleepy-stream ./g-icon ./array-test ./strfuncs ./testgdateparser ./srvtarget ./threadtests ./keyfile ./string ./hostutils ./memory-output-stream ./objects2 ./closures ./scannerapi ./testgdate ./data-input-stream ./signal2 ./signal1 ./testgobject ./g-file-info ./simple-async-result ./buffered-input-stream ./contexts ./printf ./properties2 ./unix-streams " } function test_processing { - #$SSH${DEVICE} "rm -rf $JTA_HOME/jta.$TESTDIR" + #$SSH${DEVICE} "rm -rf $FUEGO_HOME/fuego.$TESTDIR" #log_compare "$TESTDIR" "196" "OK" "p" #log_compare "$TESTDIR" "0" "ERROR" "n" true } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.ipv6connect/ipv6connect.sh b/engine/tests/Functional.ipv6connect/ipv6connect.sh index 228be45..b8cc6b5 100644 --- a/engine/tests/Functional.ipv6connect/ipv6connect.sh +++ b/engine/tests/Functional.ipv6connect/ipv6connect.sh @@ -5,15 +5,15 @@ function test_build { } function test_deploy { - put ipv6connect $JTA_HOME/jta.$TESTDIR/ + put ipv6connect $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./ipv6connect" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./ipv6connect" } function test_processing { true } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.jpeg/jpeg.sh b/engine/tests/Functional.jpeg/jpeg.sh index 9537ade..4ff638d 100644 --- a/engine/tests/Functional.jpeg/jpeg.sh +++ b/engine/tests/Functional.jpeg/jpeg.sh @@ -20,11 +20,11 @@ function test_build { } function test_deploy { - put run-tests.sh test* djpeg cjpeg jpegtran $JTA_HOME/jta.$TESTDIR/; + put run-tests.sh test* djpeg cjpeg jpegtran $FUEGO_HOME/fuego.$TESTDIR/; } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; sh -v run-tests.sh" + report "cd $FUEGO_HOME/fuego.$TESTDIR; sh -v run-tests.sh" } function test_processing { @@ -32,4 +32,4 @@ function test_processing { log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.linus_stress/linus_stress.sh b/engine/tests/Functional.linus_stress/linus_stress.sh index 75a0864..64beac5 100644 --- a/engine/tests/Functional.linus_stress/linus_stress.sh +++ b/engine/tests/Functional.linus_stress/linus_stress.sh @@ -5,18 +5,18 @@ function test_build { } function test_deploy { - put linus_stress $JTA_HOME/jta.$TESTDIR/ + put linus_stress $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { assert_define FUNCTIONAL_LINUS_STRESS_DIRTY_BG assert_define FUNCTIONAL_LINUS_STRESS_DIRTY - report "cd $JTA_HOME/jta.$TESTDIR; cat /proc/sys/vm/dirty_ratio > ./dirty_ratio; cat /proc/sys/vm/dirty_background_ratio > ./dirty_bg; echo $FUNCTIONAL_LINUS_STRESS_DIRTY > /proc/sys/vm/dirty_ratio; echo $FUNCTIONAL_LINUS_STRESS_DIRTY_BG > /proc/sys/vm/dirty_background_ratio; ./linus_stress; cat ./dirty_ratio > /proc/sys/vm/dirty_ratio; cat ./dirty_bg > /proc/sys/vm/dirty_background_ratio" + report "cd $FUEGO_HOME/fuego.$TESTDIR; cat /proc/sys/vm/dirty_ratio > ./dirty_ratio; cat /proc/sys/vm/dirty_background_ratio > ./dirty_bg; echo $FUNCTIONAL_LINUS_STRESS_DIRTY > /proc/sys/vm/dirty_ratio; echo $FUNCTIONAL_LINUS_STRESS_DIRTY_BG > /proc/sys/vm/dirty_background_ratio; ./linus_stress; cat ./dirty_ratio > /proc/sys/vm/dirty_ratio; cat ./dirty_bg > /proc/sys/vm/dirty_background_ratio" } function test_processing { true } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.netperf/netperf-func.sh b/engine/tests/Functional.netperf/netperf-func.sh index 63cc2c6..140cd42 100644 --- a/engine/tests/Functional.netperf/netperf-func.sh +++ b/engine/tests/Functional.netperf/netperf-func.sh @@ -1,8 +1,8 @@ -source $JTA_TESTS_PATH/netperf/netperf.sh +source $FUEGO_TESTS_PATH/netperf/netperf.sh function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./random_rr_script $srv 50 5" - #report_append "cd $JTA_HOME/jta.$TESTDIR; ./snapshot_script $srv CPU" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./random_rr_script $srv 50 5" + #report_append "cd $FUEGO_HOME/fuego.$TESTDIR; ./snapshot_script $srv CPU" } test_run diff --git a/engine/tests/Functional.pi_tests/pi_tests.sh b/engine/tests/Functional.pi_tests/pi_tests.sh index 2c33115..1210ac3 100644 --- a/engine/tests/Functional.pi_tests/pi_tests.sh +++ b/engine/tests/Functional.pi_tests/pi_tests.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put ./pi_stress $JTA_HOME/jta.$TESTDIR/ + put ./pi_stress $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -14,7 +14,7 @@ function test_run { assert_define FUNCTIONAL_PI_TESTS_GROUPS assert_define FUNCTIONAL_PI_TESTS_TIMEOUT - report "cd $JTA_HOME/jta.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true" } -. $JTA_SCRIPTS_PATH/stress.sh +. $FUEGO_SCRIPTS_PATH/stress.sh diff --git a/engine/tests/Functional.posixtestsuite/posixtestsuite.sh b/engine/tests/Functional.posixtestsuite/posixtestsuite.sh index 6d55a67..951e6fb 100644 --- a/engine/tests/Functional.posixtestsuite/posixtestsuite.sh +++ b/engine/tests/Functional.posixtestsuite/posixtestsuite.sh @@ -6,11 +6,11 @@ function test_build { } function test_deploy { - put -r ./* $JTA_HOME/jta.$TESTDIR/ + put -r ./* $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; ./execute.sh" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./execute.sh" } function test_processing { @@ -27,4 +27,4 @@ function test_processing { log_compare "$TESTDIR" "1" "${UNTESTED}" "unt" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.rmaptest/rmaptest.sh b/engine/tests/Functional.rmaptest/rmaptest.sh index c155cd7..f658b9b 100644 --- a/engine/tests/Functional.rmaptest/rmaptest.sh +++ b/engine/tests/Functional.rmaptest/rmaptest.sh @@ -5,7 +5,7 @@ function test_build { } function test_deploy { - put rmap-test $JTA_HOME/jta.$TESTDIR/ + put rmap-test $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -15,11 +15,11 @@ function test_run { assert_define FUNCTIONAL_RMAPTEST_TASKS assert_define FUNCTIONAL_RMAPTEST_VMAS_FOR_PROCESS - report "cd $JTA_HOME/jta.$TESTDIR; ./rmap-test -h -i$FUNCTIONAL_RMAPTEST_ITERATIONS -n$FUNCTIONAL_RMAPTEST_VMA -s$FUNCTIONAL_RMAPTEST_VMA_SIZE -t$FUNCTIONAL_RMAPTEST_TASKS -V$FUNCTIONAL_RMAPTEST_VMAS_FOR_PROCESS -v file1.dat" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./rmap-test -h -i$FUNCTIONAL_RMAPTEST_ITERATIONS -n$FUNCTIONAL_RMAPTEST_VMA -s$FUNCTIONAL_RMAPTEST_VMA_SIZE -t$FUNCTIONAL_RMAPTEST_TASKS -V$FUNCTIONAL_RMAPTEST_VMAS_FOR_PROCESS -v file1.dat" } function test_processing { true } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.scifab/scifab.sh b/engine/tests/Functional.scifab/scifab.sh index 066a878..aa98057 100644 --- a/engine/tests/Functional.scifab/scifab.sh +++ b/engine/tests/Functional.scifab/scifab.sh @@ -22,4 +22,4 @@ function test_processing { log_compare "$TESTDIR" $FUNCTIONAL_SCIFAB_RES_LINES_COUNT "Passed:$FUNCTIONAL_SCIFAB_RES_PASS_COUNT Failed:$FUNCTIONAL_SCIFAB_RES_FAIL_COUNT" "p" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.scrashme/scrashme.sh b/engine/tests/Functional.scrashme/scrashme.sh index dd31893..ca14ba4 100644 --- a/engine/tests/Functional.scrashme/scrashme.sh +++ b/engine/tests/Functional.scrashme/scrashme.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put scrashme $JTA_HOME/jta.$TESTDIR/ + put scrashme $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -25,7 +25,7 @@ function test_run { fi fi - report "cd $JTA_HOME/jta.$TESTDIR; ./scrashme --mode=$mode -N$FUNCTIONAL_SCRASHME_NUM" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./scrashme --mode=$mode -N$FUNCTIONAL_SCRASHME_NUM" } -. $JTA_SCRIPTS_PATH/stress.sh +. $FUEGO_SCRIPTS_PATH/stress.sh diff --git a/engine/tests/Functional.sdhi_0/sdhi_0.sh b/engine/tests/Functional.sdhi_0/sdhi_0.sh index 4d53088..150245c 100644 --- a/engine/tests/Functional.sdhi_0/sdhi_0.sh +++ b/engine/tests/Functional.sdhi_0/sdhi_0.sh @@ -21,5 +21,5 @@ function test_processing { } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.stress/stress.sh b/engine/tests/Functional.stress/stress.sh index 59681cd..6e33269 100644 --- a/engine/tests/Functional.stress/stress.sh +++ b/engine/tests/Functional.stress/stress.sh @@ -6,7 +6,7 @@ function test_build { } function test_deploy { - put src/stress $JTA_HOME/jta.$TESTDIR/ + put src/stress $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -18,12 +18,12 @@ function test_run { assert_define FUNCTIONAL_STRESS_VM_BYTES assert_define FUNCTIONAL_STRESS_TIMEOUT - report "cd $JTA_HOME/jta.$TESTDIR; ./stress -i $FUNCTIONAL_STRESS_SYNC -c $FUNCTIONAL_STRESS_SQRT --hdd $FUNCTIONAL_STRESS_HDD --hdd-bytes $FUNCTIONAL_STRESS_HDD_BYTES --vm $FUNCTIONAL_STRESS_VM --vm-bytes $FUNCTIONAL_STRESS_VM_BYTES -t $FUNCTIONAL_STRESS_TIMEOUT" + report "cd $FUEGO_HOME/fuego.$TESTDIR; ./stress -i $FUNCTIONAL_STRESS_SYNC -c $FUNCTIONAL_STRESS_SQRT --hdd $FUNCTIONAL_STRESS_HDD --hdd-bytes $FUNCTIONAL_STRESS_HDD_BYTES --vm $FUNCTIONAL_STRESS_VM --vm-bytes $FUNCTIONAL_STRESS_VM_BYTES -t $FUNCTIONAL_STRESS_TIMEOUT" } function test_processing { log_compare "$TESTDIR" "1" "successful run completed in" "p" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.synctest/synctest.sh b/engine/tests/Functional.synctest/synctest.sh index 2ce28a2..4c2dbad 100644 --- a/engine/tests/Functional.synctest/synctest.sh +++ b/engine/tests/Functional.synctest/synctest.sh @@ -5,7 +5,7 @@ function test_build { } function test_deploy { - put synctest $JTA_HOME/jta.$TESTDIR/ + put synctest $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { @@ -15,7 +15,7 @@ function test_run { assert_define FUNCTIONAL_SYNCTEST_LOOP hd_test_mount_prepare $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT - report "cd $FUNCTIONAL_SYNCTEST_MOUNT_POINT/jta.$TESTDIR; $JTA_HOME/jta.$TESTDIR/synctest $FUNCTIONAL_SYNCTEST_LEN $FUNCTIONAL_SYNCTEST_LOOP" + report "cd $FUNCTIONAL_SYNCTEST_MOUNT_POINT/fuego.$TESTDIR; $FUEGO_HOME/fuego.$TESTDIR/synctest $FUNCTIONAL_SYNCTEST_LEN $FUNCTIONAL_SYNCTEST_LOOP" hd_test_clean_umount $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT } @@ -24,5 +24,5 @@ function test_processing { log_compare "$TESTDIR" "1" "PASS : sync interrupted" "p" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/Functional.zlib/zlib.sh b/engine/tests/Functional.zlib/zlib.sh index 856b842..76aa116 100644 --- a/engine/tests/Functional.zlib/zlib.sh +++ b/engine/tests/Functional.zlib/zlib.sh @@ -8,11 +8,11 @@ function test_build { } function test_deploy { - put example minigzip $JTA_HOME/jta.$TESTDIR/ + put example minigzip $FUEGO_HOME/fuego.$TESTDIR/ } function test_run { - report "cd $JTA_HOME/jta.$TESTDIR; echo hello world | ./minigzip | ./minigzip -d || \ + report "cd $FUEGO_HOME/fuego.$TESTDIR; echo hello world | ./minigzip | ./minigzip -d || \ echo ' minigzip test FAILED ' if ./example; then \ echo ' zlib test OK '; \ @@ -29,6 +29,6 @@ function test_processing { log_compare "$TESTDIR" "0" "${N_CRIT}" "n" } -. $JTA_SCRIPTS_PATH/functional.sh +. $FUEGO_SCRIPTS_PATH/functional.sh diff --git a/engine/tests/LTP/ltp.sh b/engine/tests/LTP/ltp.sh index e197d4c..ff0c169 100644 --- a/engine/tests/LTP/ltp.sh +++ b/engine/tests/LTP/ltp.sh @@ -1,13 +1,13 @@ tarball=ltp-full-20150903.tar.bz2 -# source $JTA_SCRIPTS_PATH/functions.sh -# source $JTA_SCRIPTS_PATH/overlays.sh -# source $JTA_SCRIPTS_PATH/reports.sh +# source $FUEGO_SCRIPTS_PATH/functions.sh +# source $FUEGO_SCRIPTS_PATH/overlays.sh +# source $FUEGO_SCRIPTS_PATH/reports.sh # set_overlay_vars TESTDIR="LTP" -TEST_HOME="$JTA_TESTS_PATH/LTP" +TEST_HOME="$FUEGO_TESTS_PATH/LTP" TRIPLET=$TESTDIR-$PLATFORM function test_build { @@ -25,15 +25,15 @@ function test_build { cd target_bin # --- begin Filesystem tweaks --- - grep -Ev 'growfiles|rwtest|iogen|quota|isofs' runtest/fs | tee runtest/fs_jta + grep -Ev 'growfiles|rwtest|iogen|quota|isofs' runtest/fs | tee runtest/fs_fuego # We do not have enough free space on XXX for default configuration. # Adjust to 25 (this test) + 20*3 (fs_di) + 10 (scripts and binaries) MiB. # (-S 40 enables frag test in fs_di; the value should be twice as large as the one used for -s.) - sed -i '/lftest /clftest01 lftest 25' runtest/fs_jta - sed -i '/fs_di fs_di/cfs_di fs_di -d $TMPDIR -l 2 -s 20 -S 40' runtest/fs_jta + sed -i '/lftest /clftest01 lftest 25' runtest/fs_fuego + sed -i '/fs_di fs_di/cfs_di fs_di -d $TMPDIR -l 2 -s 20 -S 40' runtest/fs_fuego - echo "fsstress fsstress -d . -l 100 -n 40 -S" >> runtest/fs_jta + echo "fsstress fsstress -d . -l 100 -n 40 -S" >> runtest/fs_fuego # --- end Filesystem tweaks --- # --- begin OpenPOSIX tweaks --- @@ -75,22 +75,22 @@ function test_deploy { fi; # TARGET PREP. - safe_cmd "mkdir -p jta.$TESTDIR/devices && mkdir -p jta.$TESTDIR/tools && mkdir -p jta.$TESTDIR/tools/apicmds" + safe_cmd "mkdir -p fuego.$TESTDIR/devices && mkdir -p fuego.$TESTDIR/tools && mkdir -p fuego.$TESTDIR/tools/apicmds" # DEPLOY TO TARGET if [ "${JOB_NAME/*.}" = "Devices" ]; then - put -r testcases/kernel/device-drivers/rtc/rtc01 $JTA_HOME/jta.$TESTDIR/ + put -r testcases/kernel/device-drivers/rtc/rtc01 $FUEGO_HOME/fuego.$TESTDIR/ elif [ "${JOB_NAME/*.}" = "Filesystem" ]; then mkdir -p fs_tests - # Corresponding build script hard-codes the amount of required free space on a target into runtest/fs_jta. - # Parse runtest/fs_jta to copy only the required tests because the whole set is too large for XXX - awk '/^[^#]/ { print $2 }' target_bin/runtest/fs_jta > fs_tests.include + # Corresponding build script hard-codes the amount of required free space on a target into runtest/fs_fuego. + # Parse runtest/fs_fuego to copy only the required tests because the whole set is too large for XXX + awk '/^[^#]/ { print $2 }' target_bin/runtest/fs_fuego > fs_tests.include rsync -arhlP --include-from=fs_tests.include --include='testcases/bin/tst*' --include='create_datafile' --include='frag' --include='testcases/bin/fs*' --exclude='testcases/bin/*' --exclude=conformance target_bin/ fs_tests/ - put -r fs_tests/* $JTA_HOME/jta.$TESTDIR/ + put -r fs_tests/* $FUEGO_HOME/fuego.$TESTDIR/ elif [ "${JOB_NAME/*.}" = "Open_Posix" ]; then - put -r target_bin /tmp/jta.$TESTDIR/ + put -r target_bin /tmp/fuego.$TESTDIR/ fi } diff --git a/engine/tests/OpenSSL/openssl.sh b/engine/tests/OpenSSL/openssl.sh index a924877..dc392b2 100644 --- a/engine/tests/OpenSSL/openssl.sh +++ b/engine/tests/OpenSSL/openssl.sh @@ -1,14 +1,14 @@ tarball=openssl-0.9.8j.tar.gz -source $JTA_SCRIPTS_PATH/overlays.sh -source $JTA_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/reports.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/functions.sh TESTDIR="OpenSSL" -TEST_HOME="$JTA_TESTS_PATH/OpenSSL" +TEST_HOME="$FUEGO_TESTS_PATH/OpenSSL" TRIPLET=$TESTDIR-$PLATFORM function test_build { @@ -65,7 +65,7 @@ function test_build { } function test_deploy { - put -r apps util test run-tests.sh $JTA_HOME/jta.$TESTDIR/ + put -r apps util test run-tests.sh $FUEGO_HOME/fuego.$TESTDIR/ } pre_test $TESTDIR diff --git a/engine/tests/netperf/netperf.sh b/engine/tests/netperf/netperf.sh index e233cea..334b778 100644 --- a/engine/tests/netperf/netperf.sh +++ b/engine/tests/netperf/netperf.sh @@ -1,14 +1,14 @@ tarball=netperf-2.6.0.tar.bz2 -source $JTA_SCRIPTS_PATH/overlays.sh +source $FUEGO_SCRIPTS_PATH/overlays.sh set_overlay_vars -source $JTA_SCRIPTS_PATH/reports.sh -source $JTA_SCRIPTS_PATH/functions.sh +source $FUEGO_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/functions.sh TESTDIR="netperf" -TEST_HOME="$JTA_TESTS_PATH/netperf" +TEST_HOME="$FUEGO_TESTS_PATH/netperf" TRIPLET=$TESTDIR-$PLATFORM function test_build { @@ -23,9 +23,9 @@ function test_deploy { cp $TEST_HOME/netperf-rabench_script ./rabench_script cp $TEST_HOME/netperf-random_rr_script ./random_rr_script chmod a+x *script; - put *script $JTA_HOME/jta.$TESTDIR/ + put *script $FUEGO_HOME/fuego.$TESTDIR/ cd $WORKSPACE/$TRIPLET/src/ - put netperf $JTA_HOME/jta.$TESTDIR/ + put netperf $FUEGO_HOME/fuego.$TESTDIR/ } if [ "$type" = "Benc" ]; then diff --git a/jobs/Benchmark.Dhrystone/config.xml b/jobs/Benchmark.Dhrystone/config.xml index 8c634bf..8ee7c68 100644 --- a/jobs/Benchmark.Dhrystone/config.xml +++ b/jobs/Benchmark.Dhrystone/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.Dhrystone/plot.png + /userContent/fuego.logs/Benchmark.Dhrystone/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/Dhrystone.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/Dhrystone.sh @@ -124,7 +124,7 @@ true false - diff --git a/jobs/Benchmark.GLMark/config.xml b/jobs/Benchmark.GLMark/config.xml index 160e2fe..b6908ee 100644 --- a/jobs/Benchmark.GLMark/config.xml +++ b/jobs/Benchmark.GLMark/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.GLMark/plot.png + /userContent/fuego.logs/Benchmark.GLMark/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/GLMark.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/GLMark.sh @@ -124,7 +124,7 @@ true false - diff --git a/jobs/Benchmark.IOzone/config.xml b/jobs/Benchmark.IOzone/config.xml index 1ab72a5..7e4b147 100644 --- a/jobs/Benchmark.IOzone/config.xml +++ b/jobs/Benchmark.IOzone/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.IOzone/plot.png + /userContent/fuego.logs/Benchmark.IOzone/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/iozone.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/iozone.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.Interbench/config.xml b/jobs/Benchmark.Interbench/config.xml index e10f79f..f72ee46 100644 --- a/jobs/Benchmark.Interbench/config.xml +++ b/jobs/Benchmark.Interbench/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.Interbench/plot.png + /userContent/fuego.logs/Benchmark.Interbench/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/interbench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/interbench.sh @@ -122,7 +122,7 @@ true false - diff --git a/jobs/Benchmark.Java/config.xml b/jobs/Benchmark.Java/config.xml index 2c0ecc7..5ead9ea 100644 --- a/jobs/Benchmark.Java/config.xml +++ b/jobs/Benchmark.Java/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.Java/plot.png + /userContent/fuego.logs/Benchmark.Java/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/java_perf.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/java_perf.sh @@ -122,7 +122,7 @@ true false - diff --git a/jobs/Benchmark.OpenSSL/config.xml b/jobs/Benchmark.OpenSSL/config.xml index 7ae5573..a916cca 100644 --- a/jobs/Benchmark.OpenSSL/config.xml +++ b/jobs/Benchmark.OpenSSL/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.OpenSSL/plot.png + /userContent/fuego.logs/Benchmark.OpenSSL/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/openssl-bench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/openssl-bench.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.Stream/config.xml b/jobs/Benchmark.Stream/config.xml index 78204f7..8343e99 100644 --- a/jobs/Benchmark.Stream/config.xml +++ b/jobs/Benchmark.Stream/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.Stream/plot.png + /userContent/fuego.logs/Benchmark.Stream/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/stream.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/stream.sh @@ -122,7 +122,7 @@ true false - diff --git a/jobs/Benchmark.Whetstone/config.xml b/jobs/Benchmark.Whetstone/config.xml index c869ad7..bea9dc7 100644 --- a/jobs/Benchmark.Whetstone/config.xml +++ b/jobs/Benchmark.Whetstone/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.Whetstone/plot.png + /userContent/fuego.logs/Benchmark.Whetstone/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/Whetstone.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/Whetstone.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.aim7/config.xml b/jobs/Benchmark.aim7/config.xml index cb5a45a..004678a 100644 --- a/jobs/Benchmark.aim7/config.xml +++ b/jobs/Benchmark.aim7/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.aim7/plot.png + /userContent/fuego.logs/Benchmark.aim7/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/aim7.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/aim7.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.bc/config.xml b/jobs/Benchmark.bc/config.xml index 7d45a4f..00a7591 100644 --- a/jobs/Benchmark.bc/config.xml +++ b/jobs/Benchmark.bc/config.xml @@ -68,12 +68,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.bc/plot.png + /userContent/fuego.logs/Benchmark.bc/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/bc-script.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/bc-script.sh @@ -122,7 +122,7 @@ true false - diff --git a/jobs/Benchmark.blobsallad/config.xml b/jobs/Benchmark.blobsallad/config.xml index 6e57b9c..c7c8000 100644 --- a/jobs/Benchmark.blobsallad/config.xml +++ b/jobs/Benchmark.blobsallad/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.blobsallad/plot.png + /userContent/fuego.logs/Benchmark.blobsallad/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/blobsallad.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/blobsallad.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.bonnie/config.xml b/jobs/Benchmark.bonnie/config.xml index f6d7c83..9cb8eb5 100644 --- a/jobs/Benchmark.bonnie/config.xml +++ b/jobs/Benchmark.bonnie/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.bonnie/plot.png + /userContent/fuego.logs/Benchmark.bonnie/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/bonnie++.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/bonnie++.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.cyclictest/config.xml b/jobs/Benchmark.cyclictest/config.xml index b943205..576de59 100644 --- a/jobs/Benchmark.cyclictest/config.xml +++ b/jobs/Benchmark.cyclictest/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.cyclictest/plot.png + /userContent/fuego.logs/Benchmark.cyclictest/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/cyclictest.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/cyclictest.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.dbench/config.xml b/jobs/Benchmark.dbench/config.xml index 388d913..4ae6d37 100644 --- a/jobs/Benchmark.dbench/config.xml +++ b/jobs/Benchmark.dbench/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.dbench/plot.png + /userContent/fuego.logs/Benchmark.dbench/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/dbench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/dbench.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.ebizzy/config.xml b/jobs/Benchmark.ebizzy/config.xml index 367a5f8..4647213 100644 --- a/jobs/Benchmark.ebizzy/config.xml +++ b/jobs/Benchmark.ebizzy/config.xml @@ -71,12 +71,12 @@ server workloads.<br> - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.ebizzy/plot.png + /userContent/fuego.logs/Benchmark.ebizzy/plot.png Graph plot.png @@ -99,11 +99,11 @@ server workloads.<br> /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ebizzy.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ebizzy.sh @@ -125,7 +125,7 @@ server workloads.<br> true false - diff --git a/jobs/Benchmark.ffsb/config.xml b/jobs/Benchmark.ffsb/config.xml index d34dd94..a0c1e60 100644 --- a/jobs/Benchmark.ffsb/config.xml +++ b/jobs/Benchmark.ffsb/config.xml @@ -68,12 +68,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.ffsb/plot.png + /userContent/fuego.logs/Benchmark.ffsb/plot.png Graph plot.png @@ -96,10 +96,10 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ffsb.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ffsb.sh @@ -121,7 +121,7 @@ true false - diff --git a/jobs/Benchmark.fio/config.xml b/jobs/Benchmark.fio/config.xml index f7511b0..32b1ebc 100644 --- a/jobs/Benchmark.fio/config.xml +++ b/jobs/Benchmark.fio/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.fio/plot.png + /userContent/fuego.logs/Benchmark.fio/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/fio.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/fio.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.gtkperf/config.xml b/jobs/Benchmark.gtkperf/config.xml index 4775582..f58f3a8 100644 --- a/jobs/Benchmark.gtkperf/config.xml +++ b/jobs/Benchmark.gtkperf/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.gtkperf/plot.png + /userContent/fuego.logs/Benchmark.gtkperf/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/gtkperf.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/gtkperf.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.hackbench/config.xml b/jobs/Benchmark.hackbench/config.xml index 3604757..48d4e6a 100644 --- a/jobs/Benchmark.hackbench/config.xml +++ b/jobs/Benchmark.hackbench/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.hackbench/plot.png + /userContent/fuego.logs/Benchmark.hackbench/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/hackbench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/hackbench.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.himeno/config.xml b/jobs/Benchmark.himeno/config.xml index 8ec27c4..2a47d90 100644 --- a/jobs/Benchmark.himeno/config.xml +++ b/jobs/Benchmark.himeno/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.himeno/plot.png + /userContent/fuego.logs/Benchmark.himeno/plot.png Graph plot.png @@ -96,11 +96,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/himeno.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/himeno.sh @@ -122,7 +122,7 @@ true false - diff --git a/jobs/Benchmark.iperf/config.xml b/jobs/Benchmark.iperf/config.xml index 7cff2e4..e5f22c3 100644 --- a/jobs/Benchmark.iperf/config.xml +++ b/jobs/Benchmark.iperf/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.iperf/plot.png + /userContent/fuego.logs/Benchmark.iperf/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/iperf.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/iperf.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.linpack/config.xml b/jobs/Benchmark.linpack/config.xml index 471d009..f96a6cb 100644 --- a/jobs/Benchmark.linpack/config.xml +++ b/jobs/Benchmark.linpack/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.linpack/plot.png + /userContent/fuego.logs/Benchmark.linpack/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/linpack.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/linpack.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.lmbench2/config.xml b/jobs/Benchmark.lmbench2/config.xml index 3e55198..b683607 100644 --- a/jobs/Benchmark.lmbench2/config.xml +++ b/jobs/Benchmark.lmbench2/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.lmbench2/plot.png + /userContent/fuego.logs/Benchmark.lmbench2/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/lmbench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/lmbench.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.nbench-byte/config.xml b/jobs/Benchmark.nbench-byte/config.xml index 86fbfe0..84f0369 100644 --- a/jobs/Benchmark.nbench-byte/config.xml +++ b/jobs/Benchmark.nbench-byte/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.nbench-byte/plot.png + /userContent/fuego.logs/Benchmark.nbench-byte/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/nbench-byte.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/nbench-byte.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.netperf/config.xml b/jobs/Benchmark.netperf/config.xml index 6b736d0..9cd230a 100644 --- a/jobs/Benchmark.netperf/config.xml +++ b/jobs/Benchmark.netperf/config.xml @@ -70,12 +70,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.netperf/plot.png + /userContent/fuego.logs/Benchmark.netperf/plot.png Graph plot.png @@ -98,11 +98,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/netperf-bench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/netperf-bench.sh @@ -124,7 +124,7 @@ true false - diff --git a/jobs/Benchmark.netpipe/config.xml b/jobs/Benchmark.netpipe/config.xml index c96ace7..6a8457d 100644 --- a/jobs/Benchmark.netpipe/config.xml +++ b/jobs/Benchmark.netpipe/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.netpipe/plot.png + /userContent/fuego.logs/Benchmark.netpipe/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/NetPIPE.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/NetPIPE.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.reboot/config.xml b/jobs/Benchmark.reboot/config.xml index bcfd1df..d128e9b 100644 --- a/jobs/Benchmark.reboot/config.xml +++ b/jobs/Benchmark.reboot/config.xml @@ -59,12 +59,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.reboot/plot.png + /userContent/fuego.logs/Benchmark.reboot/plot.png Graph plot.png @@ -87,11 +87,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/reboot.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/reboot.sh @@ -113,7 +113,7 @@ true false - diff --git a/jobs/Benchmark.signaltest/config.xml b/jobs/Benchmark.signaltest/config.xml index 22644df..d27df51 100644 --- a/jobs/Benchmark.signaltest/config.xml +++ b/jobs/Benchmark.signaltest/config.xml @@ -70,12 +70,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.signaltest/plot.png + /userContent/fuego.logs/Benchmark.signaltest/plot.png Graph plot.png @@ -98,11 +98,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/signaltest.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/signaltest.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.tiobench/config.xml b/jobs/Benchmark.tiobench/config.xml index 3a95a27..d747e52 100644 --- a/jobs/Benchmark.tiobench/config.xml +++ b/jobs/Benchmark.tiobench/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.tiobench/plot.png + /userContent/fuego.logs/Benchmark.tiobench/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/tiobench.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/tiobench.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Benchmark.x11perf/config.xml b/jobs/Benchmark.x11perf/config.xml index a0df86c..3c5bd6a 100644 --- a/jobs/Benchmark.x11perf/config.xml +++ b/jobs/Benchmark.x11perf/config.xml @@ -69,12 +69,12 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif - /userContent/jta.logs/Benchmark.x11perf/plot.png + /userContent/fuego.logs/Benchmark.x11perf/plot.png Graph plot.png @@ -97,11 +97,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/x11perf.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/x11perf.sh @@ -123,7 +123,7 @@ true false - diff --git a/jobs/Functional.LTP.Devices/config.xml b/jobs/Functional.LTP.Devices/config.xml index 58de8ea..d312561 100644 --- a/jobs/Functional.LTP.Devices/config.xml +++ b/jobs/Functional.LTP.Devices/config.xml @@ -65,7 +65,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -87,11 +87,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ltp-devices.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ltp-devices.sh @@ -106,7 +106,7 @@ true false - diff --git a/jobs/Functional.LTP.Filesystem/config.xml b/jobs/Functional.LTP.Filesystem/config.xml index 37f6f30..fe6820c 100644 --- a/jobs/Functional.LTP.Filesystem/config.xml +++ b/jobs/Functional.LTP.Filesystem/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ltp-filesystem.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ltp-filesystem.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.LTP.Open_Posix/config.xml b/jobs/Functional.LTP.Open_Posix/config.xml index 6ad3320..274dc1c 100644 --- a/jobs/Functional.LTP.Open_Posix/config.xml +++ b/jobs/Functional.LTP.Open_Posix/config.xml @@ -78,7 +78,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -100,11 +100,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ltp-open_posix.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ltp-open_posix.sh @@ -119,7 +119,7 @@ true false - diff --git a/jobs/Functional.OpenSSL/config.xml b/jobs/Functional.OpenSSL/config.xml index d1ff5a8..5c9a482 100644 --- a/jobs/Functional.OpenSSL/config.xml +++ b/jobs/Functional.OpenSSL/config.xml @@ -63,7 +63,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -85,11 +85,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/openssl-func.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/openssl-func.sh @@ -104,7 +104,7 @@ true false - diff --git a/jobs/Functional.aiostress/config.xml b/jobs/Functional.aiostress/config.xml index 4ffd98e..b60ac19 100644 --- a/jobs/Functional.aiostress/config.xml +++ b/jobs/Functional.aiostress/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/aiostress.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/aiostress.sh @@ -110,7 +110,7 @@ true false - diff --git a/jobs/Functional.arch_timer/config.xml b/jobs/Functional.arch_timer/config.xml index fa4942a..88669d0 100644 --- a/jobs/Functional.arch_timer/config.xml +++ b/jobs/Functional.arch_timer/config.xml @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/arch_timer.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/arch_timer.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.bzip2/config.xml b/jobs/Functional.bzip2/config.xml index 273dbd0..b30b186 100644 --- a/jobs/Functional.bzip2/config.xml +++ b/jobs/Functional.bzip2/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/bzip2.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/bzip2.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.cmt/config.xml b/jobs/Functional.cmt/config.xml index 16cdb20..91cff9c 100644 --- a/jobs/Functional.cmt/config.xml +++ b/jobs/Functional.cmt/config.xml @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/cmt.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/cmt.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.crashme/config.xml b/jobs/Functional.crashme/config.xml index ae3947d..ab2a8ac 100644 --- a/jobs/Functional.crashme/config.xml +++ b/jobs/Functional.crashme/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/crashme.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/crashme.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.expat/config.xml b/jobs/Functional.expat/config.xml index 3f3bd6a..2dc9d96 100644 --- a/jobs/Functional.expat/config.xml +++ b/jobs/Functional.expat/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/expat.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/expat.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.fontconfig/config.xml b/jobs/Functional.fontconfig/config.xml index b40baf0..617c9f1 100644 --- a/jobs/Functional.fontconfig/config.xml +++ b/jobs/Functional.fontconfig/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/fontconfig.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/fontconfig.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.ft2demos/config.xml b/jobs/Functional.ft2demos/config.xml index b8f8b86..e80e76f 100644 --- a/jobs/Functional.ft2demos/config.xml +++ b/jobs/Functional.ft2demos/config.xml @@ -63,7 +63,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -85,11 +85,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ft2demos.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ft2demos.sh @@ -104,7 +104,7 @@ true false - diff --git a/jobs/Functional.glib/config.xml b/jobs/Functional.glib/config.xml index 03dc097..eb80089 100644 --- a/jobs/Functional.glib/config.xml +++ b/jobs/Functional.glib/config.xml @@ -64,7 +64,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -86,15 +86,15 @@ /home/jenkins/buildzone - source $JTA_SCRIPTS_PATH/functions.sh + source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/glib2.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/glib2.sh @@ -109,7 +109,7 @@ pre_test $TESTDIR true false - diff --git a/jobs/Functional.ipv6connect/config.xml b/jobs/Functional.ipv6connect/config.xml index 9bdd58c..d9b0ffd 100644 --- a/jobs/Functional.ipv6connect/config.xml +++ b/jobs/Functional.ipv6connect/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/ipv6connect.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/ipv6connect.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.jpeg/config.xml b/jobs/Functional.jpeg/config.xml index 59fbea8..df222f9 100644 --- a/jobs/Functional.jpeg/config.xml +++ b/jobs/Functional.jpeg/config.xml @@ -63,7 +63,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -85,11 +85,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/jpeg.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/jpeg.sh @@ -104,7 +104,7 @@ true false - diff --git a/jobs/Functional.libpng/config.xml b/jobs/Functional.libpng/config.xml index c1a4b98..1e90832 100644 --- a/jobs/Functional.libpng/config.xml +++ b/jobs/Functional.libpng/config.xml @@ -67,7 +67,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -89,24 +89,24 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_SCRIPTS_PATH/functions.sh + source $FUEGO_SCRIPTS_PATH/functions.sh pre_test $TESTDIR - source $JTA_SCRIPTS_PATH/functions.sh -if $Rebuild; then source $JTA_SCRIPTS_PATH/build/$TESTDIR.sh; fi -source $JTA_SCRIPTS_PATH/deploy/$TESTDIR.sh + source $FUEGO_SCRIPTS_PATH/functions.sh +if $Rebuild; then source $FUEGO_SCRIPTS_PATH/build/$TESTDIR.sh; fi +source $FUEGO_SCRIPTS_PATH/deploy/$TESTDIR.sh - source $JTA_SCRIPTS_PATH/functions.sh -report_ssh "cd jta.$TESTDIR; ./pngtest pngtest.png" jta.$TESTDIR/$TESTDIR.log + source $FUEGO_SCRIPTS_PATH/functions.sh +report_ssh "cd fuego.$TESTDIR; ./pngtest pngtest.png" fuego.$TESTDIR/$TESTDIR.log - source $JTA_SCRIPTS_PATH/functions.sh + source $FUEGO_SCRIPTS_PATH/functions.sh get_testlog $TESTDIR @@ -129,7 +129,7 @@ log_compare "$TESTDIR" "0" "${N_CRIT}" "n" true false - diff --git a/jobs/Functional.linus_stress/config.xml b/jobs/Functional.linus_stress/config.xml index e48bdbd..c029a9d 100644 --- a/jobs/Functional.linus_stress/config.xml +++ b/jobs/Functional.linus_stress/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/linus_stress.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/linus_stress.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.netperf/config.xml b/jobs/Functional.netperf/config.xml index 73fac59..badb170 100644 --- a/jobs/Functional.netperf/config.xml +++ b/jobs/Functional.netperf/config.xml @@ -69,7 +69,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -91,11 +91,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/netperf-func.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/netperf-func.sh @@ -110,7 +110,7 @@ true false - diff --git a/jobs/Functional.pi_tests/config.xml b/jobs/Functional.pi_tests/config.xml index d3fedbb..bec9073 100644 --- a/jobs/Functional.pi_tests/config.xml +++ b/jobs/Functional.pi_tests/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/pi_tests.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/pi_tests.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.posixtestsuite/config.xml b/jobs/Functional.posixtestsuite/config.xml index 52fd97c..70f2dcf 100644 --- a/jobs/Functional.posixtestsuite/config.xml +++ b/jobs/Functional.posixtestsuite/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/posixtestsuite.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/posixtestsuite.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.rmaptest/config.xml b/jobs/Functional.rmaptest/config.xml index cb20911..3f0c838 100644 --- a/jobs/Functional.rmaptest/config.xml +++ b/jobs/Functional.rmaptest/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/rmaptest.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/rmaptest.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.scifab/config.xml b/jobs/Functional.scifab/config.xml index 1276ee0..45057e2 100644 --- a/jobs/Functional.scifab/config.xml +++ b/jobs/Functional.scifab/config.xml @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/scifab.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/scifab.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.scrashme/config.xml b/jobs/Functional.scrashme/config.xml index 0aaff82..4961557 100644 --- a/jobs/Functional.scrashme/config.xml +++ b/jobs/Functional.scrashme/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/scrashme.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/scrashme.sh @@ -110,7 +110,7 @@ true false - diff --git a/jobs/Functional.sdhi_0/config.xml b/jobs/Functional.sdhi_0/config.xml index 00f4d2f..b182d59 100644 --- a/jobs/Functional.sdhi_0/config.xml +++ b/jobs/Functional.sdhi_0/config.xml @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/sdhi_0.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/sdhi_0.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.stress/config.xml b/jobs/Functional.stress/config.xml index 36f86d4..7027308 100644 --- a/jobs/Functional.stress/config.xml +++ b/jobs/Functional.stress/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/stress.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/stress.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.synctest/config.xml b/jobs/Functional.synctest/config.xml index 7caffff..b31b101 100644 --- a/jobs/Functional.synctest/config.xml +++ b/jobs/Functional.synctest/config.xml @@ -68,7 +68,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -90,11 +90,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/synctest.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/synctest.sh @@ -109,7 +109,7 @@ true false - diff --git a/jobs/Functional.zlib/config.xml b/jobs/Functional.zlib/config.xml index 7330969..df21ab8 100644 --- a/jobs/Functional.zlib/config.xml +++ b/jobs/Functional.zlib/config.xml @@ -63,7 +63,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -85,11 +85,11 @@ /home/jenkins/buildzone - if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi - echo $TESTPLAN >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan; + if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi + echo $TESTPLAN >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan; TESTPLAN=testplans/$TESTPLAN.json - source $JTA_TESTS_PATH/$JOB_NAME/zlib.sh + source $FUEGO_TESTS_PATH/$JOB_NAME/zlib.sh @@ -104,7 +104,7 @@ true false - diff --git a/jobs/Matrix.Nightly/config.xml b/jobs/Matrix.Nightly/config.xml index 030ecaa..903d916 100644 --- a/jobs/Matrix.Nightly/config.xml +++ b/jobs/Matrix.Nightly/config.xml @@ -36,7 +36,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/jobs/Matrix.Official/config.xml b/jobs/Matrix.Official/config.xml index 83d9ff2..ce084c6 100644 --- a/jobs/Matrix.Official/config.xml +++ b/jobs/Matrix.Official/config.xml @@ -36,7 +36,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/jobs/Reports.make_pdf/config.xml b/jobs/Reports.make_pdf/config.xml index 7aa9fcb..df4a3ca 100644 --- a/jobs/Reports.make_pdf/config.xml +++ b/jobs/Reports.make_pdf/config.xml @@ -10,7 +10,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/jobs/Run ALL tests on ALL targets/config.xml b/jobs/Run ALL tests on ALL targets/config.xml index b549e34..57fe12d 100644 --- a/jobs/Run ALL tests on ALL targets/config.xml +++ b/jobs/Run ALL tests on ALL targets/config.xml @@ -62,7 +62,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/jobs/Run ALL tests on SELECTED targets/config.xml b/jobs/Run ALL tests on SELECTED targets/config.xml index 17baa4c..0fa76d9 100644 --- a/jobs/Run ALL tests on SELECTED targets/config.xml +++ b/jobs/Run ALL tests on SELECTED targets/config.xml @@ -77,7 +77,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/jobs/Run SELECTED tests on SELECTED targets/config.xml b/jobs/Run SELECTED tests on SELECTED targets/config.xml index 250eb38..2ca4ad1 100644 --- a/jobs/Run SELECTED tests on SELECTED targets/config.xml +++ b/jobs/Run SELECTED tests on SELECTED targets/config.xml @@ -107,7 +107,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif @@ -206,10 +206,10 @@ Device=${Target} Rebuild=${Rebuild_test} Target_Cleanup=${Cleanup_target} Reboot=${Reboot_target} -if [ ! -d "$JTA_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$JTA_LOGS_PATH/$JOB_NAME"; fi -echo ${BATCH_TESTPLAN} >$JTA_LOGS_PATH/$JOB_NAME/last_used_testplan +if [ ! -d "$FUEGO_LOGS_PATH/$JOB_NAME" ]; then mkdir -p "$FUEGO_LOGS_PATH/$JOB_NAME"; fi +echo ${BATCH_TESTPLAN} >$FUEGO_LOGS_PATH/$JOB_NAME/last_used_testplan LOGRUN_FILE=${BUILD_ID}.${BUILD_NUMBER}.json -source $JTA_SCRIPTS_PATH/reports.sh +source $FUEGO_SCRIPTS_PATH/reports.sh gen_report diff --git a/jobs/Service.ReloadConfiguration/config.xml b/jobs/Service.ReloadConfiguration/config.xml index 5f7d3b2..7e7da4c 100644 --- a/jobs/Service.ReloadConfiguration/config.xml +++ b/jobs/Service.ReloadConfiguration/config.xml @@ -13,7 +13,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif diff --git a/plugins-conf/sidebar-link.xml b/plugins-conf/sidebar-link.xml index 8f0377c..d34f3e0 100644 --- a/plugins-conf/sidebar-link.xml +++ b/plugins-conf/sidebar-link.xml @@ -2,7 +2,7 @@ - /userContent/docs/jta-docs.pdf + /userContent/docs/fuego-docs.pdf Documentation help.gif -- 1.9.1