* [Fuego] Re-send and a few new fixes
@ 2017-04-27 8:26 Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
0 siblings, 1 reply; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Hi Tim,
Please consider merging the following patches into your next branch.
They are all pushed to my next branch (you may need to hard reset it)
for your convenience.
I have tried to address all of your comments, but if there is one
that slipped my mind please let me know. I still have to add the
FUEGO_HOSTNAME variable.
[PATCH 01/23] parser: fix bug in the parser
[PATCH 02/23] ftc: add timeout parameter when using add-jobs without
[PATCH 03/23] specs: change the name of the specs to spec
[PATCH 04/23] tests: add FIXTHIS to tests without any shell script
[PATCH 05/23] tests: rename incorrectly named test shell scripts
[PATCH 06/23] fuego_test: rename all test shell scripts to
[PATCH 07/23] stress: remove stress.sh and references
[PATCH 08/23] scrashme: just fix indentation
[PATCH 09/23] git: introduce a generic git mechanism and use pi_tests
[PATCH 10/23] expat: fix the expat test
[PATCH 11/23] crashme: fix indentation
[PATCH 12/23] bzip2: fix trailing spaces and indentation
[PATCH 13/23] bzip2: when using log_compare two times record the
[PATCH 14/23] IOzone: remove unneeded definition of bytes
[PATCH 15/23] bonnie: fix indentation and add fixthis for sleep
[PATCH 16/23] phases: rework the order of phases
[PATCH 17/23] log_compare: add fixthis about a non-used parameter
[PATCH 18/23] LTP: add separated build and run phases
[PATCH 19/23] kernel_build: set linux mainstream as default spec
[PATCH 20/23] spec format: modify so that the spec name is the key
[PATCH 21/23] generic_parser: rewrite the label
[PATCH 22/23] links: links can now be specified by the specs
[PATCH 23/23] testplan_docker: add synctest expat and crashme
Thanks,
Daniel
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 01/23] parser: fix bug in the parser
2017-04-27 8:26 [Fuego] Re-send and a few new fixes Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 02/23] ftc: add timeout parameter when using add-jobs without testplans Daniel Sangorrin
` (21 more replies)
0 siblings, 22 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
The previous version did not support multiple groups.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/parser/common.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/engine/scripts/parser/common.py b/engine/scripts/parser/common.py
index cdc2700..ebbff08 100644
--- a/engine/scripts/parser/common.py
+++ b/engine/scripts/parser/common.py
@@ -93,8 +93,12 @@ def process_data(ref_section_pat=None, test_results={}, plot_type='s', label='de
thresholds, criteria = read_thresholds_data(ref_section_pat)
else:
# special case for fail or pass tests (see generic_parser.py)
- thresholds = {'fail_or_pass': '0'}
- criteria = {'fail_or_pass': 'eq'}
+ thresholds = test_results.copy()
+ criteria = test_results.copy()
+ for key in thresholds:
+ thresholds[key] = '0'
+ for key in criteria:
+ criteria[key] = 'eq'
rc = compare(thresholds, test_results, criteria)
store_plot_data(thresholds, test_results)
@@ -423,22 +427,18 @@ def compare(thresholds, test_results, criteria):
Return code: '1' is used for parsing errors, so use '2' instead for threshold errors
"""
for key in test_results:
- thresholds_split = thresholds.get(key).split()
- test_results_split = test_results.get(key).split()
-
- for i, u in enumerate(test_results_split):
- comparison_result = cmp(float(test_results_split[i]), float(thresholds_split[i]))
- if criteria[key] == 'ge' and comparison_result < 0:
- hls("Test section %s: test result %s is smaller than threshold %s." % (key, test_results_split[i], thresholds_split[i]),'e')
- return 2
- elif criteria[key] == 'le' and comparison_result > 0:
- hls("Test section %s: test result %s is greater than threshold %s." % (key, test_results_split[i], thresholds_split[i]),'e')
- return 2
- elif criteria[key] == 'eq' and comparison_result != 0:
- hls("Test section %s: test result %s is different than %s (PASS)." % (key, test_results_split[i], thresholds_split[i]),'e')
- return 2
- else:
- print "Test section %s: test result %s satisfies (%s) threshold %s." % (key, test_results_split[i], criteria[key], thresholds_split[i])
+ comparison_result = cmp(float(test_results[key]), float(thresholds[key]))
+ if criteria[key] == 'ge' and comparison_result < 0:
+ hls("Test section %s: test result %s is smaller than threshold %s." % (key, test_results[key], thresholds[key]),'e')
+ return 2
+ elif criteria[key] == 'le' and comparison_result > 0:
+ hls("Test section %s: test result %s is greater than threshold %s." % (key, test_results[key], thresholds[key]),'e')
+ return 2
+ elif criteria[key] == 'eq' and comparison_result != 0:
+ hls("Test section %s: test result %s is different than %s (PASS)." % (key, test_results[key], thresholds[key]),'e')
+ return 2
+ else:
+ print "Test section %s: test result %s satisfies (%s) threshold %s." % (key, test_results[key], criteria[key], thresholds[key])
return 0
def main():
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 02/23] ftc: add timeout parameter when using add-jobs without testplans
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 03/23] specs: change the name of the specs to spec Daniel Sangorrin
` (20 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
I am using -k here because -t was already taken. If there is
a better suggestion please change it.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/ftc | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index fa46d5e..c162e90 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -87,9 +87,9 @@ TARGET_ENV_VAR="FTC_TARGET"
# format for command_help mapping with: key=name, value=(summary, long description)
command_help = {
"add-jobs":("Adds jobs to Jenkins.",
- """Usage: ftc add-jobs -b <target> [-p <testplan> | -t <testcase> -s <testspec>]
+ """Usage: ftc add-jobs -b <target> [-p <testplan> | -t <testcase> -s <testspec> [-k <kill timeout>]]
Example: ftc add-jobs -b docker -p testplan_docker
- Example: ftc add-jobs -b docker -t Benchmark.Dhrystone
+ Example: ftc add-jobs -b docker -t Benchmark.Dhrystone -k 1m
Use list-plans to see the available test plans.
This interface may change in the future."""),
@@ -983,6 +983,12 @@ def do_add_jobs(conf, options):
options.remove(spec)
else:
spec = 'default'
+ if '-k' in options:
+ try:
+ timeout = options[options.index('-k') + 1]
+ options.remove('-k')
+ except IndexError:
+ timeout = '30m'
else:
raise Exception('No testplan or testcase supplied.')
@@ -998,7 +1004,7 @@ def do_add_jobs(conf, options):
if test_name:
# FIXTHIS - we could parse more parameters for the job here, from the ftc command line
# use all defaults, except for the spec
- tp_dict = {"testName":test_name, "spec":spec}
+ tp_dict = {"testName":test_name, "timeout":timeout, "spec":spec}
test = plantest_class(tp_dict, defaults)
create_job(board, test)
else:
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 03/23] specs: change the name of the specs to spec
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 02/23] ftc: add timeout parameter when using add-jobs without testplans Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 17:08 ` Bird, Timothy
2017-04-27 8:26 ` [Fuego] [PATCH 04/23] tests: add FIXTHIS to tests without any shell script Daniel Sangorrin
` (19 subsequent siblings)
21 siblings, 1 reply; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
This is to avoid typical misspelling errors by test writers
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/ovgen.py | 2 +-
.../Benchmark.Dhrystone/Benchmark.Dhrystone.spec | 25 ------------
engine/tests/Benchmark.Dhrystone/spec | 25 ++++++++++++
.../tests/Benchmark.GLMark/Benchmark.GLMark.spec | 10 -----
engine/tests/Benchmark.GLMark/spec | 10 +++++
.../tests/Benchmark.IOzone/Benchmark.IOzone.spec | 45 ---------------------
engine/tests/Benchmark.IOzone/spec | 45 +++++++++++++++++++++
.../Benchmark.Interbench/Benchmark.Interbench.spec | 20 ---------
engine/tests/Benchmark.Interbench/spec | 20 +++++++++
engine/tests/Benchmark.Java/Benchmark.Java.spec | 10 -----
engine/tests/Benchmark.Java/spec | 10 +++++
.../tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec | 10 -----
engine/tests/Benchmark.OpenSSL/spec | 10 +++++
.../tests/Benchmark.Stream/Benchmark.Stream.spec | 10 -----
engine/tests/Benchmark.Stream/spec | 10 +++++
.../Benchmark.Whetstone/Benchmark.Whetstone.spec | 11 -----
engine/tests/Benchmark.Whetstone/spec | 11 +++++
engine/tests/Benchmark.aim7/Benchmark.aim7.spec | 8 ----
engine/tests/Benchmark.aim7/spec | 8 ++++
.../Benchmark.blobsallad/Benchmark.blobsallad.spec | 16 --------
engine/tests/Benchmark.blobsallad/spec | 16 ++++++++
.../tests/Benchmark.bonnie/Benchmark.bonnie.spec | 47 ----------------------
engine/tests/Benchmark.bonnie/spec | 47 ++++++++++++++++++++++
.../Benchmark.cyclictest/Benchmark.cyclictest.spec | 11 -----
engine/tests/Benchmark.cyclictest/spec | 11 +++++
.../tests/Benchmark.dbench/Benchmark.dbench.spec | 42 -------------------
engine/tests/Benchmark.dbench/spec | 42 +++++++++++++++++++
.../tests/Benchmark.ebizzy/Benchmark.ebizzy.spec | 14 -------
engine/tests/Benchmark.ebizzy/spec | 14 +++++++
engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec | 30 --------------
engine/tests/Benchmark.ffsb/spec | 30 ++++++++++++++
engine/tests/Benchmark.fio/Benchmark.fio.spec | 35 ----------------
engine/tests/Benchmark.fio/spec | 35 ++++++++++++++++
.../tests/Benchmark.fs_mark/Benchmark.fs_mark.spec | 8 ----
engine/tests/Benchmark.fs_mark/spec | 8 ++++
.../Benchmark.fuego_check_plots.spec | 13 ------
engine/tests/Benchmark.fuego_check_plots/spec | 13 ++++++
.../tests/Benchmark.gtkperf/Benchmark.gtkperf.spec | 16 --------
engine/tests/Benchmark.gtkperf/spec | 16 ++++++++
.../Benchmark.hackbench/Benchmark.hackbench.spec | 11 -----
engine/tests/Benchmark.hackbench/spec | 11 +++++
.../tests/Benchmark.himeno/Benchmark.himeno.spec | 10 -----
engine/tests/Benchmark.himeno/spec | 10 +++++
engine/tests/Benchmark.iperf/Benchmark.iperf.spec | 11 -----
engine/tests/Benchmark.iperf/spec | 11 +++++
.../tests/Benchmark.linpack/Benchmark.linpack.spec | 10 -----
engine/tests/Benchmark.linpack/spec | 10 +++++
.../Benchmark.lmbench2/Benchmark.lmbench2.spec | 10 -----
engine/tests/Benchmark.lmbench2/spec | 10 +++++
.../Benchmark.nbench-byte.spec | 8 ----
engine/tests/Benchmark.nbench-byte/spec | 8 ++++
.../Benchmark.nbench_byte.spec | 10 -----
engine/tests/Benchmark.nbench_byte/spec | 10 +++++
.../tests/Benchmark.netperf/Benchmark.netperf.spec | 14 -------
engine/tests/Benchmark.netperf/spec | 14 +++++++
.../tests/Benchmark.netpipe/Benchmark.netpipe.spec | 12 ------
engine/tests/Benchmark.netpipe/spec | 12 ++++++
.../tests/Benchmark.reboot/Benchmark.reboot.spec | 10 -----
engine/tests/Benchmark.reboot/spec | 10 +++++
.../Benchmark.signaltest/Benchmark.signaltest.spec | 11 -----
engine/tests/Benchmark.signaltest/spec | 11 +++++
.../Benchmark.sysbench/Benchmark.sysbench.spec | 8 ----
engine/tests/Benchmark.sysbench/spec | 8 ++++
.../Benchmark.tiobench/Benchmark.tiobench.spec | 38 -----------------
engine/tests/Benchmark.tiobench/spec | 38 +++++++++++++++++
.../tests/Benchmark.x11perf/Benchmark.x11perf.spec | 11 -----
engine/tests/Benchmark.x11perf/spec | 11 +++++
engine/tests/Functional.LTP/Functional.LTP.spec | 34 ----------------
engine/tests/Functional.LTP/spec | 34 ++++++++++++++++
.../Functional.OpenSSL/Functional.OpenSSL.spec | 8 ----
engine/tests/Functional.OpenSSL/spec | 8 ++++
.../Functional.aiostress/Functional.aiostress.spec | 31 --------------
engine/tests/Functional.aiostress/spec | 31 ++++++++++++++
.../Functional.arch_timer.spec | 8 ----
engine/tests/Functional.arch_timer/spec | 8 ++++
engine/tests/Functional.bc/Functional.bc.spec | 33 ---------------
engine/tests/Functional.bc/spec | 33 +++++++++++++++
.../tests/Functional.boost/Functional.boost.spec | 10 -----
engine/tests/Functional.boost/spec | 10 +++++
.../tests/Functional.bsdiff/Functional.bsdiff.spec | 8 ----
engine/tests/Functional.bsdiff/spec | 8 ++++
.../tests/Functional.bzip2/Functional.bzip2.spec | 9 -----
engine/tests/Functional.bzip2/spec | 9 +++++
engine/tests/Functional.cmt/Functional.cmt.spec | 8 ----
engine/tests/Functional.cmt/spec | 8 ++++
.../Functional.commonAPI_C++.spec | 8 ----
engine/tests/Functional.commonAPI_C++/spec | 8 ++++
.../Functional.commonAPI_Dbus.spec | 8 ----
engine/tests/Functional.commonAPI_Dbus/spec | 8 ++++
.../Functional.commonAPI_SomeIp.spec | 8 ----
engine/tests/Functional.commonAPI_SomeIp/spec | 8 ++++
.../Functional.crashme/Functional.crashme.spec | 14 -------
engine/tests/Functional.crashme/spec | 14 +++++++
.../tests/Functional.croco/Functional.croco.spec | 8 ----
engine/tests/Functional.croco/spec | 8 ++++
engine/tests/Functional.curl/Functional.curl.spec | 10 -----
engine/tests/Functional.curl/spec | 10 +++++
.../tests/Functional.expat/Functional.expat.spec | 9 -----
engine/tests/Functional.expat/spec | 9 +++++
.../Functional.fixesproto.spec | 8 ----
engine/tests/Functional.fixesproto/spec | 8 ++++
.../Functional.fontconfig.spec | 9 -----
engine/tests/Functional.fontconfig/spec | 9 +++++
.../tests/Functional.fsfuzz/Functional.fsfuzz.spec | 8 ----
engine/tests/Functional.fsfuzz/spec | 8 ++++
.../Functional.ft2demos/Functional.ft2demos.spec | 9 -----
engine/tests/Functional.ft2demos/spec | 9 +++++
.../Functional.fuego_abort.spec | 10 -----
engine/tests/Functional.fuego_abort/spec | 10 +++++
.../Functional.fuego_board_check.spec | 13 ------
engine/tests/Functional.fuego_board_check/spec | 13 ++++++
.../Functional.fuego_test_phases.spec | 10 -----
engine/tests/Functional.fuego_test_phases/spec | 10 +++++
.../Functional.fuego_transport.spec | 9 -----
engine/tests/Functional.fuego_transport/spec | 9 +++++
engine/tests/Functional.fuse/Functional.fuse.spec | 8 ----
engine/tests/Functional.fuse/spec | 8 ++++
.../tests/Functional.giflib/Functional.giflib.spec | 8 ----
engine/tests/Functional.giflib/spec | 8 ++++
engine/tests/Functional.glib/Functional.glib.spec | 9 -----
engine/tests/Functional.glib/spec | 9 +++++
.../tests/Functional.glib2/Functional.glib2.spec | 8 ----
engine/tests/Functional.glib2/spec | 8 ++++
.../tests/Functional.glibc/Functional.glibc.spec | 8 ----
engine/tests/Functional.glibc/spec | 8 ++++
.../Functional.hciattach/Functional.hciattach.spec | 8 ----
engine/tests/Functional.hciattach/spec | 8 ++++
.../Functional.hello_world.spec | 19 ---------
engine/tests/Functional.hello_world/spec | 19 +++++++++
.../Functional.imagemagick.spec | 8 ----
engine/tests/Functional.imagemagick/spec | 8 ++++
.../Functional.iptables/Functional.iptables.spec | 8 ----
engine/tests/Functional.iptables/spec | 8 ++++
.../Functional.iputils/Functional.iputils.spec | 8 ----
engine/tests/Functional.iputils/spec | 8 ++++
.../Functional.ipv6connect.spec | 9 -----
engine/tests/Functional.ipv6connect/spec | 9 +++++
engine/tests/Functional.jpeg/Functional.jpeg.spec | 9 -----
engine/tests/Functional.jpeg/spec | 9 +++++
.../Functional.kernel_build.spec | 18 ---------
engine/tests/Functional.kernel_build/spec | 18 +++++++++
engine/tests/Functional.kmod/Functional.kmod.spec | 8 ----
engine/tests/Functional.kmod/spec | 8 ++++
.../tests/Functional.libogg/Functional.libogg.spec | 8 ----
engine/tests/Functional.libogg/spec | 8 ++++
.../Functional.libpcap/Functional.libpcap.spec | 8 ----
engine/tests/Functional.libpcap/spec | 8 ++++
.../Functional.librsvg/Functional.librsvg.spec | 8 ----
engine/tests/Functional.librsvg/spec | 8 ++++
.../Functional.libspeex/Functional.libspeex.spec | 8 ----
engine/tests/Functional.libspeex/spec | 8 ++++
.../tests/Functional.libtar/Functional.libtar.spec | 8 ----
engine/tests/Functional.libtar/spec | 8 ++++
.../Functional.libwebsocket.spec | 8 ----
engine/tests/Functional.libwebsocket/spec | 8 ++++
.../Functional.linus_stress.spec | 11 -----
engine/tests/Functional.linus_stress/spec | 11 +++++
engine/tests/Functional.lwip/Functional.lwip.spec | 8 ----
engine/tests/Functional.lwip/spec | 8 ++++
.../Functional.mesa-demos.spec | 8 ----
engine/tests/Functional.mesa-demos/spec | 8 ++++
engine/tests/Functional.neon/Functional.neon.spec | 8 ----
engine/tests/Functional.neon/spec | 8 ++++
.../Functional.net-tools/Functional.net-tools.spec | 8 ----
engine/tests/Functional.net-tools/spec | 8 ++++
.../Functional.netperf/Functional.netperf.spec | 14 -------
engine/tests/Functional.netperf/spec | 14 +++++++
.../Functional.pi_tests/Functional.pi_tests.spec | 12 ------
engine/tests/Functional.pi_tests/spec | 12 ++++++
.../tests/Functional.pixman/Functional.pixman.spec | 8 ----
engine/tests/Functional.pixman/spec | 8 ++++
engine/tests/Functional.pppd/Functional.pppd.spec | 8 ----
engine/tests/Functional.pppd/spec | 8 ++++
.../Functional.protobuf/Functional.protobuf.spec | 8 ----
engine/tests/Functional.protobuf/spec | 8 ++++
.../Functional.rmaptest/Functional.rmaptest.spec | 14 -------
engine/tests/Functional.rmaptest/spec | 14 +++++++
.../tests/Functional.scifab/Functional.scifab.spec | 8 ----
engine/tests/Functional.scifab/spec | 8 ++++
.../Functional.scrashme/Functional.scrashme.spec | 21 ----------
engine/tests/Functional.scrashme/spec | 21 ++++++++++
.../tests/Functional.sdhi_0/Functional.sdhi_0.spec | 8 ----
engine/tests/Functional.sdhi_0/spec | 8 ++++
.../tests/Functional.stress/Functional.stress.spec | 16 --------
engine/tests/Functional.stress/spec | 16 ++++++++
.../Functional.synctest/Functional.synctest.spec | 38 -----------------
engine/tests/Functional.synctest/spec | 38 +++++++++++++++++
.../tests/Functional.thrift/Functional.thrift.spec | 8 ----
engine/tests/Functional.thrift/spec | 8 ++++
engine/tests/Functional.tiff/Functional.tiff.spec | 8 ----
engine/tests/Functional.tiff/spec | 8 ++++
.../Functional.vsomeip/Functional.vsomeip.spec | 8 ----
engine/tests/Functional.vsomeip/spec | 8 ++++
.../Functional.xorg-macros.spec | 8 ----
engine/tests/Functional.xorg-macros/spec | 8 ++++
engine/tests/Functional.zlib/Functional.zlib.spec | 9 -----
engine/tests/Functional.zlib/spec | 9 +++++
197 files changed, 1269 insertions(+), 1269 deletions(-)
delete mode 100644 engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
create mode 100644 engine/tests/Benchmark.Dhrystone/spec
delete mode 100644 engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
create mode 100644 engine/tests/Benchmark.GLMark/spec
delete mode 100644 engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
create mode 100644 engine/tests/Benchmark.IOzone/spec
delete mode 100644 engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
create mode 100644 engine/tests/Benchmark.Interbench/spec
delete mode 100644 engine/tests/Benchmark.Java/Benchmark.Java.spec
create mode 100644 engine/tests/Benchmark.Java/spec
delete mode 100644 engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
create mode 100644 engine/tests/Benchmark.OpenSSL/spec
delete mode 100644 engine/tests/Benchmark.Stream/Benchmark.Stream.spec
create mode 100644 engine/tests/Benchmark.Stream/spec
delete mode 100644 engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
create mode 100644 engine/tests/Benchmark.Whetstone/spec
delete mode 100644 engine/tests/Benchmark.aim7/Benchmark.aim7.spec
create mode 100644 engine/tests/Benchmark.aim7/spec
delete mode 100644 engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
create mode 100644 engine/tests/Benchmark.blobsallad/spec
delete mode 100644 engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
create mode 100644 engine/tests/Benchmark.bonnie/spec
delete mode 100644 engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
create mode 100644 engine/tests/Benchmark.cyclictest/spec
delete mode 100644 engine/tests/Benchmark.dbench/Benchmark.dbench.spec
create mode 100644 engine/tests/Benchmark.dbench/spec
delete mode 100644 engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
create mode 100644 engine/tests/Benchmark.ebizzy/spec
delete mode 100644 engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
create mode 100644 engine/tests/Benchmark.ffsb/spec
delete mode 100644 engine/tests/Benchmark.fio/Benchmark.fio.spec
create mode 100644 engine/tests/Benchmark.fio/spec
delete mode 100644 engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
create mode 100644 engine/tests/Benchmark.fs_mark/spec
delete mode 100644 engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec
create mode 100644 engine/tests/Benchmark.fuego_check_plots/spec
delete mode 100644 engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
create mode 100644 engine/tests/Benchmark.gtkperf/spec
delete mode 100644 engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
create mode 100644 engine/tests/Benchmark.hackbench/spec
delete mode 100644 engine/tests/Benchmark.himeno/Benchmark.himeno.spec
create mode 100644 engine/tests/Benchmark.himeno/spec
delete mode 100644 engine/tests/Benchmark.iperf/Benchmark.iperf.spec
create mode 100644 engine/tests/Benchmark.iperf/spec
delete mode 100644 engine/tests/Benchmark.linpack/Benchmark.linpack.spec
create mode 100644 engine/tests/Benchmark.linpack/spec
delete mode 100644 engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
create mode 100644 engine/tests/Benchmark.lmbench2/spec
delete mode 100644 engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
create mode 100644 engine/tests/Benchmark.nbench-byte/spec
delete mode 100644 engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
create mode 100644 engine/tests/Benchmark.nbench_byte/spec
delete mode 100644 engine/tests/Benchmark.netperf/Benchmark.netperf.spec
create mode 100644 engine/tests/Benchmark.netperf/spec
delete mode 100644 engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
create mode 100644 engine/tests/Benchmark.netpipe/spec
delete mode 100644 engine/tests/Benchmark.reboot/Benchmark.reboot.spec
create mode 100644 engine/tests/Benchmark.reboot/spec
delete mode 100644 engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
create mode 100644 engine/tests/Benchmark.signaltest/spec
delete mode 100644 engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
create mode 100644 engine/tests/Benchmark.sysbench/spec
delete mode 100644 engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
create mode 100644 engine/tests/Benchmark.tiobench/spec
delete mode 100644 engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
create mode 100644 engine/tests/Benchmark.x11perf/spec
delete mode 100644 engine/tests/Functional.LTP/Functional.LTP.spec
create mode 100644 engine/tests/Functional.LTP/spec
delete mode 100644 engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
create mode 100644 engine/tests/Functional.OpenSSL/spec
delete mode 100644 engine/tests/Functional.aiostress/Functional.aiostress.spec
create mode 100644 engine/tests/Functional.aiostress/spec
delete mode 100644 engine/tests/Functional.arch_timer/Functional.arch_timer.spec
create mode 100644 engine/tests/Functional.arch_timer/spec
delete mode 100644 engine/tests/Functional.bc/Functional.bc.spec
create mode 100644 engine/tests/Functional.bc/spec
delete mode 100644 engine/tests/Functional.boost/Functional.boost.spec
create mode 100644 engine/tests/Functional.boost/spec
delete mode 100644 engine/tests/Functional.bsdiff/Functional.bsdiff.spec
create mode 100644 engine/tests/Functional.bsdiff/spec
delete mode 100644 engine/tests/Functional.bzip2/Functional.bzip2.spec
create mode 100644 engine/tests/Functional.bzip2/spec
delete mode 100644 engine/tests/Functional.cmt/Functional.cmt.spec
create mode 100644 engine/tests/Functional.cmt/spec
delete mode 100644 engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
create mode 100644 engine/tests/Functional.commonAPI_C++/spec
delete mode 100644 engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
create mode 100644 engine/tests/Functional.commonAPI_Dbus/spec
delete mode 100644 engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec
create mode 100644 engine/tests/Functional.commonAPI_SomeIp/spec
delete mode 100644 engine/tests/Functional.crashme/Functional.crashme.spec
create mode 100644 engine/tests/Functional.crashme/spec
delete mode 100644 engine/tests/Functional.croco/Functional.croco.spec
create mode 100644 engine/tests/Functional.croco/spec
delete mode 100644 engine/tests/Functional.curl/Functional.curl.spec
create mode 100644 engine/tests/Functional.curl/spec
delete mode 100644 engine/tests/Functional.expat/Functional.expat.spec
create mode 100644 engine/tests/Functional.expat/spec
delete mode 100644 engine/tests/Functional.fixesproto/Functional.fixesproto.spec
create mode 100644 engine/tests/Functional.fixesproto/spec
delete mode 100644 engine/tests/Functional.fontconfig/Functional.fontconfig.spec
create mode 100644 engine/tests/Functional.fontconfig/spec
delete mode 100644 engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
create mode 100644 engine/tests/Functional.fsfuzz/spec
delete mode 100644 engine/tests/Functional.ft2demos/Functional.ft2demos.spec
create mode 100644 engine/tests/Functional.ft2demos/spec
delete mode 100644 engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
create mode 100644 engine/tests/Functional.fuego_abort/spec
delete mode 100644 engine/tests/Functional.fuego_board_check/Functional.fuego_board_check.spec
create mode 100644 engine/tests/Functional.fuego_board_check/spec
delete mode 100644 engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.spec
create mode 100644 engine/tests/Functional.fuego_test_phases/spec
delete mode 100644 engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
create mode 100644 engine/tests/Functional.fuego_transport/spec
delete mode 100644 engine/tests/Functional.fuse/Functional.fuse.spec
create mode 100644 engine/tests/Functional.fuse/spec
delete mode 100644 engine/tests/Functional.giflib/Functional.giflib.spec
create mode 100644 engine/tests/Functional.giflib/spec
delete mode 100644 engine/tests/Functional.glib/Functional.glib.spec
create mode 100644 engine/tests/Functional.glib/spec
delete mode 100644 engine/tests/Functional.glib2/Functional.glib2.spec
create mode 100644 engine/tests/Functional.glib2/spec
delete mode 100644 engine/tests/Functional.glibc/Functional.glibc.spec
create mode 100644 engine/tests/Functional.glibc/spec
delete mode 100644 engine/tests/Functional.hciattach/Functional.hciattach.spec
create mode 100644 engine/tests/Functional.hciattach/spec
delete mode 100644 engine/tests/Functional.hello_world/Functional.hello_world.spec
create mode 100644 engine/tests/Functional.hello_world/spec
delete mode 100644 engine/tests/Functional.imagemagick/Functional.imagemagick.spec
create mode 100644 engine/tests/Functional.imagemagick/spec
delete mode 100644 engine/tests/Functional.iptables/Functional.iptables.spec
create mode 100644 engine/tests/Functional.iptables/spec
delete mode 100644 engine/tests/Functional.iputils/Functional.iputils.spec
create mode 100644 engine/tests/Functional.iputils/spec
delete mode 100644 engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
create mode 100644 engine/tests/Functional.ipv6connect/spec
delete mode 100644 engine/tests/Functional.jpeg/Functional.jpeg.spec
create mode 100644 engine/tests/Functional.jpeg/spec
delete mode 100644 engine/tests/Functional.kernel_build/Functional.kernel_build.spec
create mode 100644 engine/tests/Functional.kernel_build/spec
delete mode 100644 engine/tests/Functional.kmod/Functional.kmod.spec
create mode 100644 engine/tests/Functional.kmod/spec
delete mode 100644 engine/tests/Functional.libogg/Functional.libogg.spec
create mode 100644 engine/tests/Functional.libogg/spec
delete mode 100644 engine/tests/Functional.libpcap/Functional.libpcap.spec
create mode 100644 engine/tests/Functional.libpcap/spec
delete mode 100644 engine/tests/Functional.librsvg/Functional.librsvg.spec
create mode 100644 engine/tests/Functional.librsvg/spec
delete mode 100644 engine/tests/Functional.libspeex/Functional.libspeex.spec
create mode 100644 engine/tests/Functional.libspeex/spec
delete mode 100644 engine/tests/Functional.libtar/Functional.libtar.spec
create mode 100644 engine/tests/Functional.libtar/spec
delete mode 100644 engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
create mode 100644 engine/tests/Functional.libwebsocket/spec
delete mode 100644 engine/tests/Functional.linus_stress/Functional.linus_stress.spec
create mode 100644 engine/tests/Functional.linus_stress/spec
delete mode 100644 engine/tests/Functional.lwip/Functional.lwip.spec
create mode 100644 engine/tests/Functional.lwip/spec
delete mode 100644 engine/tests/Functional.mesa-demos/Functional.mesa-demos.spec
create mode 100644 engine/tests/Functional.mesa-demos/spec
delete mode 100644 engine/tests/Functional.neon/Functional.neon.spec
create mode 100644 engine/tests/Functional.neon/spec
delete mode 100644 engine/tests/Functional.net-tools/Functional.net-tools.spec
create mode 100644 engine/tests/Functional.net-tools/spec
delete mode 100644 engine/tests/Functional.netperf/Functional.netperf.spec
create mode 100644 engine/tests/Functional.netperf/spec
delete mode 100644 engine/tests/Functional.pi_tests/Functional.pi_tests.spec
create mode 100644 engine/tests/Functional.pi_tests/spec
delete mode 100644 engine/tests/Functional.pixman/Functional.pixman.spec
create mode 100644 engine/tests/Functional.pixman/spec
delete mode 100644 engine/tests/Functional.pppd/Functional.pppd.spec
create mode 100644 engine/tests/Functional.pppd/spec
delete mode 100644 engine/tests/Functional.protobuf/Functional.protobuf.spec
create mode 100644 engine/tests/Functional.protobuf/spec
delete mode 100644 engine/tests/Functional.rmaptest/Functional.rmaptest.spec
create mode 100644 engine/tests/Functional.rmaptest/spec
delete mode 100644 engine/tests/Functional.scifab/Functional.scifab.spec
create mode 100644 engine/tests/Functional.scifab/spec
delete mode 100644 engine/tests/Functional.scrashme/Functional.scrashme.spec
create mode 100644 engine/tests/Functional.scrashme/spec
delete mode 100644 engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
create mode 100644 engine/tests/Functional.sdhi_0/spec
delete mode 100644 engine/tests/Functional.stress/Functional.stress.spec
create mode 100644 engine/tests/Functional.stress/spec
delete mode 100644 engine/tests/Functional.synctest/Functional.synctest.spec
create mode 100644 engine/tests/Functional.synctest/spec
delete mode 100644 engine/tests/Functional.thrift/Functional.thrift.spec
create mode 100644 engine/tests/Functional.thrift/spec
delete mode 100644 engine/tests/Functional.tiff/Functional.tiff.spec
create mode 100644 engine/tests/Functional.tiff/spec
delete mode 100644 engine/tests/Functional.vsomeip/Functional.vsomeip.spec
create mode 100644 engine/tests/Functional.vsomeip/spec
delete mode 100644 engine/tests/Functional.xorg-macros/Functional.xorg-macros.spec
create mode 100644 engine/tests/Functional.xorg-macros/spec
delete mode 100644 engine/tests/Functional.zlib/Functional.zlib.spec
create mode 100644 engine/tests/Functional.zlib/spec
diff --git a/engine/scripts/ovgen.py b/engine/scripts/ovgen.py
index f3f77e3..222f54f 100755
--- a/engine/scripts/ovgen.py
+++ b/engine/scripts/ovgen.py
@@ -435,7 +435,7 @@ def generateSpec(ts, fout):
def parseSpec(testdir, testspec):
# FIXTHIS: get fuego-core from env
- specpath = '/fuego-core/engine/tests/%s/%s.spec' % (testdir, testdir)
+ specpath = '/fuego-core/engine/tests/%s/spec' % (testdir)
ts = TestSpecs()
debug_print("Parsing %s spec file" % (specpath))
diff --git a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec b/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
deleted file mode 100644
index 794ca68..0000000
--- a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
+++ /dev/null
@@ -1,25 +0,0 @@
- {
- "testName": "Benchmark.Dhrystone",
- "fail_case": [
- {
- "fail_regexp": "Measured time too small to obtain meaningful results",
- "fail_message": "Measured time too small to obtain meaningful results. Please increase LOOPS parameter in Dhrystone test spec."
- }
- ],
- "specs":
- [
- {
- "name":"default",
- "LOOPS":"10000000"
- },
- {
- "name":"100M",
- "LOOPS":"100000000"
- },
- {
- "name":"500M",
- "LOOPS":"500000000"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.Dhrystone/spec b/engine/tests/Benchmark.Dhrystone/spec
new file mode 100644
index 0000000..794ca68
--- /dev/null
+++ b/engine/tests/Benchmark.Dhrystone/spec
@@ -0,0 +1,25 @@
+ {
+ "testName": "Benchmark.Dhrystone",
+ "fail_case": [
+ {
+ "fail_regexp": "Measured time too small to obtain meaningful results",
+ "fail_message": "Measured time too small to obtain meaningful results. Please increase LOOPS parameter in Dhrystone test spec."
+ }
+ ],
+ "specs":
+ [
+ {
+ "name":"default",
+ "LOOPS":"10000000"
+ },
+ {
+ "name":"100M",
+ "LOOPS":"100000000"
+ },
+ {
+ "name":"500M",
+ "LOOPS":"500000000"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec b/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
deleted file mode 100644
index d94129d..0000000
--- a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.GLMark",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.GLMark/spec b/engine/tests/Benchmark.GLMark/spec
new file mode 100644
index 0000000..d94129d
--- /dev/null
+++ b/engine/tests/Benchmark.GLMark/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.GLMark",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec b/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
deleted file mode 100644
index 13ba89b..0000000
--- a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-{
- "testName": "Benchmark.IOzone",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "FILE_SIZE":"2M",
- "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "FILE_SIZE":"2M",
- "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "FILE_SIZE":"2M",
- "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
- },
- {
- "name":"nopread",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "FILE_SIZE":"2M",
- "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "FILE_SIZE":"2M",
- "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.IOzone/spec b/engine/tests/Benchmark.IOzone/spec
new file mode 100644
index 0000000..13ba89b
--- /dev/null
+++ b/engine/tests/Benchmark.IOzone/spec
@@ -0,0 +1,45 @@
+{
+ "testName": "Benchmark.IOzone",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "FILE_SIZE":"2M",
+ "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "FILE_SIZE":"2M",
+ "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "FILE_SIZE":"2M",
+ "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+ },
+ {
+ "name":"nopread",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "FILE_SIZE":"2M",
+ "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "FILE_SIZE":"2M",
+ "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec b/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
deleted file mode 100644
index e3627bb..0000000
--- a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
+++ /dev/null
@@ -1,20 +0,0 @@
- {
- "testName": "Benchmark.Interbench",
- "specs":
- [
- {
- "name":"default"
- },
- {
- "name":"sata"
- },
- {
- "name":"usb"
- },
- {
- "name":"mmc"
- }
-
- ]
-}
-
diff --git a/engine/tests/Benchmark.Interbench/spec b/engine/tests/Benchmark.Interbench/spec
new file mode 100644
index 0000000..e3627bb
--- /dev/null
+++ b/engine/tests/Benchmark.Interbench/spec
@@ -0,0 +1,20 @@
+ {
+ "testName": "Benchmark.Interbench",
+ "specs":
+ [
+ {
+ "name":"default"
+ },
+ {
+ "name":"sata"
+ },
+ {
+ "name":"usb"
+ },
+ {
+ "name":"mmc"
+ }
+
+ ]
+}
+
diff --git a/engine/tests/Benchmark.Java/Benchmark.Java.spec b/engine/tests/Benchmark.Java/Benchmark.Java.spec
deleted file mode 100644
index fdad1c9..0000000
--- a/engine/tests/Benchmark.Java/Benchmark.Java.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.Java",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.Java/spec b/engine/tests/Benchmark.Java/spec
new file mode 100644
index 0000000..fdad1c9
--- /dev/null
+++ b/engine/tests/Benchmark.Java/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.Java",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec b/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
deleted file mode 100644
index 7c00496..0000000
--- a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.OpenSSL",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.OpenSSL/spec b/engine/tests/Benchmark.OpenSSL/spec
new file mode 100644
index 0000000..7c00496
--- /dev/null
+++ b/engine/tests/Benchmark.OpenSSL/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.OpenSSL",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec b/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
deleted file mode 100644
index 2b88075..0000000
--- a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.Stream",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.Stream/spec b/engine/tests/Benchmark.Stream/spec
new file mode 100644
index 0000000..2b88075
--- /dev/null
+++ b/engine/tests/Benchmark.Stream/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.Stream",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec b/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
deleted file mode 100644
index b755e31..0000000
--- a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
+++ /dev/null
@@ -1,11 +0,0 @@
- {
- "testName": "Benchmark.Whetstone",
- "specs":
- [
- {
- "name":"default",
- "LOOPS":"100000"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.Whetstone/spec b/engine/tests/Benchmark.Whetstone/spec
new file mode 100644
index 0000000..b755e31
--- /dev/null
+++ b/engine/tests/Benchmark.Whetstone/spec
@@ -0,0 +1,11 @@
+ {
+ "testName": "Benchmark.Whetstone",
+ "specs":
+ [
+ {
+ "name":"default",
+ "LOOPS":"100000"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec b/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
deleted file mode 100644
index 4ed9154..0000000
--- a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Benchmark.aim7",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Benchmark.aim7/spec b/engine/tests/Benchmark.aim7/spec
new file mode 100644
index 0000000..4ed9154
--- /dev/null
+++ b/engine/tests/Benchmark.aim7/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Benchmark.aim7",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec b/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
deleted file mode 100644
index a12b7e8..0000000
--- a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
+++ /dev/null
@@ -1,16 +0,0 @@
- {
- "testName": "Benchmark.blobsallad",
- "fail_case": [
- {
- "fail_regexp": "xrandr: command not found",
- "fail_message": "target system does not have xrandr"
- }
- ],
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.blobsallad/spec b/engine/tests/Benchmark.blobsallad/spec
new file mode 100644
index 0000000..a12b7e8
--- /dev/null
+++ b/engine/tests/Benchmark.blobsallad/spec
@@ -0,0 +1,16 @@
+ {
+ "testName": "Benchmark.blobsallad",
+ "fail_case": [
+ {
+ "fail_regexp": "xrandr: command not found",
+ "fail_message": "target system does not have xrandr"
+ }
+ ],
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec b/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
deleted file mode 100644
index 426f94b..0000000
--- a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "testName": "Benchmark.bonnie",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "SIZE":"32",
- "RAM":"0",
- "ROOT":"true"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "SIZE":"32",
- "RAM":"0",
- "ROOT":"true"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "SIZE":"32",
- "RAM":"0",
- "ROOT":"true"
- },
- {
- "name":"noroot",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "SIZE":"32",
- "RAM":"0",
- "ROOT":"false"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "SIZE":"32",
- "RAM":"0",
- "ROOT":"true"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.bonnie/spec b/engine/tests/Benchmark.bonnie/spec
new file mode 100644
index 0000000..426f94b
--- /dev/null
+++ b/engine/tests/Benchmark.bonnie/spec
@@ -0,0 +1,47 @@
+{
+ "testName": "Benchmark.bonnie",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "SIZE":"32",
+ "RAM":"0",
+ "ROOT":"true"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "SIZE":"32",
+ "RAM":"0",
+ "ROOT":"true"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "SIZE":"32",
+ "RAM":"0",
+ "ROOT":"true"
+ },
+ {
+ "name":"noroot",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "SIZE":"32",
+ "RAM":"0",
+ "ROOT":"false"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "SIZE":"32",
+ "RAM":"0",
+ "ROOT":"true"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec b/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
deleted file mode 100644
index 617c1ac..0000000
--- a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "testName": "Benchmark.cyclictest",
- "specs":
- [
- {
- "name":"default",
- "LOOPS":"10000"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.cyclictest/spec b/engine/tests/Benchmark.cyclictest/spec
new file mode 100644
index 0000000..617c1ac
--- /dev/null
+++ b/engine/tests/Benchmark.cyclictest/spec
@@ -0,0 +1,11 @@
+{
+ "testName": "Benchmark.cyclictest",
+ "specs":
+ [
+ {
+ "name":"default",
+ "LOOPS":"10000"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec b/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
deleted file mode 100644
index f7700ab..0000000
--- a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "testName": "Benchmark.dbench",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "TIMELIMIT":"10",
- "NPROCS":"2"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "TIMELIMIT":"10",
- "NPROCS":"2"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "TIMELIMIT":"10",
- "NPROCS":"2"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"/a",
- "TIMELIMIT":"10",
- "NPROCS":"2"
- },
- {
- "name":"testdir",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "TIMELIMIT":"10",
- "NPROCS":"2"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.dbench/spec b/engine/tests/Benchmark.dbench/spec
new file mode 100644
index 0000000..f7700ab
--- /dev/null
+++ b/engine/tests/Benchmark.dbench/spec
@@ -0,0 +1,42 @@
+{
+ "testName": "Benchmark.dbench",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "TIMELIMIT":"10",
+ "NPROCS":"2"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "TIMELIMIT":"10",
+ "NPROCS":"2"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "TIMELIMIT":"10",
+ "NPROCS":"2"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"/a",
+ "TIMELIMIT":"10",
+ "NPROCS":"2"
+ },
+ {
+ "name":"testdir",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "TIMELIMIT":"10",
+ "NPROCS":"2"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec b/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
deleted file mode 100644
index 062fc1f..0000000
--- a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "testName": "Benchmark.ebizzy",
- "specs":
- [
- {
- "name":"default",
- "CHUNKS":"1000",
- "CHUNK_SIZE":"51200",
- "TIME":"100",
- "THREADS":"100"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.ebizzy/spec b/engine/tests/Benchmark.ebizzy/spec
new file mode 100644
index 0000000..062fc1f
--- /dev/null
+++ b/engine/tests/Benchmark.ebizzy/spec
@@ -0,0 +1,14 @@
+{
+ "testName": "Benchmark.ebizzy",
+ "specs":
+ [
+ {
+ "name":"default",
+ "CHUNKS":"1000",
+ "CHUNK_SIZE":"51200",
+ "TIME":"100",
+ "THREADS":"100"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec b/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
deleted file mode 100644
index acff523..0000000
--- a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "testName": "Benchmark.ffsb",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.ffsb/spec b/engine/tests/Benchmark.ffsb/spec
new file mode 100644
index 0000000..acff523
--- /dev/null
+++ b/engine/tests/Benchmark.ffsb/spec
@@ -0,0 +1,30 @@
+{
+ "testName": "Benchmark.ffsb",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.fio/Benchmark.fio.spec b/engine/tests/Benchmark.fio/Benchmark.fio.spec
deleted file mode 100644
index 947015d..0000000
--- a/engine/tests/Benchmark.fio/Benchmark.fio.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "testName": "Benchmark.fio",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "TIMEOUT":"10"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "TIMEOUT":"10"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "TIMEOUT":"10"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "TIMEOUT":"10"
- }
-
- ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.fio/spec b/engine/tests/Benchmark.fio/spec
new file mode 100644
index 0000000..947015d
--- /dev/null
+++ b/engine/tests/Benchmark.fio/spec
@@ -0,0 +1,35 @@
+{
+ "testName": "Benchmark.fio",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "TIMEOUT":"10"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "TIMEOUT":"10"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "TIMEOUT":"10"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "TIMEOUT":"10"
+ }
+
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec b/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
deleted file mode 100644
index 7a6623b..0000000
--- a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Benchmark.fs_mark",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Benchmark.fs_mark/spec b/engine/tests/Benchmark.fs_mark/spec
new file mode 100644
index 0000000..7a6623b
--- /dev/null
+++ b/engine/tests/Benchmark.fs_mark/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Benchmark.fs_mark",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec b/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec
deleted file mode 100644
index 5ae2190..0000000
--- a/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "testName": "Benchmark.fuego_check_plots",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.fuego_check_plots/spec b/engine/tests/Benchmark.fuego_check_plots/spec
new file mode 100644
index 0000000..5ae2190
--- /dev/null
+++ b/engine/tests/Benchmark.fuego_check_plots/spec
@@ -0,0 +1,13 @@
+{
+ "testName": "Benchmark.fuego_check_plots",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec b/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
deleted file mode 100644
index 9ec9d5f..0000000
--- a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
+++ /dev/null
@@ -1,16 +0,0 @@
- {
- "testName": "Benchmark.gtkperf",
- "fail_case": [
- {
- "fail_regexp": "xrandr: command not found",
- "fail_message": "target system does not have xrandr"
- }
- ],
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.gtkperf/spec b/engine/tests/Benchmark.gtkperf/spec
new file mode 100644
index 0000000..9ec9d5f
--- /dev/null
+++ b/engine/tests/Benchmark.gtkperf/spec
@@ -0,0 +1,16 @@
+ {
+ "testName": "Benchmark.gtkperf",
+ "fail_case": [
+ {
+ "fail_regexp": "xrandr: command not found",
+ "fail_message": "target system does not have xrandr"
+ }
+ ],
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec b/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
deleted file mode 100644
index f915796..0000000
--- a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "testName": "Benchmark.hackbench",
- "specs":
- [
- {
- "name":"default",
- "GPOUPS":"20"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.hackbench/spec b/engine/tests/Benchmark.hackbench/spec
new file mode 100644
index 0000000..f915796
--- /dev/null
+++ b/engine/tests/Benchmark.hackbench/spec
@@ -0,0 +1,11 @@
+{
+ "testName": "Benchmark.hackbench",
+ "specs":
+ [
+ {
+ "name":"default",
+ "GPOUPS":"20"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec b/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
deleted file mode 100644
index 4cb58d6..0000000
--- a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.himeno",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.himeno/spec b/engine/tests/Benchmark.himeno/spec
new file mode 100644
index 0000000..4cb58d6
--- /dev/null
+++ b/engine/tests/Benchmark.himeno/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.himeno",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec b/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
deleted file mode 100644
index e4429f4..0000000
--- a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "testName": "Benchmark.iperf",
- "specs":
- [
- {
- "name":"default",
- "SRV":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.iperf/spec b/engine/tests/Benchmark.iperf/spec
new file mode 100644
index 0000000..e4429f4
--- /dev/null
+++ b/engine/tests/Benchmark.iperf/spec
@@ -0,0 +1,11 @@
+{
+ "testName": "Benchmark.iperf",
+ "specs":
+ [
+ {
+ "name":"default",
+ "SRV":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec b/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
deleted file mode 100644
index 9e1ca86..0000000
--- a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.linpack",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.linpack/spec b/engine/tests/Benchmark.linpack/spec
new file mode 100644
index 0000000..9e1ca86
--- /dev/null
+++ b/engine/tests/Benchmark.linpack/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.linpack",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec b/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
deleted file mode 100644
index f1055c4..0000000
--- a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.lmbench2",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.lmbench2/spec b/engine/tests/Benchmark.lmbench2/spec
new file mode 100644
index 0000000..f1055c4
--- /dev/null
+++ b/engine/tests/Benchmark.lmbench2/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.lmbench2",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec b/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
deleted file mode 100644
index 319b42d..0000000
--- a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Benchmark.nbench-byte",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Benchmark.nbench-byte/spec b/engine/tests/Benchmark.nbench-byte/spec
new file mode 100644
index 0000000..319b42d
--- /dev/null
+++ b/engine/tests/Benchmark.nbench-byte/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Benchmark.nbench-byte",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec b/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
deleted file mode 100644
index 2dab856..0000000
--- a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.nbench_byte",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.nbench_byte/spec b/engine/tests/Benchmark.nbench_byte/spec
new file mode 100644
index 0000000..2dab856
--- /dev/null
+++ b/engine/tests/Benchmark.nbench_byte/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.nbench_byte",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec b/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
deleted file mode 100644
index eac8fcd..0000000
--- a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "testName": "Benchmark.netperf",
- "specs":
- [
- {
- "name":"default",
- "SRV":"default"
- },
- {
- "name":"docker",
- "SRV":"docker"
- }
- ]
-}
diff --git a/engine/tests/Benchmark.netperf/spec b/engine/tests/Benchmark.netperf/spec
new file mode 100644
index 0000000..eac8fcd
--- /dev/null
+++ b/engine/tests/Benchmark.netperf/spec
@@ -0,0 +1,14 @@
+{
+ "testName": "Benchmark.netperf",
+ "specs":
+ [
+ {
+ "name":"default",
+ "SRV":"default"
+ },
+ {
+ "name":"docker",
+ "SRV":"docker"
+ }
+ ]
+}
diff --git a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec b/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
deleted file mode 100644
index 0ed6717..0000000
--- a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "testName": "Benchmark.netpipe",
- "specs":
- [
- {
- "name":"default",
- "SRV":"default",
- "PERT":"2"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.netpipe/spec b/engine/tests/Benchmark.netpipe/spec
new file mode 100644
index 0000000..0ed6717
--- /dev/null
+++ b/engine/tests/Benchmark.netpipe/spec
@@ -0,0 +1,12 @@
+{
+ "testName": "Benchmark.netpipe",
+ "specs":
+ [
+ {
+ "name":"default",
+ "SRV":"default",
+ "PERT":"2"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec b/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
deleted file mode 100644
index c67f4a5..0000000
--- a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
+++ /dev/null
@@ -1,10 +0,0 @@
- {
- "testName": "Benchmark.reboot",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.reboot/spec b/engine/tests/Benchmark.reboot/spec
new file mode 100644
index 0000000..c67f4a5
--- /dev/null
+++ b/engine/tests/Benchmark.reboot/spec
@@ -0,0 +1,10 @@
+ {
+ "testName": "Benchmark.reboot",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec b/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
deleted file mode 100644
index 0b2f09d..0000000
--- a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
+++ /dev/null
@@ -1,11 +0,0 @@
- {
- "testName": "Benchmark.signaltest",
- "specs":
- [
- {
- "name":"default",
- "LOOPS":"10000"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.signaltest/spec b/engine/tests/Benchmark.signaltest/spec
new file mode 100644
index 0000000..0b2f09d
--- /dev/null
+++ b/engine/tests/Benchmark.signaltest/spec
@@ -0,0 +1,11 @@
+ {
+ "testName": "Benchmark.signaltest",
+ "specs":
+ [
+ {
+ "name":"default",
+ "LOOPS":"10000"
+ }
+ ]
+}
+
diff --git a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec b/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
deleted file mode 100644
index ffe4534..0000000
--- a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Benchmark.sysbench",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Benchmark.sysbench/spec b/engine/tests/Benchmark.sysbench/spec
new file mode 100644
index 0000000..ffe4534
--- /dev/null
+++ b/engine/tests/Benchmark.sysbench/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Benchmark.sysbench",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec b/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
deleted file mode 100644
index e38a7d7..0000000
--- a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "testName": "Benchmark.tiobench",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "THREADS":"4",
- "SIZE":"10"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "THREADS":"4",
- "SIZE":"10"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "THREADS":"4",
- "SIZE":"10"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "THREADS":"4",
- "SIZE":"10"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.tiobench/spec b/engine/tests/Benchmark.tiobench/spec
new file mode 100644
index 0000000..e38a7d7
--- /dev/null
+++ b/engine/tests/Benchmark.tiobench/spec
@@ -0,0 +1,38 @@
+{
+ "testName": "Benchmark.tiobench",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "THREADS":"4",
+ "SIZE":"10"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "THREADS":"4",
+ "SIZE":"10"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "THREADS":"4",
+ "SIZE":"10"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "THREADS":"4",
+ "SIZE":"10"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec b/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
deleted file mode 100644
index 602bc2d..0000000
--- a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "testName": "Benchmark.x11perf",
- "specs":
- [
- {
- "name":"default",
- "TIME":"1"
- }
- ]
-}
-
diff --git a/engine/tests/Benchmark.x11perf/spec b/engine/tests/Benchmark.x11perf/spec
new file mode 100644
index 0000000..602bc2d
--- /dev/null
+++ b/engine/tests/Benchmark.x11perf/spec
@@ -0,0 +1,11 @@
+{
+ "testName": "Benchmark.x11perf",
+ "specs":
+ [
+ {
+ "name":"default",
+ "TIME":"1"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.LTP/Functional.LTP.spec b/engine/tests/Functional.LTP/Functional.LTP.spec
deleted file mode 100644
index 1c1a090..0000000
--- a/engine/tests/Functional.LTP/Functional.LTP.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "testName": "Functional.LTP",
- "specs":
- [
- {
- "name": "default",
- "tests": "syscalls SEM"
- },
- {
- "name": "selection",
- "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS"
- },
- {
- "name": "selectionwithrt",
- "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
- },
- {
- "name": "ltplite",
- "tests": "ltplite"
- },
- {
- "name": "ptsonly",
- "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
- },
- {
- "name": "smoketest",
- "tests": "fs_bind"
- },
- {
- "name": "rtonly",
- "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
- }
- ]
-}
diff --git a/engine/tests/Functional.LTP/spec b/engine/tests/Functional.LTP/spec
new file mode 100644
index 0000000..1c1a090
--- /dev/null
+++ b/engine/tests/Functional.LTP/spec
@@ -0,0 +1,34 @@
+{
+ "testName": "Functional.LTP",
+ "specs":
+ [
+ {
+ "name": "default",
+ "tests": "syscalls SEM"
+ },
+ {
+ "name": "selection",
+ "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS"
+ },
+ {
+ "name": "selectionwithrt",
+ "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
+ },
+ {
+ "name": "ltplite",
+ "tests": "ltplite"
+ },
+ {
+ "name": "ptsonly",
+ "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
+ },
+ {
+ "name": "smoketest",
+ "tests": "fs_bind"
+ },
+ {
+ "name": "rtonly",
+ "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec b/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
deleted file mode 100644
index d3e4df0..0000000
--- a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.OpenSSL",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.OpenSSL/spec b/engine/tests/Functional.OpenSSL/spec
new file mode 100644
index 0000000..d3e4df0
--- /dev/null
+++ b/engine/tests/Functional.OpenSSL/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.OpenSSL",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.aiostress/Functional.aiostress.spec b/engine/tests/Functional.aiostress/Functional.aiostress.spec
deleted file mode 100644
index d41f4a0..0000000
--- a/engine/tests/Functional.aiostress/Functional.aiostress.spec
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "testName": "Functional.aiostress",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "SIZE":"20M"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "SIZE":"20M"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "SIZE":"20M"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "SIZE":"20M"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.aiostress/spec b/engine/tests/Functional.aiostress/spec
new file mode 100644
index 0000000..d41f4a0
--- /dev/null
+++ b/engine/tests/Functional.aiostress/spec
@@ -0,0 +1,31 @@
+{
+ "testName": "Functional.aiostress",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "SIZE":"20M"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "SIZE":"20M"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "SIZE":"20M"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "SIZE":"20M"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec b/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
deleted file mode 100644
index 3d28603..0000000
--- a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.arch_timer",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.arch_timer/spec b/engine/tests/Functional.arch_timer/spec
new file mode 100644
index 0000000..3d28603
--- /dev/null
+++ b/engine/tests/Functional.arch_timer/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.arch_timer",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.bc/Functional.bc.spec b/engine/tests/Functional.bc/Functional.bc.spec
deleted file mode 100644
index 9b22ea6..0000000
--- a/engine/tests/Functional.bc/Functional.bc.spec
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "testName": "Functional.bc",
- "fail_case": [
- {
- "fail_regexp": "some test regexp",
- "fail_message": "some test message"
- },
- {
- "fail_regexp": "Bug",
- "fail_message": "Bug or Oops detected in system log",
- "use_syslog": "1"
- }
- ],
- "specs":
- [
- {
- "name":"bc-mult",
- "EXPR":"2*2",
- "RESULT": "4"
- },
- {
- "name":"bc-add",
- "EXPR":"3+3",
- "RESULT":"6"
- },
- {
- "name":"default",
- "EXPR":"3+3",
- "RESULT":"6"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.bc/spec b/engine/tests/Functional.bc/spec
new file mode 100644
index 0000000..9b22ea6
--- /dev/null
+++ b/engine/tests/Functional.bc/spec
@@ -0,0 +1,33 @@
+{
+ "testName": "Functional.bc",
+ "fail_case": [
+ {
+ "fail_regexp": "some test regexp",
+ "fail_message": "some test message"
+ },
+ {
+ "fail_regexp": "Bug",
+ "fail_message": "Bug or Oops detected in system log",
+ "use_syslog": "1"
+ }
+ ],
+ "specs":
+ [
+ {
+ "name":"bc-mult",
+ "EXPR":"2*2",
+ "RESULT": "4"
+ },
+ {
+ "name":"bc-add",
+ "EXPR":"3+3",
+ "RESULT":"6"
+ },
+ {
+ "name":"default",
+ "EXPR":"3+3",
+ "RESULT":"6"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.boost/Functional.boost.spec b/engine/tests/Functional.boost/Functional.boost.spec
deleted file mode 100644
index b25b352..0000000
--- a/engine/tests/Functional.boost/Functional.boost.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "testName": "Functional.boost",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.boost/spec b/engine/tests/Functional.boost/spec
new file mode 100644
index 0000000..b25b352
--- /dev/null
+++ b/engine/tests/Functional.boost/spec
@@ -0,0 +1,10 @@
+{
+ "testName": "Functional.boost",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec b/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
deleted file mode 100644
index 538beee..0000000
--- a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.bsdiff",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.bsdiff/spec b/engine/tests/Functional.bsdiff/spec
new file mode 100644
index 0000000..538beee
--- /dev/null
+++ b/engine/tests/Functional.bsdiff/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.bsdiff",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.bzip2/Functional.bzip2.spec b/engine/tests/Functional.bzip2/Functional.bzip2.spec
deleted file mode 100644
index 9350805..0000000
--- a/engine/tests/Functional.bzip2/Functional.bzip2.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.bzip2",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.bzip2/spec b/engine/tests/Functional.bzip2/spec
new file mode 100644
index 0000000..9350805
--- /dev/null
+++ b/engine/tests/Functional.bzip2/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.bzip2",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.cmt/Functional.cmt.spec b/engine/tests/Functional.cmt/Functional.cmt.spec
deleted file mode 100644
index d88d487..0000000
--- a/engine/tests/Functional.cmt/Functional.cmt.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.cmt",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.cmt/spec b/engine/tests/Functional.cmt/spec
new file mode 100644
index 0000000..d88d487
--- /dev/null
+++ b/engine/tests/Functional.cmt/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.cmt",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec b/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
deleted file mode 100644
index 401ce13..0000000
--- a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.commonAPI_C++",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.commonAPI_C++/spec b/engine/tests/Functional.commonAPI_C++/spec
new file mode 100644
index 0000000..401ce13
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_C++/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.commonAPI_C++",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec b/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
deleted file mode 100644
index 699e591..0000000
--- a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.commonAPI_Dbus",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.commonAPI_Dbus/spec b/engine/tests/Functional.commonAPI_Dbus/spec
new file mode 100644
index 0000000..699e591
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_Dbus/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.commonAPI_Dbus",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec b/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec
deleted file mode 100644
index 4ca9398..0000000
--- a/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.commonAPI_SomeIp",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.commonAPI_SomeIp/spec b/engine/tests/Functional.commonAPI_SomeIp/spec
new file mode 100644
index 0000000..4ca9398
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_SomeIp/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.commonAPI_SomeIp",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.crashme/Functional.crashme.spec b/engine/tests/Functional.crashme/Functional.crashme.spec
deleted file mode 100644
index 1793be3..0000000
--- a/engine/tests/Functional.crashme/Functional.crashme.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "testName": "Functional.crashme",
- "specs":
- [
- {
- "name":"default",
- "NBYTES":"1000",
- "INC":"1000",
- "SRAND":"2",
- "NTRYS":"100",
- "NSUB":"3000"
- }
- ]
-}
diff --git a/engine/tests/Functional.crashme/spec b/engine/tests/Functional.crashme/spec
new file mode 100644
index 0000000..1793be3
--- /dev/null
+++ b/engine/tests/Functional.crashme/spec
@@ -0,0 +1,14 @@
+{
+ "testName": "Functional.crashme",
+ "specs":
+ [
+ {
+ "name":"default",
+ "NBYTES":"1000",
+ "INC":"1000",
+ "SRAND":"2",
+ "NTRYS":"100",
+ "NSUB":"3000"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.croco/Functional.croco.spec b/engine/tests/Functional.croco/Functional.croco.spec
deleted file mode 100644
index bd36f60..0000000
--- a/engine/tests/Functional.croco/Functional.croco.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.croco",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.croco/spec b/engine/tests/Functional.croco/spec
new file mode 100644
index 0000000..bd36f60
--- /dev/null
+++ b/engine/tests/Functional.croco/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.croco",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.curl/Functional.curl.spec b/engine/tests/Functional.curl/Functional.curl.spec
deleted file mode 100644
index ee8160a..0000000
--- a/engine/tests/Functional.curl/Functional.curl.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "testName": "Functional.curl",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.curl/spec b/engine/tests/Functional.curl/spec
new file mode 100644
index 0000000..ee8160a
--- /dev/null
+++ b/engine/tests/Functional.curl/spec
@@ -0,0 +1,10 @@
+{
+ "testName": "Functional.curl",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.expat/Functional.expat.spec b/engine/tests/Functional.expat/Functional.expat.spec
deleted file mode 100644
index 2edd1b6..0000000
--- a/engine/tests/Functional.expat/Functional.expat.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.expat",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.expat/spec b/engine/tests/Functional.expat/spec
new file mode 100644
index 0000000..2edd1b6
--- /dev/null
+++ b/engine/tests/Functional.expat/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.expat",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec b/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
deleted file mode 100644
index 2f9ea91..0000000
--- a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.fixesproto",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.fixesproto/spec b/engine/tests/Functional.fixesproto/spec
new file mode 100644
index 0000000..2f9ea91
--- /dev/null
+++ b/engine/tests/Functional.fixesproto/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.fixesproto",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec b/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
deleted file mode 100644
index 1237d46..0000000
--- a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.fontconfig",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.fontconfig/spec b/engine/tests/Functional.fontconfig/spec
new file mode 100644
index 0000000..1237d46
--- /dev/null
+++ b/engine/tests/Functional.fontconfig/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.fontconfig",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec b/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
deleted file mode 100644
index 1fb7446..0000000
--- a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.fsfuzz",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.fsfuzz/spec b/engine/tests/Functional.fsfuzz/spec
new file mode 100644
index 0000000..1fb7446
--- /dev/null
+++ b/engine/tests/Functional.fsfuzz/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.fsfuzz",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec b/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
deleted file mode 100644
index edce877..0000000
--- a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.ft2demos",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.ft2demos/spec b/engine/tests/Functional.ft2demos/spec
new file mode 100644
index 0000000..edce877
--- /dev/null
+++ b/engine/tests/Functional.ft2demos/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.ft2demos",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec b/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
deleted file mode 100644
index 47c6eda..0000000
--- a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "testName": "Functional.fuego_test_phases",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.fuego_abort/spec b/engine/tests/Functional.fuego_abort/spec
new file mode 100644
index 0000000..47c6eda
--- /dev/null
+++ b/engine/tests/Functional.fuego_abort/spec
@@ -0,0 +1,10 @@
+{
+ "testName": "Functional.fuego_test_phases",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.fuego_board_check/Functional.fuego_board_check.spec b/engine/tests/Functional.fuego_board_check/Functional.fuego_board_check.spec
deleted file mode 100644
index 05ff8e6..0000000
--- a/engine/tests/Functional.fuego_board_check/Functional.fuego_board_check.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "testName": "Functional.fuego_board_check",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Functional.fuego_board_check/spec b/engine/tests/Functional.fuego_board_check/spec
new file mode 100644
index 0000000..05ff8e6
--- /dev/null
+++ b/engine/tests/Functional.fuego_board_check/spec
@@ -0,0 +1,13 @@
+{
+ "testName": "Functional.fuego_board_check",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.spec b/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.spec
deleted file mode 100644
index 47c6eda..0000000
--- a/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "testName": "Functional.fuego_test_phases",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
-
diff --git a/engine/tests/Functional.fuego_test_phases/spec b/engine/tests/Functional.fuego_test_phases/spec
new file mode 100644
index 0000000..47c6eda
--- /dev/null
+++ b/engine/tests/Functional.fuego_test_phases/spec
@@ -0,0 +1,10 @@
+{
+ "testName": "Functional.fuego_test_phases",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec b/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
deleted file mode 100644
index a4fae24..0000000
--- a/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.fuego_transport",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.fuego_transport/spec b/engine/tests/Functional.fuego_transport/spec
new file mode 100644
index 0000000..a4fae24
--- /dev/null
+++ b/engine/tests/Functional.fuego_transport/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.fuego_transport",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.fuse/Functional.fuse.spec b/engine/tests/Functional.fuse/Functional.fuse.spec
deleted file mode 100644
index 11a0ffc..0000000
--- a/engine/tests/Functional.fuse/Functional.fuse.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.fuse",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.fuse/spec b/engine/tests/Functional.fuse/spec
new file mode 100644
index 0000000..11a0ffc
--- /dev/null
+++ b/engine/tests/Functional.fuse/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.fuse",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.giflib/Functional.giflib.spec b/engine/tests/Functional.giflib/Functional.giflib.spec
deleted file mode 100644
index 8143cf4..0000000
--- a/engine/tests/Functional.giflib/Functional.giflib.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.giflib",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.giflib/spec b/engine/tests/Functional.giflib/spec
new file mode 100644
index 0000000..8143cf4
--- /dev/null
+++ b/engine/tests/Functional.giflib/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.giflib",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.glib/Functional.glib.spec b/engine/tests/Functional.glib/Functional.glib.spec
deleted file mode 100644
index 1266660..0000000
--- a/engine/tests/Functional.glib/Functional.glib.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.glib",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.glib/spec b/engine/tests/Functional.glib/spec
new file mode 100644
index 0000000..1266660
--- /dev/null
+++ b/engine/tests/Functional.glib/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.glib",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.glib2/Functional.glib2.spec b/engine/tests/Functional.glib2/Functional.glib2.spec
deleted file mode 100644
index 15bd79f..0000000
--- a/engine/tests/Functional.glib2/Functional.glib2.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.glib2",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.glib2/spec b/engine/tests/Functional.glib2/spec
new file mode 100644
index 0000000..15bd79f
--- /dev/null
+++ b/engine/tests/Functional.glib2/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.glib2",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.glibc/Functional.glibc.spec b/engine/tests/Functional.glibc/Functional.glibc.spec
deleted file mode 100644
index f687253..0000000
--- a/engine/tests/Functional.glibc/Functional.glibc.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.glibc",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.glibc/spec b/engine/tests/Functional.glibc/spec
new file mode 100644
index 0000000..f687253
--- /dev/null
+++ b/engine/tests/Functional.glibc/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.glibc",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.hciattach/Functional.hciattach.spec b/engine/tests/Functional.hciattach/Functional.hciattach.spec
deleted file mode 100644
index 536da9b..0000000
--- a/engine/tests/Functional.hciattach/Functional.hciattach.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.hciattach",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.hciattach/spec b/engine/tests/Functional.hciattach/spec
new file mode 100644
index 0000000..536da9b
--- /dev/null
+++ b/engine/tests/Functional.hciattach/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.hciattach",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.hello_world/Functional.hello_world.spec b/engine/tests/Functional.hello_world/Functional.hello_world.spec
deleted file mode 100644
index 4e1bea5..0000000
--- a/engine/tests/Functional.hello_world/Functional.hello_world.spec
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "testName": "Functional.hello_world",
- "specs":
- [
- {
- "name":"hello-fail",
- "ARG":"-f"
- },
- {
- "name":"hello-random",
- "ARG":"-r"
- },
- {
- "name":"default",
- "ARG":""
- }
- ]
-}
-
diff --git a/engine/tests/Functional.hello_world/spec b/engine/tests/Functional.hello_world/spec
new file mode 100644
index 0000000..4e1bea5
--- /dev/null
+++ b/engine/tests/Functional.hello_world/spec
@@ -0,0 +1,19 @@
+{
+ "testName": "Functional.hello_world",
+ "specs":
+ [
+ {
+ "name":"hello-fail",
+ "ARG":"-f"
+ },
+ {
+ "name":"hello-random",
+ "ARG":"-r"
+ },
+ {
+ "name":"default",
+ "ARG":""
+ }
+ ]
+}
+
diff --git a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec b/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
deleted file mode 100644
index 0c9babc..0000000
--- a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.imagemagick",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.imagemagick/spec b/engine/tests/Functional.imagemagick/spec
new file mode 100644
index 0000000..0c9babc
--- /dev/null
+++ b/engine/tests/Functional.imagemagick/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.imagemagick",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.iptables/Functional.iptables.spec b/engine/tests/Functional.iptables/Functional.iptables.spec
deleted file mode 100644
index 101d26b..0000000
--- a/engine/tests/Functional.iptables/Functional.iptables.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.iptables",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.iptables/spec b/engine/tests/Functional.iptables/spec
new file mode 100644
index 0000000..101d26b
--- /dev/null
+++ b/engine/tests/Functional.iptables/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.iptables",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.iputils/Functional.iputils.spec b/engine/tests/Functional.iputils/Functional.iputils.spec
deleted file mode 100644
index 2dc83c7..0000000
--- a/engine/tests/Functional.iputils/Functional.iputils.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.iputils",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.iputils/spec b/engine/tests/Functional.iputils/spec
new file mode 100644
index 0000000..2dc83c7
--- /dev/null
+++ b/engine/tests/Functional.iputils/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.iputils",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec b/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
deleted file mode 100644
index 0c425b7..0000000
--- a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.ipv6connect",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.ipv6connect/spec b/engine/tests/Functional.ipv6connect/spec
new file mode 100644
index 0000000..0c425b7
--- /dev/null
+++ b/engine/tests/Functional.ipv6connect/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.ipv6connect",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.jpeg/Functional.jpeg.spec b/engine/tests/Functional.jpeg/Functional.jpeg.spec
deleted file mode 100644
index a32bc0e..0000000
--- a/engine/tests/Functional.jpeg/Functional.jpeg.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.jpeg",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.jpeg/spec b/engine/tests/Functional.jpeg/spec
new file mode 100644
index 0000000..a32bc0e
--- /dev/null
+++ b/engine/tests/Functional.jpeg/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.jpeg",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec b/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
deleted file mode 100644
index 39914a8..0000000
--- a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "testName": "Functional.kernel_build",
- "specs":
- [
- {
- "name": "cip-x86",
- "repo": "https://github.com/cip-project/linux-cip.git"
- },
- {
- "name": "cip-arm64",
- "repo": "https://github.com/cip-project/linux-cip.git",
- "platform": "aarch64",
- "arch": "arm64",
- "params": "-j8 Image dtbs modules",
- "regex_p": "^ OBJCOPY arch/arm64/boot/Image"
- }
- ]
-}
diff --git a/engine/tests/Functional.kernel_build/spec b/engine/tests/Functional.kernel_build/spec
new file mode 100644
index 0000000..39914a8
--- /dev/null
+++ b/engine/tests/Functional.kernel_build/spec
@@ -0,0 +1,18 @@
+{
+ "testName": "Functional.kernel_build",
+ "specs":
+ [
+ {
+ "name": "cip-x86",
+ "repo": "https://github.com/cip-project/linux-cip.git"
+ },
+ {
+ "name": "cip-arm64",
+ "repo": "https://github.com/cip-project/linux-cip.git",
+ "platform": "aarch64",
+ "arch": "arm64",
+ "params": "-j8 Image dtbs modules",
+ "regex_p": "^ OBJCOPY arch/arm64/boot/Image"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.kmod/Functional.kmod.spec b/engine/tests/Functional.kmod/Functional.kmod.spec
deleted file mode 100644
index 33df4b1..0000000
--- a/engine/tests/Functional.kmod/Functional.kmod.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.kmod",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.kmod/spec b/engine/tests/Functional.kmod/spec
new file mode 100644
index 0000000..33df4b1
--- /dev/null
+++ b/engine/tests/Functional.kmod/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.kmod",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.libogg/Functional.libogg.spec b/engine/tests/Functional.libogg/Functional.libogg.spec
deleted file mode 100644
index 8b5b2b8..0000000
--- a/engine/tests/Functional.libogg/Functional.libogg.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.libogg",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.libogg/spec b/engine/tests/Functional.libogg/spec
new file mode 100644
index 0000000..8b5b2b8
--- /dev/null
+++ b/engine/tests/Functional.libogg/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.libogg",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.libpcap/Functional.libpcap.spec b/engine/tests/Functional.libpcap/Functional.libpcap.spec
deleted file mode 100644
index 3130092..0000000
--- a/engine/tests/Functional.libpcap/Functional.libpcap.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.libpcap",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.libpcap/spec b/engine/tests/Functional.libpcap/spec
new file mode 100644
index 0000000..3130092
--- /dev/null
+++ b/engine/tests/Functional.libpcap/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.libpcap",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.librsvg/Functional.librsvg.spec b/engine/tests/Functional.librsvg/Functional.librsvg.spec
deleted file mode 100644
index 0a15abe..0000000
--- a/engine/tests/Functional.librsvg/Functional.librsvg.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.librsvg",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.librsvg/spec b/engine/tests/Functional.librsvg/spec
new file mode 100644
index 0000000..0a15abe
--- /dev/null
+++ b/engine/tests/Functional.librsvg/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.librsvg",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.libspeex/Functional.libspeex.spec b/engine/tests/Functional.libspeex/Functional.libspeex.spec
deleted file mode 100644
index a8b066c..0000000
--- a/engine/tests/Functional.libspeex/Functional.libspeex.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.libspeex",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.libspeex/spec b/engine/tests/Functional.libspeex/spec
new file mode 100644
index 0000000..a8b066c
--- /dev/null
+++ b/engine/tests/Functional.libspeex/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.libspeex",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.libtar/Functional.libtar.spec b/engine/tests/Functional.libtar/Functional.libtar.spec
deleted file mode 100644
index 1af026b..0000000
--- a/engine/tests/Functional.libtar/Functional.libtar.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.libtar",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.libtar/spec b/engine/tests/Functional.libtar/spec
new file mode 100644
index 0000000..1af026b
--- /dev/null
+++ b/engine/tests/Functional.libtar/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.libtar",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec b/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
deleted file mode 100644
index f1e6178..0000000
--- a/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.libwebsocket",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.libwebsocket/spec b/engine/tests/Functional.libwebsocket/spec
new file mode 100644
index 0000000..f1e6178
--- /dev/null
+++ b/engine/tests/Functional.libwebsocket/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.libwebsocket",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.linus_stress/Functional.linus_stress.spec b/engine/tests/Functional.linus_stress/Functional.linus_stress.spec
deleted file mode 100644
index 8894892..0000000
--- a/engine/tests/Functional.linus_stress/Functional.linus_stress.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "testName": "Functional.linus_stress",
- "specs":
- [
- {
- "name":"default",
- "DIRTY_BG":"2",
- "DIRTY":"4"
- }
- ]
-}
diff --git a/engine/tests/Functional.linus_stress/spec b/engine/tests/Functional.linus_stress/spec
new file mode 100644
index 0000000..8894892
--- /dev/null
+++ b/engine/tests/Functional.linus_stress/spec
@@ -0,0 +1,11 @@
+{
+ "testName": "Functional.linus_stress",
+ "specs":
+ [
+ {
+ "name":"default",
+ "DIRTY_BG":"2",
+ "DIRTY":"4"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.lwip/Functional.lwip.spec b/engine/tests/Functional.lwip/Functional.lwip.spec
deleted file mode 100644
index bb9f9b3..0000000
--- a/engine/tests/Functional.lwip/Functional.lwip.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.lwip",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.lwip/spec b/engine/tests/Functional.lwip/spec
new file mode 100644
index 0000000..bb9f9b3
--- /dev/null
+++ b/engine/tests/Functional.lwip/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.lwip",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.mesa-demos/Functional.mesa-demos.spec b/engine/tests/Functional.mesa-demos/Functional.mesa-demos.spec
deleted file mode 100644
index 0712e09..0000000
--- a/engine/tests/Functional.mesa-demos/Functional.mesa-demos.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.mesa-demos",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.mesa-demos/spec b/engine/tests/Functional.mesa-demos/spec
new file mode 100644
index 0000000..0712e09
--- /dev/null
+++ b/engine/tests/Functional.mesa-demos/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.mesa-demos",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.neon/Functional.neon.spec b/engine/tests/Functional.neon/Functional.neon.spec
deleted file mode 100644
index 348b913..0000000
--- a/engine/tests/Functional.neon/Functional.neon.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.neon",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.neon/spec b/engine/tests/Functional.neon/spec
new file mode 100644
index 0000000..348b913
--- /dev/null
+++ b/engine/tests/Functional.neon/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.neon",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.net-tools/Functional.net-tools.spec b/engine/tests/Functional.net-tools/Functional.net-tools.spec
deleted file mode 100644
index f702fa6..0000000
--- a/engine/tests/Functional.net-tools/Functional.net-tools.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.net-tools",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.net-tools/spec b/engine/tests/Functional.net-tools/spec
new file mode 100644
index 0000000..f702fa6
--- /dev/null
+++ b/engine/tests/Functional.net-tools/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.net-tools",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.netperf/Functional.netperf.spec b/engine/tests/Functional.netperf/Functional.netperf.spec
deleted file mode 100644
index 2838d34..0000000
--- a/engine/tests/Functional.netperf/Functional.netperf.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "testName": "Functional.netperf",
- "specs":
- [
- {
- "name":"default",
- "SRV":"default"
- },
- {
- "name":"docker",
- "SRV":"docker"
- }
- ]
-}
diff --git a/engine/tests/Functional.netperf/spec b/engine/tests/Functional.netperf/spec
new file mode 100644
index 0000000..2838d34
--- /dev/null
+++ b/engine/tests/Functional.netperf/spec
@@ -0,0 +1,14 @@
+{
+ "testName": "Functional.netperf",
+ "specs":
+ [
+ {
+ "name":"default",
+ "SRV":"default"
+ },
+ {
+ "name":"docker",
+ "SRV":"docker"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.pi_tests/Functional.pi_tests.spec b/engine/tests/Functional.pi_tests/Functional.pi_tests.spec
deleted file mode 100644
index 2971959..0000000
--- a/engine/tests/Functional.pi_tests/Functional.pi_tests.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "testName": "Functional.pi_tests",
- "specs":
- [
- {
- "name":"default",
- "INVERSIONS":"100",
- "GROUPS":"1",
- "TIMEOUT":"10"
- }
- ]
-}
diff --git a/engine/tests/Functional.pi_tests/spec b/engine/tests/Functional.pi_tests/spec
new file mode 100644
index 0000000..2971959
--- /dev/null
+++ b/engine/tests/Functional.pi_tests/spec
@@ -0,0 +1,12 @@
+{
+ "testName": "Functional.pi_tests",
+ "specs":
+ [
+ {
+ "name":"default",
+ "INVERSIONS":"100",
+ "GROUPS":"1",
+ "TIMEOUT":"10"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.pixman/Functional.pixman.spec b/engine/tests/Functional.pixman/Functional.pixman.spec
deleted file mode 100644
index 1cd16f8..0000000
--- a/engine/tests/Functional.pixman/Functional.pixman.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.pixman",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.pixman/spec b/engine/tests/Functional.pixman/spec
new file mode 100644
index 0000000..1cd16f8
--- /dev/null
+++ b/engine/tests/Functional.pixman/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.pixman",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.pppd/Functional.pppd.spec b/engine/tests/Functional.pppd/Functional.pppd.spec
deleted file mode 100644
index d1cbc93..0000000
--- a/engine/tests/Functional.pppd/Functional.pppd.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.pppd",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.pppd/spec b/engine/tests/Functional.pppd/spec
new file mode 100644
index 0000000..d1cbc93
--- /dev/null
+++ b/engine/tests/Functional.pppd/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.pppd",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.protobuf/Functional.protobuf.spec b/engine/tests/Functional.protobuf/Functional.protobuf.spec
deleted file mode 100644
index a04b726..0000000
--- a/engine/tests/Functional.protobuf/Functional.protobuf.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.protobuf",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.protobuf/spec b/engine/tests/Functional.protobuf/spec
new file mode 100644
index 0000000..a04b726
--- /dev/null
+++ b/engine/tests/Functional.protobuf/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.protobuf",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.rmaptest/Functional.rmaptest.spec b/engine/tests/Functional.rmaptest/Functional.rmaptest.spec
deleted file mode 100644
index d19b99f..0000000
--- a/engine/tests/Functional.rmaptest/Functional.rmaptest.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "testName": "Functional.rmaptest",
- "specs":
- [
- {
- "name":"default",
- "ITERATIONS":"100",
- "VMA":"100",
- "VMA_SIZE":"100",
- "TASKS":"100",
- "VMAS_FOR_PROCESS":"10"
- }
- ]
-}
diff --git a/engine/tests/Functional.rmaptest/spec b/engine/tests/Functional.rmaptest/spec
new file mode 100644
index 0000000..d19b99f
--- /dev/null
+++ b/engine/tests/Functional.rmaptest/spec
@@ -0,0 +1,14 @@
+{
+ "testName": "Functional.rmaptest",
+ "specs":
+ [
+ {
+ "name":"default",
+ "ITERATIONS":"100",
+ "VMA":"100",
+ "VMA_SIZE":"100",
+ "TASKS":"100",
+ "VMAS_FOR_PROCESS":"10"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.scifab/Functional.scifab.spec b/engine/tests/Functional.scifab/Functional.scifab.spec
deleted file mode 100644
index 0ae5344..0000000
--- a/engine/tests/Functional.scifab/Functional.scifab.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.scifab",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.scifab/spec b/engine/tests/Functional.scifab/spec
new file mode 100644
index 0000000..0ae5344
--- /dev/null
+++ b/engine/tests/Functional.scifab/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.scifab",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.scrashme/Functional.scrashme.spec b/engine/tests/Functional.scrashme/Functional.scrashme.spec
deleted file mode 100644
index 5065506..0000000
--- a/engine/tests/Functional.scrashme/Functional.scrashme.spec
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "testName": "Functional.scrashme",
- "specs":
- [
- {
- "name":"default",
- "NUM":"100",
- "MODE":"random"
- },
- {
- "name":"rotate",
- "NUM":"100",
- "MODE":"rotate"
- },
- {
- "name":"capcheck",
- "NUM":"100",
- "MODE":"capcheck"
- }
- ]
-}
diff --git a/engine/tests/Functional.scrashme/spec b/engine/tests/Functional.scrashme/spec
new file mode 100644
index 0000000..5065506
--- /dev/null
+++ b/engine/tests/Functional.scrashme/spec
@@ -0,0 +1,21 @@
+{
+ "testName": "Functional.scrashme",
+ "specs":
+ [
+ {
+ "name":"default",
+ "NUM":"100",
+ "MODE":"random"
+ },
+ {
+ "name":"rotate",
+ "NUM":"100",
+ "MODE":"rotate"
+ },
+ {
+ "name":"capcheck",
+ "NUM":"100",
+ "MODE":"capcheck"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec b/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
deleted file mode 100644
index c0f134e..0000000
--- a/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.sdhi_0",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.sdhi_0/spec b/engine/tests/Functional.sdhi_0/spec
new file mode 100644
index 0000000..c0f134e
--- /dev/null
+++ b/engine/tests/Functional.sdhi_0/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.sdhi_0",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.stress/Functional.stress.spec b/engine/tests/Functional.stress/Functional.stress.spec
deleted file mode 100644
index 5a40f31..0000000
--- a/engine/tests/Functional.stress/Functional.stress.spec
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "testName": "Functional.stress",
- "specs":
- [
- {
- "name":"default",
- "SYNC":"2",
- "SQRT":"2",
- "HDD":"2",
- "HDD_BYTES":"100M",
- "VM":"2",
- "VM_BYTES":"128M",
- "TIMEOUT":"60"
- }
- ]
-}
diff --git a/engine/tests/Functional.stress/spec b/engine/tests/Functional.stress/spec
new file mode 100644
index 0000000..5a40f31
--- /dev/null
+++ b/engine/tests/Functional.stress/spec
@@ -0,0 +1,16 @@
+{
+ "testName": "Functional.stress",
+ "specs":
+ [
+ {
+ "name":"default",
+ "SYNC":"2",
+ "SQRT":"2",
+ "HDD":"2",
+ "HDD_BYTES":"100M",
+ "VM":"2",
+ "VM_BYTES":"128M",
+ "TIMEOUT":"60"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.synctest/Functional.synctest.spec b/engine/tests/Functional.synctest/Functional.synctest.spec
deleted file mode 100644
index 4d920b9..0000000
--- a/engine/tests/Functional.synctest/Functional.synctest.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "testName": "Functional.synctest",
- "specs":
- [
- {
- "name":"sata",
- "MOUNT_BLOCKDEV":"$SATA_DEV",
- "MOUNT_POINT":"$SATA_MP",
- "LEN":"10",
- "LOOP":"10"
- },
- {
- "name":"mmc",
- "MOUNT_BLOCKDEV":"$MMC_DEV",
- "MOUNT_POINT":"$MMC_MP",
- "LEN":"10",
- "LOOP":"10"
- },
- {
- "name":"usb",
- "MOUNT_BLOCKDEV":"$USB_DEV",
- "MOUNT_POINT":"$USB_MP",
- "LEN":"10",
- "LOOP":"10"
- },
- {
- "name":"default",
- "MOUNT_BLOCKDEV":"ROOT",
- "MOUNT_POINT":"$BOARD_TESTDIR/work",
- "LEN":"10",
- "LOOP":"10"
- }
- ]
-}
-
-
-
-
diff --git a/engine/tests/Functional.synctest/spec b/engine/tests/Functional.synctest/spec
new file mode 100644
index 0000000..4d920b9
--- /dev/null
+++ b/engine/tests/Functional.synctest/spec
@@ -0,0 +1,38 @@
+{
+ "testName": "Functional.synctest",
+ "specs":
+ [
+ {
+ "name":"sata",
+ "MOUNT_BLOCKDEV":"$SATA_DEV",
+ "MOUNT_POINT":"$SATA_MP",
+ "LEN":"10",
+ "LOOP":"10"
+ },
+ {
+ "name":"mmc",
+ "MOUNT_BLOCKDEV":"$MMC_DEV",
+ "MOUNT_POINT":"$MMC_MP",
+ "LEN":"10",
+ "LOOP":"10"
+ },
+ {
+ "name":"usb",
+ "MOUNT_BLOCKDEV":"$USB_DEV",
+ "MOUNT_POINT":"$USB_MP",
+ "LEN":"10",
+ "LOOP":"10"
+ },
+ {
+ "name":"default",
+ "MOUNT_BLOCKDEV":"ROOT",
+ "MOUNT_POINT":"$BOARD_TESTDIR/work",
+ "LEN":"10",
+ "LOOP":"10"
+ }
+ ]
+}
+
+
+
+
diff --git a/engine/tests/Functional.thrift/Functional.thrift.spec b/engine/tests/Functional.thrift/Functional.thrift.spec
deleted file mode 100644
index 860aea2..0000000
--- a/engine/tests/Functional.thrift/Functional.thrift.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.thrift",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.thrift/spec b/engine/tests/Functional.thrift/spec
new file mode 100644
index 0000000..860aea2
--- /dev/null
+++ b/engine/tests/Functional.thrift/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.thrift",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.tiff/Functional.tiff.spec b/engine/tests/Functional.tiff/Functional.tiff.spec
deleted file mode 100644
index e7d3736..0000000
--- a/engine/tests/Functional.tiff/Functional.tiff.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.tiff",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.tiff/spec b/engine/tests/Functional.tiff/spec
new file mode 100644
index 0000000..e7d3736
--- /dev/null
+++ b/engine/tests/Functional.tiff/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.tiff",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.vsomeip/Functional.vsomeip.spec b/engine/tests/Functional.vsomeip/Functional.vsomeip.spec
deleted file mode 100644
index 61022d2..0000000
--- a/engine/tests/Functional.vsomeip/Functional.vsomeip.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.vsomeip",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.vsomeip/spec b/engine/tests/Functional.vsomeip/spec
new file mode 100644
index 0000000..61022d2
--- /dev/null
+++ b/engine/tests/Functional.vsomeip/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.vsomeip",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.xorg-macros/Functional.xorg-macros.spec b/engine/tests/Functional.xorg-macros/Functional.xorg-macros.spec
deleted file mode 100644
index e1b83f7..0000000
--- a/engine/tests/Functional.xorg-macros/Functional.xorg-macros.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "testName": "Functional.xorg-macros",
- "specs": [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.xorg-macros/spec b/engine/tests/Functional.xorg-macros/spec
new file mode 100644
index 0000000..e1b83f7
--- /dev/null
+++ b/engine/tests/Functional.xorg-macros/spec
@@ -0,0 +1,8 @@
+{
+ "testName": "Functional.xorg-macros",
+ "specs": [
+ {
+ "name":"default"
+ }
+ ]
+}
diff --git a/engine/tests/Functional.zlib/Functional.zlib.spec b/engine/tests/Functional.zlib/Functional.zlib.spec
deleted file mode 100644
index be3ed34..0000000
--- a/engine/tests/Functional.zlib/Functional.zlib.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "testName": "Functional.zlib",
- "specs":
- [
- {
- "name":"default"
- }
- ]
-}
diff --git a/engine/tests/Functional.zlib/spec b/engine/tests/Functional.zlib/spec
new file mode 100644
index 0000000..be3ed34
--- /dev/null
+++ b/engine/tests/Functional.zlib/spec
@@ -0,0 +1,9 @@
+{
+ "testName": "Functional.zlib",
+ "specs":
+ [
+ {
+ "name":"default"
+ }
+ ]
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 04/23] tests: add FIXTHIS to tests without any shell script
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 02/23] ftc: add timeout parameter when using add-jobs without testplans Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 03/23] specs: change the name of the specs to spec Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 05/23] tests: rename incorrectly named test shell scripts Daniel Sangorrin
` (18 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Benchmark.fs_mark/fs_mark.sh | 1 +
engine/tests/Benchmark.sysbench/sysbench.sh | 1 +
engine/tests/Functional.fsfuzz/fsfuzz.sh | 1 +
engine/tests/Functional.mesa-demos/mesa-demos.sh | 1 +
4 files changed, 4 insertions(+)
create mode 100644 engine/tests/Benchmark.fs_mark/fs_mark.sh
create mode 100644 engine/tests/Benchmark.sysbench/sysbench.sh
create mode 100644 engine/tests/Functional.fsfuzz/fsfuzz.sh
create mode 100644 engine/tests/Functional.mesa-demos/mesa-demos.sh
diff --git a/engine/tests/Benchmark.fs_mark/fs_mark.sh b/engine/tests/Benchmark.fs_mark/fs_mark.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Benchmark.fs_mark/fs_mark.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Benchmark.sysbench/sysbench.sh b/engine/tests/Benchmark.sysbench/sysbench.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Benchmark.sysbench/sysbench.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.fsfuzz/fsfuzz.sh b/engine/tests/Functional.fsfuzz/fsfuzz.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Functional.fsfuzz/fsfuzz.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.mesa-demos/mesa-demos.sh b/engine/tests/Functional.mesa-demos/mesa-demos.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Functional.mesa-demos/mesa-demos.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 05/23] tests: rename incorrectly named test shell scripts
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (2 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 04/23] tests: add FIXTHIS to tests without any shell script Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 06/23] fuego_test: rename all test shell scripts to fuego_test.sh Daniel Sangorrin
` (17 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.giflib/giflib-scripts.sh | 55 ------
engine/tests/Functional.giflib/giflib.sh | 55 ++++++
engine/tests/Functional.glib2/glib2-scripts.sh | 79 --------
engine/tests/Functional.glib2/glib2.sh | 79 ++++++++
engine/tests/Functional.libogg/libogg.sh | 25 +++
engine/tests/Functional.libogg/ogg.sh | 25 ---
engine/tests/Functional.librsvg/librsvg-scripts.sh | 54 ------
engine/tests/Functional.librsvg/librsvg.sh | 54 ++++++
engine/tests/Functional.libspeex/libspeex.sh | 25 +++
engine/tests/Functional.libspeex/speex.sh | 25 ---
engine/tests/Functional.neon/neon-scripts.sh | 79 --------
engine/tests/Functional.neon/neon.sh | 79 ++++++++
.../Functional.net-tools/net-tools-scripts.sh | 31 ----
engine/tests/Functional.net-tools/net-tools.sh | 31 ++++
engine/tests/Functional.vsomeip/vsomeip-scripts.sh | 199 ---------------------
engine/tests/Functional.vsomeip/vsomeip.sh | 199 +++++++++++++++++++++
16 files changed, 547 insertions(+), 547 deletions(-)
delete mode 100755 engine/tests/Functional.giflib/giflib-scripts.sh
create mode 100755 engine/tests/Functional.giflib/giflib.sh
delete mode 100755 engine/tests/Functional.glib2/glib2-scripts.sh
create mode 100755 engine/tests/Functional.glib2/glib2.sh
create mode 100755 engine/tests/Functional.libogg/libogg.sh
delete mode 100755 engine/tests/Functional.libogg/ogg.sh
delete mode 100755 engine/tests/Functional.librsvg/librsvg-scripts.sh
create mode 100755 engine/tests/Functional.librsvg/librsvg.sh
create mode 100755 engine/tests/Functional.libspeex/libspeex.sh
delete mode 100755 engine/tests/Functional.libspeex/speex.sh
delete mode 100755 engine/tests/Functional.neon/neon-scripts.sh
create mode 100755 engine/tests/Functional.neon/neon.sh
delete mode 100755 engine/tests/Functional.net-tools/net-tools-scripts.sh
create mode 100755 engine/tests/Functional.net-tools/net-tools.sh
delete mode 100755 engine/tests/Functional.vsomeip/vsomeip-scripts.sh
create mode 100755 engine/tests/Functional.vsomeip/vsomeip.sh
diff --git a/engine/tests/Functional.giflib/giflib-scripts.sh b/engine/tests/Functional.giflib/giflib-scripts.sh
deleted file mode 100755
index 6c300c9..0000000
--- a/engine/tests/Functional.giflib/giflib-scripts.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-tarball=giflib-4.1.6.tar.bz2
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put pic/* util/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; echo 11111111 > test_raw.raw; \
- if gifbg -d tl -s 320 200 -c 255 255 255 -l 64 > bg1.gif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if gifwedge > test_gifwedge.gif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if gif2epsn cover.gif > cover.epsn; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if gif2ps cover.gif > cover.ps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if gif2rgb -o cover cover.gif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if gifasm bg1.gif porsche.gif > test_gifasm.gif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if gifclip -i 222 0 390 134 solid2.gif > test_gifclip.gif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if gifclrmp -i 2 cover.gif > test_gifclrmp.gif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if gifcomb porsche.gif bg1.gif > test_gifcomb.gif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if text2gif -t 'abcde' > abcde.gif; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if giffiltr <abcde.gif > test_giffiltr.gif; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if gifspnge <porsche.gif > test_gifspnge.gif; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
- if giffix cover.gif > test_giffix.gif; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if gifflip -r solid2.gif > test_gifflip.gif; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if gifhisto -b -s 200 512 porsche.gif > test_gifhisto.gif; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if gifinfo cover.gif; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if gifinter cover.gif > test_gifinter.gif; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if gifbg | gifinto test_gifinto.gif; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if gifbg | gifovly > test_gifovly.gif; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
- if gifpos -s 720 348 -i 400 148 porsche.gif > test_gifpos.gif; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
- if gifrotat -a 45 cover.gif > test_gifrotat.gif; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
- if gifrsize -s 0.45 solid2.gif > test_gifrsize.gif; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
- if giftext cover.gif > giftext.txt; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
- if icon2gif sample.ico > test_icon2gif.gif; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
- if raw2gif -s 1 1 test_raw.raw > test_raw2gif.gif; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
- if gif2rgb x-trans.gif | rgb2gif -s 100 100 > test_rgb2gif.gif; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "26" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
-
diff --git a/engine/tests/Functional.giflib/giflib.sh b/engine/tests/Functional.giflib/giflib.sh
new file mode 100755
index 0000000..6c300c9
--- /dev/null
+++ b/engine/tests/Functional.giflib/giflib.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+tarball=giflib-4.1.6.tar.bz2
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put pic/* util/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; echo 11111111 > test_raw.raw; \
+ if gifbg -d tl -s 320 200 -c 255 255 255 -l 64 > bg1.gif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if gifwedge > test_gifwedge.gif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if gif2epsn cover.gif > cover.epsn; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if gif2ps cover.gif > cover.ps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if gif2rgb -o cover cover.gif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if gifasm bg1.gif porsche.gif > test_gifasm.gif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if gifclip -i 222 0 390 134 solid2.gif > test_gifclip.gif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if gifclrmp -i 2 cover.gif > test_gifclrmp.gif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if gifcomb porsche.gif bg1.gif > test_gifcomb.gif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if text2gif -t 'abcde' > abcde.gif; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if giffiltr <abcde.gif > test_giffiltr.gif; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if gifspnge <porsche.gif > test_gifspnge.gif; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+ if giffix cover.gif > test_giffix.gif; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if gifflip -r solid2.gif > test_gifflip.gif; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if gifhisto -b -s 200 512 porsche.gif > test_gifhisto.gif; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if gifinfo cover.gif; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if gifinter cover.gif > test_gifinter.gif; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if gifbg | gifinto test_gifinto.gif; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if gifbg | gifovly > test_gifovly.gif; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
+ if gifpos -s 720 348 -i 400 148 porsche.gif > test_gifpos.gif; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
+ if gifrotat -a 45 cover.gif > test_gifrotat.gif; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
+ if gifrsize -s 0.45 solid2.gif > test_gifrsize.gif; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
+ if giftext cover.gif > giftext.txt; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
+ if icon2gif sample.ico > test_icon2gif.gif; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
+ if raw2gif -s 1 1 test_raw.raw > test_raw2gif.gif; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
+ if gif2rgb x-trans.gif | rgb2gif -s 100 100 > test_rgb2gif.gif; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "26" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
+
diff --git a/engine/tests/Functional.glib2/glib2-scripts.sh b/engine/tests/Functional.glib2/glib2-scripts.sh
deleted file mode 100755
index 3be0ab0..0000000
--- a/engine/tests/Functional.glib2/glib2-scripts.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-tarball=glib2-test.tar.bz2
-
-function test_build {
-
- cd ./glib-2.46.2
-
- if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
- echo "This is porter!"
- else
- ./configure --host=$PREFIX --disable-silent-rules --disable-dependency-tracking --enable-included-printf=no --disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man --disable-static --enable-nls --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --with-pcre=system --enable-always-build-tests
- make
- fi
-}
-
-function test_deploy {
- if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
- put -r ./glib-2.46.2/bin_porter/tests $BOARD_TESTDIR/fuego.$TESTDIR/
- else
- put -r ./glib-2.46.2/tests $BOARD_TESTDIR/fuego.$TESTDIR/
- fi
-
-
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- cd tests/.libs; \
- cp * ..; \
- cd ..; \
-
- if ./asyncqueue-test; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./atomic-test; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ./bit-test; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ./child-test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./completion-test; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./datetime; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if ./dirname-test; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if ./env-test; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if ./file-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if ./gio-test; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if ./mainloop-test; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if ./mapping-test; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
- export LD_LIBRARY_PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH/tests:$LD_LIBRARY_PATH; \
- if ./module-test; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if ./onceinit; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if ./qsort-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if ./relation-test; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if ./slice-color; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if ./slice-concurrent; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if ./slice-test; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
- if ./slice-threadinit; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
- if ./sources; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
- if ./spawn-test; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
- if ./testgdate; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
- if ./testglib; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
- if ./threadpool-test; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
- if ./thread-test; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi; \
- if ./timeloop; then echo 'TEST-27 OK'; else echo 'TEST-27 FAIL'; fi; \
- if ./type-test; then echo 'TEST-28 OK'; else echo 'TEST-28 FAIL'; fi; \
- if ./unicode-caseconv; then echo 'TEST-29 OK'; else echo 'TEST-29 FAIL'; fi"
-# if ./iochannel-test; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-caseconv; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-collate; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-encoding; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi
-}
-
-function test_processing {
- P_CRIT="TEST.*"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "29" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.glib2/glib2.sh b/engine/tests/Functional.glib2/glib2.sh
new file mode 100755
index 0000000..3be0ab0
--- /dev/null
+++ b/engine/tests/Functional.glib2/glib2.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+tarball=glib2-test.tar.bz2
+
+function test_build {
+
+ cd ./glib-2.46.2
+
+ if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
+ echo "This is porter!"
+ else
+ ./configure --host=$PREFIX --disable-silent-rules --disable-dependency-tracking --enable-included-printf=no --disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man --disable-static --enable-nls --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --with-pcre=system --enable-always-build-tests
+ make
+ fi
+}
+
+function test_deploy {
+ if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
+ put -r ./glib-2.46.2/bin_porter/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+ else
+ put -r ./glib-2.46.2/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+ fi
+
+
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ cd tests/.libs; \
+ cp * ..; \
+ cd ..; \
+
+ if ./asyncqueue-test; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./atomic-test; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ./bit-test; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ./child-test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./completion-test; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./datetime; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if ./dirname-test; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if ./env-test; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if ./file-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if ./gio-test; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if ./mainloop-test; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if ./mapping-test; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+ export LD_LIBRARY_PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH/tests:$LD_LIBRARY_PATH; \
+ if ./module-test; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if ./onceinit; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if ./qsort-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if ./relation-test; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if ./slice-color; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if ./slice-concurrent; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if ./slice-test; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
+ if ./slice-threadinit; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
+ if ./sources; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
+ if ./spawn-test; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
+ if ./testgdate; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
+ if ./testglib; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
+ if ./threadpool-test; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
+ if ./thread-test; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi; \
+ if ./timeloop; then echo 'TEST-27 OK'; else echo 'TEST-27 FAIL'; fi; \
+ if ./type-test; then echo 'TEST-28 OK'; else echo 'TEST-28 FAIL'; fi; \
+ if ./unicode-caseconv; then echo 'TEST-29 OK'; else echo 'TEST-29 FAIL'; fi"
+# if ./iochannel-test; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-caseconv; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-collate; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-encoding; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi
+}
+
+function test_processing {
+ P_CRIT="TEST.*"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "29" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.libogg/libogg.sh b/engine/tests/Functional.libogg/libogg.sh
new file mode 100755
index 0000000..1a71032
--- /dev/null
+++ b/engine/tests/Functional.libogg/libogg.sh
@@ -0,0 +1,25 @@
+tarball=ogg.tar.gz
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
+ put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.libogg/ogg.sh b/engine/tests/Functional.libogg/ogg.sh
deleted file mode 100755
index 1a71032..0000000
--- a/engine/tests/Functional.libogg/ogg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=ogg.tar.gz
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
- put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
-if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.librsvg/librsvg-scripts.sh b/engine/tests/Functional.librsvg/librsvg-scripts.sh
deleted file mode 100755
index 75513a0..0000000
--- a/engine/tests/Functional.librsvg/librsvg-scripts.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-tarball=librsvg-2.40.15.tar.bz2
-
-function test_build {
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}/usr/share/aclocal
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX --enable-always-build-tests --disable-pixbuf-loader
- make rsvg-convert
- cd tests
- make
- ./rsvg-test
- ./styles
- ./crash
- cd ../tools
- make
-}
-
-function test_deploy {
- put ./.libs/rsvg-convert $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./tests/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./tests/fixtures $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- if rsvg-convert -f png -d 100 -p 100 -x 2 -y 2 -z 1 -w 100 -h 100 -a -b white ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.png; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if rsvg-convert -f pdf ./fixtures/reftests/duplicate-id.svg > duplicate-id.pdf; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if rsvg-convert -f ps ./fixtures/reftests/duplicate-id.svg > duplicate-id.ps; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if rsvg-convert -f eps ./fixtures/reftests/duplicate-id.svg > duplicate-id.eps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if rsvg-convert -f svg ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.svg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if rsvg-convert -o test ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if rsvg-dimensions ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if test-performance ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if lt-rsvg-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if lt-styles; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if lt-crash; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "11" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.librsvg/librsvg.sh b/engine/tests/Functional.librsvg/librsvg.sh
new file mode 100755
index 0000000..75513a0
--- /dev/null
+++ b/engine/tests/Functional.librsvg/librsvg.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+tarball=librsvg-2.40.15.tar.bz2
+
+function test_build {
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}/usr/share/aclocal
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX --enable-always-build-tests --disable-pixbuf-loader
+ make rsvg-convert
+ cd tests
+ make
+ ./rsvg-test
+ ./styles
+ ./crash
+ cd ../tools
+ make
+}
+
+function test_deploy {
+ put ./.libs/rsvg-convert $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./tests/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./tests/fixtures $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ if rsvg-convert -f png -d 100 -p 100 -x 2 -y 2 -z 1 -w 100 -h 100 -a -b white ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.png; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if rsvg-convert -f pdf ./fixtures/reftests/duplicate-id.svg > duplicate-id.pdf; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if rsvg-convert -f ps ./fixtures/reftests/duplicate-id.svg > duplicate-id.ps; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if rsvg-convert -f eps ./fixtures/reftests/duplicate-id.svg > duplicate-id.eps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if rsvg-convert -f svg ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.svg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if rsvg-convert -o test ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if rsvg-dimensions ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if test-performance ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if lt-rsvg-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if lt-styles; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if lt-crash; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "11" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.libspeex/libspeex.sh b/engine/tests/Functional.libspeex/libspeex.sh
new file mode 100755
index 0000000..5395a88
--- /dev/null
+++ b/engine/tests/Functional.libspeex/libspeex.sh
@@ -0,0 +1,25 @@
+tarball=speex.tar.gz
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
+ put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.libspeex/speex.sh b/engine/tests/Functional.libspeex/speex.sh
deleted file mode 100755
index 5395a88..0000000
--- a/engine/tests/Functional.libspeex/speex.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=speex.tar.gz
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
- put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
-if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.neon/neon-scripts.sh b/engine/tests/Functional.neon/neon-scripts.sh
deleted file mode 100755
index 58b4c9f..0000000
--- a/engine/tests/Functional.neon/neon-scripts.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-tarball=neon-test.tar.bz2
-
-function test_build {
- chmod -R 777 *
- patch -p0 < gnutls_4.3_fixup.patch
- patch -p0 < pkgconfig.patch
- cd ./neon-0.30.1
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}usr/share/aclocal
- autoreconf --verbose --install --force --exclude=autopoint -I macros
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX --with-libxml2 -with-expat --enable-shared --without-gssapi --with-ssl=gnutls CPPFLAGS="-DHAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION=1"
- make
- cd ./test
- make
- chmod -R 777 *
- ./makekeys
-
- gzip -c --no-name ../NEWS > file1.gz
- gzip -c --name ../NEWS > file2.gz
- gzip -c --no-name ../NEWS > trailing.gz
- echo "hello, world" >> trailing.gz
- dd of=badcsum.gz if=file1.gz bs=1 count=`perl -e 'printf "%d", (stat("file1.gz"))[7] - 8;'`
-
- echo 'broken!' >> badcsum.gz
- dd if=file1.gz of=truncated.gz bs=2048 count=2
-
- dd of=corrupt1.gz if=file1.gz bs=1 count=500
-
- cat ../NEWS >> corrupt1.gz
- cat ../NEWS > corrupt2.gz
- touch empty.gz
- cat ../NEWS > random.txt
- echo foobar > foobar.txt
-}
-
-function test_deploy {
- put -r ./neon-0.30.1/test/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- if ./acl3744; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./auth; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ./basic; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ./compress; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./lock; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./oldacl; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if ./props; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if ./redirect; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if ./request; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if ./session; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if ./socket; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if ./socket-ssl; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
-
- if ./string-tests; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if ./stubs; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if ./uri-tests; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if ./util-tests; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if ./xml; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if ./xmlreq; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi"
-# if ./ssl; then echo 'TEST-13 FAIL'; else echo 'TEST-13 OK'; fi; \
-}
-
-function test_processing {
- P_CRIT="TEST.*"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "18" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.neon/neon.sh b/engine/tests/Functional.neon/neon.sh
new file mode 100755
index 0000000..58b4c9f
--- /dev/null
+++ b/engine/tests/Functional.neon/neon.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+tarball=neon-test.tar.bz2
+
+function test_build {
+ chmod -R 777 *
+ patch -p0 < gnutls_4.3_fixup.patch
+ patch -p0 < pkgconfig.patch
+ cd ./neon-0.30.1
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}usr/share/aclocal
+ autoreconf --verbose --install --force --exclude=autopoint -I macros
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX --with-libxml2 -with-expat --enable-shared --without-gssapi --with-ssl=gnutls CPPFLAGS="-DHAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION=1"
+ make
+ cd ./test
+ make
+ chmod -R 777 *
+ ./makekeys
+
+ gzip -c --no-name ../NEWS > file1.gz
+ gzip -c --name ../NEWS > file2.gz
+ gzip -c --no-name ../NEWS > trailing.gz
+ echo "hello, world" >> trailing.gz
+ dd of=badcsum.gz if=file1.gz bs=1 count=`perl -e 'printf "%d", (stat("file1.gz"))[7] - 8;'`
+
+ echo 'broken!' >> badcsum.gz
+ dd if=file1.gz of=truncated.gz bs=2048 count=2
+
+ dd of=corrupt1.gz if=file1.gz bs=1 count=500
+
+ cat ../NEWS >> corrupt1.gz
+ cat ../NEWS > corrupt2.gz
+ touch empty.gz
+ cat ../NEWS > random.txt
+ echo foobar > foobar.txt
+}
+
+function test_deploy {
+ put -r ./neon-0.30.1/test/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ if ./acl3744; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./auth; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ./basic; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ./compress; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./lock; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./oldacl; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if ./props; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if ./redirect; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if ./request; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if ./session; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if ./socket; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if ./socket-ssl; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+
+ if ./string-tests; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if ./stubs; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if ./uri-tests; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if ./util-tests; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if ./xml; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if ./xmlreq; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi"
+# if ./ssl; then echo 'TEST-13 FAIL'; else echo 'TEST-13 OK'; fi; \
+}
+
+function test_processing {
+ P_CRIT="TEST.*"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "18" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.net-tools/net-tools-scripts.sh b/engine/tests/Functional.net-tools/net-tools-scripts.sh
deleted file mode 100755
index b25f8b7..0000000
--- a/engine/tests/Functional.net-tools/net-tools-scripts.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-function test_build {
- true
-}
-
-function test_deploy {
- pwd
-}
-
-function test_run {
- report "if arp; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if hostname; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ifconfig; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ipmaddr; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if iptunnel; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if netstat; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if route; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.net-tools/net-tools.sh b/engine/tests/Functional.net-tools/net-tools.sh
new file mode 100755
index 0000000..b25f8b7
--- /dev/null
+++ b/engine/tests/Functional.net-tools/net-tools.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+function test_build {
+ true
+}
+
+function test_deploy {
+ pwd
+}
+
+function test_run {
+ report "if arp; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if hostname; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ifconfig; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ipmaddr; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if iptunnel; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if netstat; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if route; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.vsomeip/vsomeip-scripts.sh b/engine/tests/Functional.vsomeip/vsomeip-scripts.sh
deleted file mode 100755
index 37dcd50..0000000
--- a/engine/tests/Functional.vsomeip/vsomeip-scripts.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-
-tarball=vSomeIP.tar.bz2
-
-function test_build {
- cd ./run_test
- sed -i "s/192.168.160.212/${IPADDR}/g" `grep -rl "192.168.160.212" .`
-# sed -i "s/192.168.160.99/${IPADDR}/g" `grep -rl "192.168.160.99" .`
-
- cd ../examples
- $CXX -std=gnu++11 notify-sample.cpp -rdynamic -lpthread -lvsomeip -o notify-sample
- $CXX -std=gnu++11 request-sample.cpp -rdynamic -lpthread -lvsomeip -o request-sample
- $CXX -std=gnu++11 response-sample.cpp -rdynamic -lpthread -lvsomeip -o response-sample
- $CXX -std=gnu++11 subscribe-sample.cpp -rdynamic -lpthread -lvsomeip -o subscribe-sample
-
- cd ../test/application_tests
- $CXX -std=gnu++11 application_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o application_test
- cp application_test ../../run_test
- cd ../configuration_tests
- $CXX -std=gnu++11 configuration-test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o configuration-test
- cp configuration-test ../../run_test
- cd ../magic_cookies_tests
- $CXX -std=gnu++11 magic_cookies_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_client
- $CXX -std=gnu++11 magic_cookies_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_service
- cp magic_cookies_test_client ../../run_test
- cp magic_cookies_test_service ../../run_test
- cd ../header_factory_tests
- $CXX -std=gnu++11 header_factory_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test
- $CXX -std=gnu++11 header_factory_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_client
- $CXX -std=gnu++11 header_factory_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_service
- cp header_factory_test ../../run_test
- cp header_factory_test_client ../../run_test
- cp header_factory_test_service ../../run_test
- cd ../routing_tests
- $CXX -std=gnu++11 external_local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o external_local_routing_test_service
- $CXX -std=gnu++11 local_routing_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_client
- $CXX -std=gnu++11 local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_service
- cp external_local_routing_test_service ../../run_test
- cp local_routing_test_client ../../run_test
- cp local_routing_test_service ../../run_test
- cd ../payload_tests
- $CXX -std=gnu++11 payload_test_client.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_client
- $CXX -std=gnu++11 payload_test_service.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_service
- cp payload_test_client ../../run_test
- cp payload_test_service ../../run_test
- cd ../big_payload_tests
- $CXX -std=gnu++11 big_payload_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_client
- $CXX -std=gnu++11 big_payload_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_service
- cp big_payload_test_client ../../run_test
- cp big_payload_test_service ../../run_test
- cd ../client_id_tests
- $CXX -std=gnu++11 client_id_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o client_id_test_service
- cp client_id_test_service ../../run_test
-
- cd ../../examples/hello_world
- $CXX -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
- $CXX -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
-
-# g++ -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
-# g++ -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
-
-}
-
-function test_deploy {
- pwd
- put -r ./examples $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./run_test $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./config $BOARD_TESTDIR/fuego.$TESTDIR/
-
-# put -r ./examples /home/bi/vsomeip/
-# put -r ./run_test /home/bi/vsomeip/
-# put -r ./config /home/bi/vsomeip/
-
-# mkdir build
-# cd build
-# export GTEST_ROOT=./gtest-1.7.0/
-# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.7.2 ..
-# make check
-# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.160.237 ..
-
-# export LD_LIBRARY_PATH=../../../build:$LD_LIBRARY_PATH
-# export LD_LIBRARY_PATH=../../build:$LD_LIBRARY_PATH
-
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- cd run_test; \
-
- if ./configuration-test -someip ../config/vsomeip-test.json; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./application_test_starter.sh; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- (./magic_cookies_test_service_start.sh &); \
- if ./magic_cookies_test_client_start.sh; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- killall magic_cookies_test_service;\
-
- if ./header_factory_test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./header_factory_test_send_receive_starter.sh; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./local_routing_test_starter.sh; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
-
- (./external_local_routing_test_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case7.txt ] ; then
- if cat case7.txt | grep 'Please now run:external_local_routing_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_routing_test_client_external_start.sh; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
-killall external_local_routing_test_service;\
-killall local_routing_test_client:\
-
- if ./local_payload_test_starter.sh; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- (./external_local_payload_test_service_start.sh &); \
- sleep 2; \
- if ./external_local_payload_test_client_local_start.sh; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
-killall payload_test_service;\
-
- (./external_local_payload_test_client_external_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case10.txt ] ; then
- if cat case10.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
-killall payload_test_service;\
-
- (./external_local_payload_test_client_local_and_external_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case11.txt ] ; then
- if cat case11.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
-killall payload_test_service;\
-killall payload_test_client;\
-
- (./big_payload_test_service_local_start.sh &); \
- if ./big_payload_test_client_local_start.sh; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
-killall big_payload_test_service;\
-
- cd ../examples/
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./request-sample &); \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./response-sample &); \
- for (( ; ; ))
- do
- if [ -f log_request_sample.txt ] ; then
- if cat log_request_sample.txt | grep 'Received a response from Service'
- then echo 'log is found'
- break
- fi
- fi
- done
- pkill request-sample; \
- pkill response-sample; \
- if cat log_request_sample.txt | grep 'Received a response from Service'; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if cat log_response_sample.txt | grep 'Received a message with Client/Session'; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./subscribe-sample &); \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./notify-sample &); \
- for (( ; ; ))
- do
- if [ -f log_subscribe_sample.txt ] ; then
- if cat log_subscribe_sample.txt | grep 'Received a notification for Event'
- then echo 'log is found'
- break
- fi
- fi
- done
- pkill subscribe-sampl; \
- pkill notify-sample; \
- if cat log_subscribe_sample.txt | grep 'Received a notification for Event'; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if cat log_notify_sample.txt | grep 'Setting event (Length'; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
-
- cd ../examples/hello_world
- (VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_service ./hello_world_service &); \
- if VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_client ./hello_world_client; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi
- killall hello_world_service"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "17" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.vsomeip/vsomeip.sh b/engine/tests/Functional.vsomeip/vsomeip.sh
new file mode 100755
index 0000000..37dcd50
--- /dev/null
+++ b/engine/tests/Functional.vsomeip/vsomeip.sh
@@ -0,0 +1,199 @@
+#!/bin/bash
+
+tarball=vSomeIP.tar.bz2
+
+function test_build {
+ cd ./run_test
+ sed -i "s/192.168.160.212/${IPADDR}/g" `grep -rl "192.168.160.212" .`
+# sed -i "s/192.168.160.99/${IPADDR}/g" `grep -rl "192.168.160.99" .`
+
+ cd ../examples
+ $CXX -std=gnu++11 notify-sample.cpp -rdynamic -lpthread -lvsomeip -o notify-sample
+ $CXX -std=gnu++11 request-sample.cpp -rdynamic -lpthread -lvsomeip -o request-sample
+ $CXX -std=gnu++11 response-sample.cpp -rdynamic -lpthread -lvsomeip -o response-sample
+ $CXX -std=gnu++11 subscribe-sample.cpp -rdynamic -lpthread -lvsomeip -o subscribe-sample
+
+ cd ../test/application_tests
+ $CXX -std=gnu++11 application_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o application_test
+ cp application_test ../../run_test
+ cd ../configuration_tests
+ $CXX -std=gnu++11 configuration-test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o configuration-test
+ cp configuration-test ../../run_test
+ cd ../magic_cookies_tests
+ $CXX -std=gnu++11 magic_cookies_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_client
+ $CXX -std=gnu++11 magic_cookies_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_service
+ cp magic_cookies_test_client ../../run_test
+ cp magic_cookies_test_service ../../run_test
+ cd ../header_factory_tests
+ $CXX -std=gnu++11 header_factory_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test
+ $CXX -std=gnu++11 header_factory_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_client
+ $CXX -std=gnu++11 header_factory_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_service
+ cp header_factory_test ../../run_test
+ cp header_factory_test_client ../../run_test
+ cp header_factory_test_service ../../run_test
+ cd ../routing_tests
+ $CXX -std=gnu++11 external_local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o external_local_routing_test_service
+ $CXX -std=gnu++11 local_routing_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_client
+ $CXX -std=gnu++11 local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_service
+ cp external_local_routing_test_service ../../run_test
+ cp local_routing_test_client ../../run_test
+ cp local_routing_test_service ../../run_test
+ cd ../payload_tests
+ $CXX -std=gnu++11 payload_test_client.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_client
+ $CXX -std=gnu++11 payload_test_service.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_service
+ cp payload_test_client ../../run_test
+ cp payload_test_service ../../run_test
+ cd ../big_payload_tests
+ $CXX -std=gnu++11 big_payload_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_client
+ $CXX -std=gnu++11 big_payload_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_service
+ cp big_payload_test_client ../../run_test
+ cp big_payload_test_service ../../run_test
+ cd ../client_id_tests
+ $CXX -std=gnu++11 client_id_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o client_id_test_service
+ cp client_id_test_service ../../run_test
+
+ cd ../../examples/hello_world
+ $CXX -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
+ $CXX -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
+
+# g++ -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
+# g++ -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
+
+}
+
+function test_deploy {
+ pwd
+ put -r ./examples $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./run_test $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./config $BOARD_TESTDIR/fuego.$TESTDIR/
+
+# put -r ./examples /home/bi/vsomeip/
+# put -r ./run_test /home/bi/vsomeip/
+# put -r ./config /home/bi/vsomeip/
+
+# mkdir build
+# cd build
+# export GTEST_ROOT=./gtest-1.7.0/
+# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.7.2 ..
+# make check
+# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.160.237 ..
+
+# export LD_LIBRARY_PATH=../../../build:$LD_LIBRARY_PATH
+# export LD_LIBRARY_PATH=../../build:$LD_LIBRARY_PATH
+
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ cd run_test; \
+
+ if ./configuration-test -someip ../config/vsomeip-test.json; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./application_test_starter.sh; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ (./magic_cookies_test_service_start.sh &); \
+ if ./magic_cookies_test_client_start.sh; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ killall magic_cookies_test_service;\
+
+ if ./header_factory_test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./header_factory_test_send_receive_starter.sh; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./local_routing_test_starter.sh; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+
+ (./external_local_routing_test_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case7.txt ] ; then
+ if cat case7.txt | grep 'Please now run:external_local_routing_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_routing_test_client_external_start.sh; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+killall external_local_routing_test_service;\
+killall local_routing_test_client:\
+
+ if ./local_payload_test_starter.sh; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ (./external_local_payload_test_service_start.sh &); \
+ sleep 2; \
+ if ./external_local_payload_test_client_local_start.sh; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+killall payload_test_service;\
+
+ (./external_local_payload_test_client_external_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case10.txt ] ; then
+ if cat case10.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+killall payload_test_service;\
+
+ (./external_local_payload_test_client_local_and_external_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case11.txt ] ; then
+ if cat case11.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+killall payload_test_service;\
+killall payload_test_client;\
+
+ (./big_payload_test_service_local_start.sh &); \
+ if ./big_payload_test_client_local_start.sh; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+killall big_payload_test_service;\
+
+ cd ../examples/
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./request-sample &); \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./response-sample &); \
+ for (( ; ; ))
+ do
+ if [ -f log_request_sample.txt ] ; then
+ if cat log_request_sample.txt | grep 'Received a response from Service'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ pkill request-sample; \
+ pkill response-sample; \
+ if cat log_request_sample.txt | grep 'Received a response from Service'; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if cat log_response_sample.txt | grep 'Received a message with Client/Session'; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./subscribe-sample &); \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./notify-sample &); \
+ for (( ; ; ))
+ do
+ if [ -f log_subscribe_sample.txt ] ; then
+ if cat log_subscribe_sample.txt | grep 'Received a notification for Event'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ pkill subscribe-sampl; \
+ pkill notify-sample; \
+ if cat log_subscribe_sample.txt | grep 'Received a notification for Event'; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if cat log_notify_sample.txt | grep 'Setting event (Length'; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+
+ cd ../examples/hello_world
+ (VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_service ./hello_world_service &); \
+ if VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_client ./hello_world_client; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi
+ killall hello_world_service"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "17" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 06/23] fuego_test: rename all test shell scripts to fuego_test.sh
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (3 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 05/23] tests: rename incorrectly named test shell scripts Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 07/23] stress: remove stress.sh and references Daniel Sangorrin
` (16 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
This is for the test writers to have an easier plugin experience.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/main.sh | 5 +-
engine/tests/Benchmark.Dhrystone/Dhrystone.sh | 22 ---
engine/tests/Benchmark.Dhrystone/fuego_test.sh | 22 +++
engine/tests/Benchmark.GLMark/GLMark.sh | 22 ---
engine/tests/Benchmark.GLMark/fuego_test.sh | 22 +++
engine/tests/Benchmark.IOzone/IOzone.sh | 49 -----
engine/tests/Benchmark.IOzone/fuego_test.sh | 49 +++++
engine/tests/Benchmark.Interbench/Interbench.sh | 20 --
engine/tests/Benchmark.Interbench/fuego_test.sh | 20 ++
engine/tests/Benchmark.Java/Java.sh | 26 ---
engine/tests/Benchmark.Java/fuego_test.sh | 26 +++
engine/tests/Benchmark.OpenSSL/OpenSSL.sh | 13 --
engine/tests/Benchmark.OpenSSL/fuego_test.sh | 13 ++
engine/tests/Benchmark.Stream/Stream.sh | 15 --
engine/tests/Benchmark.Stream/fuego_test.sh | 15 ++
engine/tests/Benchmark.Whetstone/Whetstone.sh | 17 --
engine/tests/Benchmark.Whetstone/fuego_test.sh | 17 ++
engine/tests/Benchmark.aim7/aim7.sh | 20 --
engine/tests/Benchmark.aim7/fuego_test.sh | 20 ++
engine/tests/Benchmark.blobsallad/blobsallad.sh | 20 --
engine/tests/Benchmark.blobsallad/fuego_test.sh | 20 ++
engine/tests/Benchmark.bonnie/bonnie.sh | 32 ----
engine/tests/Benchmark.bonnie/fuego_test.sh | 32 ++++
engine/tests/Benchmark.cyclictest/cyclictest.sh | 16 --
engine/tests/Benchmark.cyclictest/fuego_test.sh | 16 ++
engine/tests/Benchmark.dbench/dbench.sh | 28 ---
engine/tests/Benchmark.dbench/fuego_test.sh | 28 +++
engine/tests/Benchmark.ebizzy/ebizzy.sh | 20 --
engine/tests/Benchmark.ebizzy/fuego_test.sh | 20 ++
engine/tests/Benchmark.ffsb/ffsb.sh | 26 ---
engine/tests/Benchmark.ffsb/fuego_test.sh | 26 +++
engine/tests/Benchmark.fio/fio.sh | 50 -----
engine/tests/Benchmark.fio/fuego_test.sh | 50 +++++
engine/tests/Benchmark.fs_mark/fs_mark.sh | 1 -
engine/tests/Benchmark.fs_mark/fuego_test.sh | 1 +
.../fuego_check_plots.sh | 14 --
.../Benchmark.fuego_check_plots/fuego_test.sh | 14 ++
engine/tests/Benchmark.gtkperf/fuego_test.sh | 30 +++
engine/tests/Benchmark.gtkperf/gtkperf.sh | 30 ---
engine/tests/Benchmark.hackbench/fuego_test.sh | 15 ++
engine/tests/Benchmark.hackbench/hackbench.sh | 15 --
engine/tests/Benchmark.himeno/fuego_test.sh | 16 ++
engine/tests/Benchmark.himeno/himeno.sh | 16 --
engine/tests/Benchmark.iperf/fuego_test.sh | 44 +++++
engine/tests/Benchmark.iperf/iperf.sh | 44 -----
engine/tests/Benchmark.linpack/fuego_test.sh | 16 ++
engine/tests/Benchmark.linpack/linpack.sh | 16 --
engine/tests/Benchmark.lmbench2/fuego_test.sh | 33 ++++
engine/tests/Benchmark.lmbench2/lmbench2.sh | 33 ----
engine/tests/Benchmark.nbench-byte/fuego_test.sh | 18 ++
engine/tests/Benchmark.nbench-byte/nbench-byte.sh | 18 --
engine/tests/Benchmark.nbench_byte/fuego_test.sh | 18 ++
engine/tests/Benchmark.nbench_byte/nbench_byte.sh | 18 --
engine/tests/Benchmark.netperf/fuego_test.sh | 27 +++
engine/tests/Benchmark.netperf/netperf.sh | 27 ---
engine/tests/Benchmark.netpipe/fuego_test.sh | 53 ++++++
engine/tests/Benchmark.netpipe/netpipe.sh | 53 ------
engine/tests/Benchmark.reboot/fuego_test.sh | 23 +++
engine/tests/Benchmark.reboot/reboot.sh | 23 ---
engine/tests/Benchmark.signaltest/fuego_test.sh | 17 ++
engine/tests/Benchmark.signaltest/signaltest.sh | 17 --
engine/tests/Benchmark.sysbench/fuego_test.sh | 1 +
engine/tests/Benchmark.sysbench/sysbench.sh | 1 -
engine/tests/Benchmark.tiobench/fuego_test.sh | 26 +++
engine/tests/Benchmark.tiobench/tiobench.sh | 26 ---
engine/tests/Benchmark.x11perf/fuego_test.sh | 24 +++
engine/tests/Benchmark.x11perf/x11perf.sh | 24 ---
engine/tests/Functional.LTP/LTP.sh | 134 -------------
engine/tests/Functional.LTP/fuego_test.sh | 134 +++++++++++++
engine/tests/Functional.OpenSSL/OpenSSL.sh | 21 ---
engine/tests/Functional.OpenSSL/fuego_test.sh | 21 +++
engine/tests/Functional.aiostress/aiostress.sh | 27 ---
engine/tests/Functional.aiostress/fuego_test.sh | 27 +++
engine/tests/Functional.arch_timer/arch_timer.sh | 26 ---
engine/tests/Functional.arch_timer/fuego_test.sh | 26 +++
engine/tests/Functional.bc/bc.sh | 28 ---
engine/tests/Functional.bc/fuego_test.sh | 28 +++
engine/tests/Functional.boost/boost.sh | 68 -------
engine/tests/Functional.boost/fuego_test.sh | 68 +++++++
engine/tests/Functional.bsdiff/bsdiff.sh | 23 ---
engine/tests/Functional.bsdiff/fuego_test.sh | 23 +++
engine/tests/Functional.bzip2/bzip2.sh | 41 ----
engine/tests/Functional.bzip2/fuego_test.sh | 41 ++++
engine/tests/Functional.cmt/cmt.sh | 22 ---
engine/tests/Functional.cmt/fuego_test.sh | 22 +++
.../Functional.commonAPI_C++/commonAPI_C++.sh | 40 ----
.../tests/Functional.commonAPI_C++/fuego_test.sh | 40 ++++
.../Functional.commonAPI_Dbus/commonAPI_Dbus.sh | 27 ---
.../tests/Functional.commonAPI_Dbus/fuego_test.sh | 27 +++
.../commonAPI_SomeIp.sh | 28 ---
.../Functional.commonAPI_SomeIp/fuego_test.sh | 28 +++
engine/tests/Functional.crashme/crashme.sh | 26 ---
engine/tests/Functional.crashme/fuego_test.sh | 26 +++
engine/tests/Functional.croco/croco.sh | 33 ----
engine/tests/Functional.croco/fuego_test.sh | 33 ++++
engine/tests/Functional.curl/curl.sh | 23 ---
engine/tests/Functional.curl/fuego_test.sh | 23 +++
engine/tests/Functional.expat/expat.sh | 45 -----
engine/tests/Functional.expat/fuego_test.sh | 45 +++++
engine/tests/Functional.fixesproto/fixesproto.sh | 26 ---
engine/tests/Functional.fixesproto/fuego_test.sh | 26 +++
engine/tests/Functional.fontconfig/fontconfig.sh | 20 --
engine/tests/Functional.fontconfig/fuego_test.sh | 20 ++
engine/tests/Functional.fsfuzz/fsfuzz.sh | 1 -
engine/tests/Functional.fsfuzz/fuego_test.sh | 1 +
engine/tests/Functional.ft2demos/ft2demos.sh | 61 ------
engine/tests/Functional.ft2demos/fuego_test.sh | 61 ++++++
engine/tests/Functional.fuego_abort/fuego_abort.sh | 119 ------------
engine/tests/Functional.fuego_abort/fuego_test.sh | 119 ++++++++++++
.../fuego_board_check.sh | 62 ------
.../Functional.fuego_board_check/fuego_test.sh | 62 ++++++
.../Functional.fuego_test_phases/fuego_test.sh | 77 ++++++++
.../fuego_test_phases.sh | 77 --------
.../tests/Functional.fuego_transport/fuego_test.sh | 57 ++++++
.../Functional.fuego_transport/fuego_transport.sh | 57 ------
engine/tests/Functional.fuse/fuego_test.sh | 27 +++
engine/tests/Functional.fuse/fuse.sh | 27 ---
engine/tests/Functional.giflib/fuego_test.sh | 55 ++++++
engine/tests/Functional.giflib/giflib.sh | 55 ------
engine/tests/Functional.glib/fuego_test.sh | 51 +++++
engine/tests/Functional.glib/glib.sh | 51 -----
engine/tests/Functional.glib2/fuego_test.sh | 79 ++++++++
engine/tests/Functional.glib2/glib2.sh | 79 --------
engine/tests/Functional.glibc/fuego_test.sh | 58 ++++++
engine/tests/Functional.glibc/glibc.sh | 58 ------
engine/tests/Functional.hciattach/fuego_test.sh | 18 ++
engine/tests/Functional.hciattach/hciattach.sh | 18 --
engine/tests/Functional.hello_world/fuego_test.sh | 22 +++
engine/tests/Functional.hello_world/hello_world.sh | 22 ---
engine/tests/Functional.imagemagick/fuego_test.sh | 63 +++++++
engine/tests/Functional.imagemagick/imagemagick.sh | 63 -------
engine/tests/Functional.iptables/fuego_test.sh | 72 +++++++
engine/tests/Functional.iptables/iptables.sh | 72 -------
engine/tests/Functional.iputils/fuego_test.sh | 31 +++
engine/tests/Functional.iputils/iputils.sh | 31 ---
engine/tests/Functional.ipv6connect/fuego_test.sh | 19 ++
engine/tests/Functional.ipv6connect/ipv6connect.sh | 19 --
engine/tests/Functional.jpeg/fuego_test.sh | 35 ++++
engine/tests/Functional.jpeg/jpeg.sh | 35 ----
engine/tests/Functional.kernel_build/fuego_test.sh | 80 ++++++++
.../tests/Functional.kernel_build/kernel_build.sh | 80 --------
engine/tests/Functional.kmod/fuego_test.sh | 32 ++++
engine/tests/Functional.kmod/kmod.sh | 32 ----
engine/tests/Functional.libogg/fuego_test.sh | 25 +++
engine/tests/Functional.libogg/libogg.sh | 25 ---
engine/tests/Functional.libpcap/fuego_test.sh | 41 ++++
engine/tests/Functional.libpcap/libpcap.sh | 41 ----
engine/tests/Functional.librsvg/fuego_test.sh | 54 ++++++
engine/tests/Functional.librsvg/librsvg.sh | 54 ------
engine/tests/Functional.libspeex/fuego_test.sh | 25 +++
engine/tests/Functional.libspeex/libspeex.sh | 25 ---
engine/tests/Functional.libtar/fuego_test.sh | 41 ++++
engine/tests/Functional.libtar/libtar.sh | 41 ----
engine/tests/Functional.libwebsocket/fuego_test.sh | 39 ++++
.../tests/Functional.libwebsocket/libwebsocket.sh | 39 ----
engine/tests/Functional.linus_stress/fuego_test.sh | 29 +++
.../tests/Functional.linus_stress/linus_stress.sh | 29 ---
engine/tests/Functional.lwip/fuego_test.sh | 48 +++++
engine/tests/Functional.lwip/lwip.sh | 48 -----
engine/tests/Functional.mesa-demos/fuego_test.sh | 1 +
engine/tests/Functional.mesa-demos/mesa-demos.sh | 1 -
engine/tests/Functional.neon/fuego_test.sh | 79 ++++++++
engine/tests/Functional.neon/neon.sh | 79 --------
engine/tests/Functional.net-tools/fuego_test.sh | 31 +++
engine/tests/Functional.net-tools/net-tools.sh | 31 ---
engine/tests/Functional.netperf/fuego_test.sh | 26 +++
engine/tests/Functional.netperf/netperf.sh | 26 ---
engine/tests/Functional.pi_tests/fuego_test.sh | 20 ++
engine/tests/Functional.pi_tests/pi_tests.sh | 20 --
engine/tests/Functional.pixman/fuego_test.sh | 209 +++++++++++++++++++++
engine/tests/Functional.pixman/pixman.sh | 209 ---------------------
engine/tests/Functional.pppd/fuego_test.sh | 42 +++++
engine/tests/Functional.pppd/pppd.sh | 42 -----
engine/tests/Functional.protobuf/fuego_test.sh | 46 +++++
engine/tests/Functional.protobuf/protobuf.sh | 46 -----
engine/tests/Functional.rmaptest/fuego_test.sh | 25 +++
engine/tests/Functional.rmaptest/rmaptest.sh | 25 ---
engine/tests/Functional.scifab/fuego_test.sh | 25 +++
engine/tests/Functional.scifab/scifab.sh | 25 ---
engine/tests/Functional.scrashme/fuego_test.sh | 21 +++
engine/tests/Functional.scrashme/scrashme.sh | 21 ---
engine/tests/Functional.sdhi_0/fuego_test.sh | 25 +++
engine/tests/Functional.sdhi_0/sdhi_0.sh | 25 ---
engine/tests/Functional.stress/fuego_test.sh | 29 +++
engine/tests/Functional.stress/stress.sh | 29 ---
engine/tests/Functional.synctest/fuego_test.sh | 28 +++
engine/tests/Functional.synctest/synctest.sh | 28 ---
engine/tests/Functional.thrift/fuego_test.sh | 146 ++++++++++++++
engine/tests/Functional.thrift/thrift.sh | 146 --------------
engine/tests/Functional.tiff/fuego_test.sh | 45 +++++
engine/tests/Functional.tiff/tiff.sh | 45 -----
engine/tests/Functional.vsomeip/fuego_test.sh | 199 ++++++++++++++++++++
engine/tests/Functional.vsomeip/vsomeip.sh | 199 --------------------
engine/tests/Functional.xorg-macros/fuego_test.sh | 25 +++
engine/tests/Functional.xorg-macros/xorg-macros.sh | 25 ---
engine/tests/Functional.zlib/fuego_test.sh | 34 ++++
engine/tests/Functional.zlib/zlib.sh | 34 ----
197 files changed, 3808 insertions(+), 3811 deletions(-)
delete mode 100755 engine/tests/Benchmark.Dhrystone/Dhrystone.sh
create mode 100755 engine/tests/Benchmark.Dhrystone/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.GLMark/GLMark.sh
create mode 100755 engine/tests/Benchmark.GLMark/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.IOzone/IOzone.sh
create mode 100755 engine/tests/Benchmark.IOzone/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.Interbench/Interbench.sh
create mode 100755 engine/tests/Benchmark.Interbench/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.Java/Java.sh
create mode 100755 engine/tests/Benchmark.Java/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.OpenSSL/OpenSSL.sh
create mode 100755 engine/tests/Benchmark.OpenSSL/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.Stream/Stream.sh
create mode 100755 engine/tests/Benchmark.Stream/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.Whetstone/Whetstone.sh
create mode 100755 engine/tests/Benchmark.Whetstone/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.aim7/aim7.sh
create mode 100755 engine/tests/Benchmark.aim7/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.blobsallad/blobsallad.sh
create mode 100755 engine/tests/Benchmark.blobsallad/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.bonnie/bonnie.sh
create mode 100755 engine/tests/Benchmark.bonnie/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.cyclictest/cyclictest.sh
create mode 100755 engine/tests/Benchmark.cyclictest/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.dbench/dbench.sh
create mode 100755 engine/tests/Benchmark.dbench/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.ebizzy/ebizzy.sh
create mode 100755 engine/tests/Benchmark.ebizzy/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.ffsb/ffsb.sh
create mode 100755 engine/tests/Benchmark.ffsb/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.fio/fio.sh
create mode 100755 engine/tests/Benchmark.fio/fuego_test.sh
delete mode 100644 engine/tests/Benchmark.fs_mark/fs_mark.sh
create mode 100644 engine/tests/Benchmark.fs_mark/fuego_test.sh
delete mode 100644 engine/tests/Benchmark.fuego_check_plots/fuego_check_plots.sh
create mode 100644 engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
create mode 100755 engine/tests/Benchmark.gtkperf/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.gtkperf/gtkperf.sh
create mode 100755 engine/tests/Benchmark.hackbench/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.hackbench/hackbench.sh
create mode 100755 engine/tests/Benchmark.himeno/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.himeno/himeno.sh
create mode 100755 engine/tests/Benchmark.iperf/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.iperf/iperf.sh
create mode 100755 engine/tests/Benchmark.linpack/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.linpack/linpack.sh
create mode 100755 engine/tests/Benchmark.lmbench2/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.lmbench2/lmbench2.sh
create mode 100755 engine/tests/Benchmark.nbench-byte/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.nbench-byte/nbench-byte.sh
create mode 100755 engine/tests/Benchmark.nbench_byte/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.nbench_byte/nbench_byte.sh
create mode 100755 engine/tests/Benchmark.netperf/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.netperf/netperf.sh
create mode 100755 engine/tests/Benchmark.netpipe/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.netpipe/netpipe.sh
create mode 100755 engine/tests/Benchmark.reboot/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.reboot/reboot.sh
create mode 100755 engine/tests/Benchmark.signaltest/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.signaltest/signaltest.sh
create mode 100644 engine/tests/Benchmark.sysbench/fuego_test.sh
delete mode 100644 engine/tests/Benchmark.sysbench/sysbench.sh
create mode 100755 engine/tests/Benchmark.tiobench/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.tiobench/tiobench.sh
create mode 100755 engine/tests/Benchmark.x11perf/fuego_test.sh
delete mode 100755 engine/tests/Benchmark.x11perf/x11perf.sh
delete mode 100755 engine/tests/Functional.LTP/LTP.sh
create mode 100755 engine/tests/Functional.LTP/fuego_test.sh
delete mode 100755 engine/tests/Functional.OpenSSL/OpenSSL.sh
create mode 100755 engine/tests/Functional.OpenSSL/fuego_test.sh
delete mode 100755 engine/tests/Functional.aiostress/aiostress.sh
create mode 100755 engine/tests/Functional.aiostress/fuego_test.sh
delete mode 100755 engine/tests/Functional.arch_timer/arch_timer.sh
create mode 100755 engine/tests/Functional.arch_timer/fuego_test.sh
delete mode 100755 engine/tests/Functional.bc/bc.sh
create mode 100755 engine/tests/Functional.bc/fuego_test.sh
delete mode 100755 engine/tests/Functional.boost/boost.sh
create mode 100755 engine/tests/Functional.boost/fuego_test.sh
delete mode 100755 engine/tests/Functional.bsdiff/bsdiff.sh
create mode 100755 engine/tests/Functional.bsdiff/fuego_test.sh
delete mode 100755 engine/tests/Functional.bzip2/bzip2.sh
create mode 100755 engine/tests/Functional.bzip2/fuego_test.sh
delete mode 100755 engine/tests/Functional.cmt/cmt.sh
create mode 100755 engine/tests/Functional.cmt/fuego_test.sh
delete mode 100755 engine/tests/Functional.commonAPI_C++/commonAPI_C++.sh
create mode 100755 engine/tests/Functional.commonAPI_C++/fuego_test.sh
delete mode 100755 engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.sh
create mode 100755 engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
delete mode 100755 engine/tests/Functional.commonAPI_SomeIp/commonAPI_SomeIp.sh
create mode 100755 engine/tests/Functional.commonAPI_SomeIp/fuego_test.sh
delete mode 100755 engine/tests/Functional.crashme/crashme.sh
create mode 100755 engine/tests/Functional.crashme/fuego_test.sh
delete mode 100755 engine/tests/Functional.croco/croco.sh
create mode 100755 engine/tests/Functional.croco/fuego_test.sh
delete mode 100755 engine/tests/Functional.curl/curl.sh
create mode 100755 engine/tests/Functional.curl/fuego_test.sh
delete mode 100755 engine/tests/Functional.expat/expat.sh
create mode 100755 engine/tests/Functional.expat/fuego_test.sh
delete mode 100755 engine/tests/Functional.fixesproto/fixesproto.sh
create mode 100755 engine/tests/Functional.fixesproto/fuego_test.sh
delete mode 100755 engine/tests/Functional.fontconfig/fontconfig.sh
create mode 100755 engine/tests/Functional.fontconfig/fuego_test.sh
delete mode 100644 engine/tests/Functional.fsfuzz/fsfuzz.sh
create mode 100644 engine/tests/Functional.fsfuzz/fuego_test.sh
delete mode 100755 engine/tests/Functional.ft2demos/ft2demos.sh
create mode 100755 engine/tests/Functional.ft2demos/fuego_test.sh
delete mode 100755 engine/tests/Functional.fuego_abort/fuego_abort.sh
create mode 100755 engine/tests/Functional.fuego_abort/fuego_test.sh
delete mode 100755 engine/tests/Functional.fuego_board_check/fuego_board_check.sh
create mode 100755 engine/tests/Functional.fuego_board_check/fuego_test.sh
create mode 100755 engine/tests/Functional.fuego_test_phases/fuego_test.sh
delete mode 100755 engine/tests/Functional.fuego_test_phases/fuego_test_phases.sh
create mode 100644 engine/tests/Functional.fuego_transport/fuego_test.sh
delete mode 100644 engine/tests/Functional.fuego_transport/fuego_transport.sh
create mode 100755 engine/tests/Functional.fuse/fuego_test.sh
delete mode 100755 engine/tests/Functional.fuse/fuse.sh
create mode 100755 engine/tests/Functional.giflib/fuego_test.sh
delete mode 100755 engine/tests/Functional.giflib/giflib.sh
create mode 100755 engine/tests/Functional.glib/fuego_test.sh
delete mode 100755 engine/tests/Functional.glib/glib.sh
create mode 100755 engine/tests/Functional.glib2/fuego_test.sh
delete mode 100755 engine/tests/Functional.glib2/glib2.sh
create mode 100755 engine/tests/Functional.glibc/fuego_test.sh
delete mode 100755 engine/tests/Functional.glibc/glibc.sh
create mode 100755 engine/tests/Functional.hciattach/fuego_test.sh
delete mode 100755 engine/tests/Functional.hciattach/hciattach.sh
create mode 100755 engine/tests/Functional.hello_world/fuego_test.sh
delete mode 100755 engine/tests/Functional.hello_world/hello_world.sh
create mode 100755 engine/tests/Functional.imagemagick/fuego_test.sh
delete mode 100755 engine/tests/Functional.imagemagick/imagemagick.sh
create mode 100755 engine/tests/Functional.iptables/fuego_test.sh
delete mode 100755 engine/tests/Functional.iptables/iptables.sh
create mode 100755 engine/tests/Functional.iputils/fuego_test.sh
delete mode 100755 engine/tests/Functional.iputils/iputils.sh
create mode 100755 engine/tests/Functional.ipv6connect/fuego_test.sh
delete mode 100755 engine/tests/Functional.ipv6connect/ipv6connect.sh
create mode 100755 engine/tests/Functional.jpeg/fuego_test.sh
delete mode 100755 engine/tests/Functional.jpeg/jpeg.sh
create mode 100755 engine/tests/Functional.kernel_build/fuego_test.sh
delete mode 100755 engine/tests/Functional.kernel_build/kernel_build.sh
create mode 100755 engine/tests/Functional.kmod/fuego_test.sh
delete mode 100755 engine/tests/Functional.kmod/kmod.sh
create mode 100755 engine/tests/Functional.libogg/fuego_test.sh
delete mode 100755 engine/tests/Functional.libogg/libogg.sh
create mode 100755 engine/tests/Functional.libpcap/fuego_test.sh
delete mode 100755 engine/tests/Functional.libpcap/libpcap.sh
create mode 100755 engine/tests/Functional.librsvg/fuego_test.sh
delete mode 100755 engine/tests/Functional.librsvg/librsvg.sh
create mode 100755 engine/tests/Functional.libspeex/fuego_test.sh
delete mode 100755 engine/tests/Functional.libspeex/libspeex.sh
create mode 100755 engine/tests/Functional.libtar/fuego_test.sh
delete mode 100755 engine/tests/Functional.libtar/libtar.sh
create mode 100755 engine/tests/Functional.libwebsocket/fuego_test.sh
delete mode 100755 engine/tests/Functional.libwebsocket/libwebsocket.sh
create mode 100755 engine/tests/Functional.linus_stress/fuego_test.sh
delete mode 100755 engine/tests/Functional.linus_stress/linus_stress.sh
create mode 100755 engine/tests/Functional.lwip/fuego_test.sh
delete mode 100755 engine/tests/Functional.lwip/lwip.sh
create mode 100644 engine/tests/Functional.mesa-demos/fuego_test.sh
delete mode 100644 engine/tests/Functional.mesa-demos/mesa-demos.sh
create mode 100755 engine/tests/Functional.neon/fuego_test.sh
delete mode 100755 engine/tests/Functional.neon/neon.sh
create mode 100755 engine/tests/Functional.net-tools/fuego_test.sh
delete mode 100755 engine/tests/Functional.net-tools/net-tools.sh
create mode 100755 engine/tests/Functional.netperf/fuego_test.sh
delete mode 100755 engine/tests/Functional.netperf/netperf.sh
create mode 100755 engine/tests/Functional.pi_tests/fuego_test.sh
delete mode 100755 engine/tests/Functional.pi_tests/pi_tests.sh
create mode 100755 engine/tests/Functional.pixman/fuego_test.sh
delete mode 100755 engine/tests/Functional.pixman/pixman.sh
create mode 100755 engine/tests/Functional.pppd/fuego_test.sh
delete mode 100755 engine/tests/Functional.pppd/pppd.sh
create mode 100755 engine/tests/Functional.protobuf/fuego_test.sh
delete mode 100755 engine/tests/Functional.protobuf/protobuf.sh
create mode 100755 engine/tests/Functional.rmaptest/fuego_test.sh
delete mode 100755 engine/tests/Functional.rmaptest/rmaptest.sh
create mode 100755 engine/tests/Functional.scifab/fuego_test.sh
delete mode 100755 engine/tests/Functional.scifab/scifab.sh
create mode 100755 engine/tests/Functional.scrashme/fuego_test.sh
delete mode 100755 engine/tests/Functional.scrashme/scrashme.sh
create mode 100755 engine/tests/Functional.sdhi_0/fuego_test.sh
delete mode 100755 engine/tests/Functional.sdhi_0/sdhi_0.sh
create mode 100755 engine/tests/Functional.stress/fuego_test.sh
delete mode 100755 engine/tests/Functional.stress/stress.sh
create mode 100755 engine/tests/Functional.synctest/fuego_test.sh
delete mode 100755 engine/tests/Functional.synctest/synctest.sh
create mode 100755 engine/tests/Functional.thrift/fuego_test.sh
delete mode 100755 engine/tests/Functional.thrift/thrift.sh
create mode 100755 engine/tests/Functional.tiff/fuego_test.sh
delete mode 100755 engine/tests/Functional.tiff/tiff.sh
create mode 100755 engine/tests/Functional.vsomeip/fuego_test.sh
delete mode 100755 engine/tests/Functional.vsomeip/vsomeip.sh
create mode 100755 engine/tests/Functional.xorg-macros/fuego_test.sh
delete mode 100755 engine/tests/Functional.xorg-macros/xorg-macros.sh
create mode 100755 engine/tests/Functional.zlib/fuego_test.sh
delete mode 100755 engine/tests/Functional.zlib/zlib.sh
diff --git a/engine/scripts/main.sh b/engine/scripts/main.sh
index 2a4589f..41e795e 100644
--- a/engine/scripts/main.sh
+++ b/engine/scripts/main.sh
@@ -27,11 +27,8 @@ fi
source $FUEGO_CORE/engine/scripts/overlays.sh
set_overlay_vars
-
source $FUEGO_CORE/engine/scripts/functions.sh
-
-# FIXTHIS: use a fixed name like fuego_test.sh instead of $TESTNAME.sh
-source $FUEGO_CORE/engine/tests/$TESTDIR/$TESTNAME.sh
+source $FUEGO_CORE/engine/tests/$TESTDIR/fuego_test.sh
echo "##### doing fuego phase: pre_test ########"
pre_test
diff --git a/engine/tests/Benchmark.Dhrystone/Dhrystone.sh b/engine/tests/Benchmark.Dhrystone/Dhrystone.sh
deleted file mode 100755
index bc3f4c8..0000000
--- a/engine/tests/Benchmark.Dhrystone/Dhrystone.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-tarball=Dhrystone.tar.bz2
-
-function test_pre_check {
- assert_define BENCHMARK_DHRYSTONE_LOOPS
-}
-
-function test_build {
- patch -p0 -N -s < $TEST_HOME/dhry_1.c.patch || return 1
- CFLAGS+=" -DTIME"
- LDFLAGS+=" -lm"
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch test_suite_ready || return 1
-}
-
-function test_deploy {
- put dhrystone $BOARD_TESTDIR/fuego.$TESTDIR/ || return 1
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./dhrystone $BENCHMARK_DHRYSTONE_LOOPS"
-}
-
-
diff --git a/engine/tests/Benchmark.Dhrystone/fuego_test.sh b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
new file mode 100755
index 0000000..bc3f4c8
--- /dev/null
+++ b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
@@ -0,0 +1,22 @@
+tarball=Dhrystone.tar.bz2
+
+function test_pre_check {
+ assert_define BENCHMARK_DHRYSTONE_LOOPS
+}
+
+function test_build {
+ patch -p0 -N -s < $TEST_HOME/dhry_1.c.patch || return 1
+ CFLAGS+=" -DTIME"
+ LDFLAGS+=" -lm"
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch test_suite_ready || return 1
+}
+
+function test_deploy {
+ put dhrystone $BOARD_TESTDIR/fuego.$TESTDIR/ || return 1
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./dhrystone $BENCHMARK_DHRYSTONE_LOOPS"
+}
+
+
diff --git a/engine/tests/Benchmark.GLMark/GLMark.sh b/engine/tests/Benchmark.GLMark/GLMark.sh
deleted file mode 100755
index f409109..0000000
--- a/engine/tests/Benchmark.GLMark/GLMark.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-tarball=GLMark-0.5.2.1.tar.gz
-
-function test_build {
-# patch -p1 -N -s < ../../tarballs/$TESTDIR.patch
- export PATH=/usr/local/bin:$PATH;
- CFLAGS+="${CFLAGS}" $CXX -O0 -ggdb -I${SDKROOT}/usr/include \
- -L${SDKROOT}/usr/lib -Wl,-rpath-link=${SDKROOT}/usr/lib \
- -L${SDKROOT}/lib \
- *.cpp -o glmark -lSDL -lGL \
- -lGLU -lGLEW && touch test_suite_ready || build_error "error while building test"
-# -Wl,--allow-shlib-undefined *.cpp -o glmark -lSDL -lGL \
-}
-
-function test_deploy {
- put glmark data $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- safe_cmd "{ cd $BOARD_TESTDIR/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; }"
-}
-
-
diff --git a/engine/tests/Benchmark.GLMark/fuego_test.sh b/engine/tests/Benchmark.GLMark/fuego_test.sh
new file mode 100755
index 0000000..f409109
--- /dev/null
+++ b/engine/tests/Benchmark.GLMark/fuego_test.sh
@@ -0,0 +1,22 @@
+tarball=GLMark-0.5.2.1.tar.gz
+
+function test_build {
+# patch -p1 -N -s < ../../tarballs/$TESTDIR.patch
+ export PATH=/usr/local/bin:$PATH;
+ CFLAGS+="${CFLAGS}" $CXX -O0 -ggdb -I${SDKROOT}/usr/include \
+ -L${SDKROOT}/usr/lib -Wl,-rpath-link=${SDKROOT}/usr/lib \
+ -L${SDKROOT}/lib \
+ *.cpp -o glmark -lSDL -lGL \
+ -lGLU -lGLEW && touch test_suite_ready || build_error "error while building test"
+# -Wl,--allow-shlib-undefined *.cpp -o glmark -lSDL -lGL \
+}
+
+function test_deploy {
+ put glmark data $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ safe_cmd "{ cd $BOARD_TESTDIR/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; }"
+}
+
+
diff --git a/engine/tests/Benchmark.IOzone/IOzone.sh b/engine/tests/Benchmark.IOzone/IOzone.sh
deleted file mode 100755
index fe06e75..0000000
--- a/engine/tests/Benchmark.IOzone/IOzone.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-tarball=iozone3_353.tar
-
-function test_build {
- cd src/current
-
- if [ "$ARCHITECTURE" == "ia32" ]; then
- TARGET=linux
- elif [ "$ARCHITECTURE" == "arm" ]; then
- TARGET=linux-arm
- elif [ "$ARCHITECTURE" == "x86_64" ]; then
- TARGET=linux-AMD64
- else
- echo "platform based on $ARCHITECTURE is not supported by benchmark"
- build_error "error while building test"
- fi
-
- make $TARGET GCC="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- cd src/current
- put fileop iozone pit_server $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-# function test_run {
-# report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $file_size" $BOARD_TESTDIR/fuego.$TESTDIR/$TESTDIR_tmp.log
-# safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; cat $BOARD_TESTDIR/fuego.$TESTDIR/$TESTDIR_tmp.log | tail -n 139 | tee "
-# }
-
-function test_run {
- assert_define BENCHMARK_IOZONE_MOUNT_BLOCKDEV
- assert_define BENCHMARK_IOZONE_MOUNT_POINT
- assert_define BENCHMARK_IOZONE_FILE_SIZE
- assert_define BENCHMARK_IOZONE_TESTS
-
- hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
-
- report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R -b $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx -g $BENCHMARK_IOZONE_FILE_SIZE" $BOARD_TESTDIR/fuego.$TESTDIR/Benchmark.IOzone.log
- get $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx ${LOGDIR}/results.xlsx
- safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; cat $BOARD_TESTDIR/fuego.$TESTDIR/Benchmark.IOzone.log | tail -n 139 | tee "
-
- hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
-}
-
-function test_cleanup {
- kill_procs iozone
-}
-
-
diff --git a/engine/tests/Benchmark.IOzone/fuego_test.sh b/engine/tests/Benchmark.IOzone/fuego_test.sh
new file mode 100755
index 0000000..fe06e75
--- /dev/null
+++ b/engine/tests/Benchmark.IOzone/fuego_test.sh
@@ -0,0 +1,49 @@
+tarball=iozone3_353.tar
+
+function test_build {
+ cd src/current
+
+ if [ "$ARCHITECTURE" == "ia32" ]; then
+ TARGET=linux
+ elif [ "$ARCHITECTURE" == "arm" ]; then
+ TARGET=linux-arm
+ elif [ "$ARCHITECTURE" == "x86_64" ]; then
+ TARGET=linux-AMD64
+ else
+ echo "platform based on $ARCHITECTURE is not supported by benchmark"
+ build_error "error while building test"
+ fi
+
+ make $TARGET GCC="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ cd src/current
+ put fileop iozone pit_server $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+# function test_run {
+# report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./iozone -a -i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9 -O -R -g $file_size" $BOARD_TESTDIR/fuego.$TESTDIR/$TESTDIR_tmp.log
+# safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; cat $BOARD_TESTDIR/fuego.$TESTDIR/$TESTDIR_tmp.log | tail -n 139 | tee "
+# }
+
+function test_run {
+ assert_define BENCHMARK_IOZONE_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_IOZONE_MOUNT_POINT
+ assert_define BENCHMARK_IOZONE_FILE_SIZE
+ assert_define BENCHMARK_IOZONE_TESTS
+
+ hd_test_mount_prepare $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
+
+ report "cd $BENCHMARK_IOZONE_MOUNT_POINT; $BOARD_TESTDIR/fuego.$TESTDIR/iozone -a $BENCHMARK_IOZONE_TESTS -O -R -b $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx -g $BENCHMARK_IOZONE_FILE_SIZE" $BOARD_TESTDIR/fuego.$TESTDIR/Benchmark.IOzone.log
+ get $BOARD_TESTDIR/fuego.$TESTDIR/results.${BUILD_ID}.${BUILD_NUMBER}.xlsx ${LOGDIR}/results.xlsx
+ safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; cat $BOARD_TESTDIR/fuego.$TESTDIR/Benchmark.IOzone.log | tail -n 139 | tee "
+
+ hd_test_clean_umount $BENCHMARK_IOZONE_MOUNT_BLOCKDEV $BENCHMARK_IOZONE_MOUNT_POINT
+}
+
+function test_cleanup {
+ kill_procs iozone
+}
+
+
diff --git a/engine/tests/Benchmark.Interbench/Interbench.sh b/engine/tests/Benchmark.Interbench/Interbench.sh
deleted file mode 100755
index 5f950e2..0000000
--- a/engine/tests/Benchmark.Interbench/Interbench.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-tarball=interbench-0.31.tar.bz2
-
-function test_build {
- patch -p0 < $TEST_HOME/interbench.c.patch
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put interbench $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./interbench -L 1 || ./interbench -L 1"
-}
-
-function test_cleanup {
- kill_procs interbench
-}
-
-
diff --git a/engine/tests/Benchmark.Interbench/fuego_test.sh b/engine/tests/Benchmark.Interbench/fuego_test.sh
new file mode 100755
index 0000000..5f950e2
--- /dev/null
+++ b/engine/tests/Benchmark.Interbench/fuego_test.sh
@@ -0,0 +1,20 @@
+tarball=interbench-0.31.tar.bz2
+
+function test_build {
+ patch -p0 < $TEST_HOME/interbench.c.patch
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put interbench $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./interbench -L 1 || ./interbench -L 1"
+}
+
+function test_cleanup {
+ kill_procs interbench
+}
+
+
diff --git a/engine/tests/Benchmark.Java/Java.sh b/engine/tests/Benchmark.Java/Java.sh
deleted file mode 100755
index b0483d2..0000000
--- a/engine/tests/Benchmark.Java/Java.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-tarball=java_perf.tar
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put *.jar $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -cp scimark2lib.jar jnt.scimark2.commandline"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar avrora" $BOARD_TESTDIR/
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar jython"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar luindex"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar lusearch"
- #report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar tomcat"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar xalan"
-}
-
-function test_cleanup {
- # this seems dangerous - what if there are other java programs running?
- #kill_procs java
-}
-
-
diff --git a/engine/tests/Benchmark.Java/fuego_test.sh b/engine/tests/Benchmark.Java/fuego_test.sh
new file mode 100755
index 0000000..b0483d2
--- /dev/null
+++ b/engine/tests/Benchmark.Java/fuego_test.sh
@@ -0,0 +1,26 @@
+tarball=java_perf.tar
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put *.jar $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -cp scimark2lib.jar jnt.scimark2.commandline"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar avrora" $BOARD_TESTDIR/
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar jython"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar luindex"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar lusearch"
+ #report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar tomcat"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; java -jar dacapo-9.12-bach.jar xalan"
+}
+
+function test_cleanup {
+ # this seems dangerous - what if there are other java programs running?
+ #kill_procs java
+}
+
+
diff --git a/engine/tests/Benchmark.OpenSSL/OpenSSL.sh b/engine/tests/Benchmark.OpenSSL/OpenSSL.sh
deleted file mode 100755
index 34973fb..0000000
--- a/engine/tests/Benchmark.OpenSSL/OpenSSL.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# some functions are shared between Benchmark.OpenSSL and Functional.OpenSSL
-tarball=../OpenSSL/openssl-0.9.8j.tar.gz
-source $FUEGO_CORE/engine/tests/OpenSSL/openssl.sh
-
-function test_deploy {
- put apps $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; apps/openssl speed"
-}
-
-
diff --git a/engine/tests/Benchmark.OpenSSL/fuego_test.sh b/engine/tests/Benchmark.OpenSSL/fuego_test.sh
new file mode 100755
index 0000000..34973fb
--- /dev/null
+++ b/engine/tests/Benchmark.OpenSSL/fuego_test.sh
@@ -0,0 +1,13 @@
+# some functions are shared between Benchmark.OpenSSL and Functional.OpenSSL
+tarball=../OpenSSL/openssl-0.9.8j.tar.gz
+source $FUEGO_CORE/engine/tests/OpenSSL/openssl.sh
+
+function test_deploy {
+ put apps $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; apps/openssl speed"
+}
+
+
diff --git a/engine/tests/Benchmark.Stream/Stream.sh b/engine/tests/Benchmark.Stream/Stream.sh
deleted file mode 100755
index ddeb26c..0000000
--- a/engine/tests/Benchmark.Stream/Stream.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-tarball=stream.tar.bz2
-
-function test_build {
- make stream_c.exe CFLAGS+="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put stream_c.exe $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./stream_c.exe"
-}
-
-
diff --git a/engine/tests/Benchmark.Stream/fuego_test.sh b/engine/tests/Benchmark.Stream/fuego_test.sh
new file mode 100755
index 0000000..ddeb26c
--- /dev/null
+++ b/engine/tests/Benchmark.Stream/fuego_test.sh
@@ -0,0 +1,15 @@
+tarball=stream.tar.bz2
+
+function test_build {
+ make stream_c.exe CFLAGS+="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put stream_c.exe $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./stream_c.exe"
+}
+
+
diff --git a/engine/tests/Benchmark.Whetstone/Whetstone.sh b/engine/tests/Benchmark.Whetstone/Whetstone.sh
deleted file mode 100755
index 925bfcb..0000000
--- a/engine/tests/Benchmark.Whetstone/Whetstone.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-tarball=Whetstone.tar.bz2
-
-function test_build {
- CFLAGS+=" -DTIME"
- make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" LIBS=" -lm" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put whetstone $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_WHETSTONE_LOOPS
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./whetstone $BENCHMARK_WHETSTONE_LOOPS"
-}
-
-
diff --git a/engine/tests/Benchmark.Whetstone/fuego_test.sh b/engine/tests/Benchmark.Whetstone/fuego_test.sh
new file mode 100755
index 0000000..925bfcb
--- /dev/null
+++ b/engine/tests/Benchmark.Whetstone/fuego_test.sh
@@ -0,0 +1,17 @@
+tarball=Whetstone.tar.bz2
+
+function test_build {
+ CFLAGS+=" -DTIME"
+ make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" LIBS=" -lm" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put whetstone $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_WHETSTONE_LOOPS
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./whetstone $BENCHMARK_WHETSTONE_LOOPS"
+}
+
+
diff --git a/engine/tests/Benchmark.aim7/aim7.sh b/engine/tests/Benchmark.aim7/aim7.sh
deleted file mode 100755
index 2cee552..0000000
--- a/engine/tests/Benchmark.aim7/aim7.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-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=$BOARD_TESTDIR/$TESTDIR --datarootdir=$BOARD_TESTDIR/$TESTDIR
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put src/reaim $BOARD_TESTDIR/fuego.$TESTDIR/
- put data $BOARD_TESTDIR/fuego.$TESTDIR/
- put scripts $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; mkdir /tmp/diskdir; ./reaim -c ./data/reaim.config -f ./data/workfile.short"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./reaim -c ./data/reaim.config -f ./data/workfile.all_utime"
-}
-
-
diff --git a/engine/tests/Benchmark.aim7/fuego_test.sh b/engine/tests/Benchmark.aim7/fuego_test.sh
new file mode 100755
index 0000000..2cee552
--- /dev/null
+++ b/engine/tests/Benchmark.aim7/fuego_test.sh
@@ -0,0 +1,20 @@
+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=$BOARD_TESTDIR/$TESTDIR --datarootdir=$BOARD_TESTDIR/$TESTDIR
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put src/reaim $BOARD_TESTDIR/fuego.$TESTDIR/
+ put data $BOARD_TESTDIR/fuego.$TESTDIR/
+ put scripts $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; mkdir /tmp/diskdir; ./reaim -c ./data/reaim.config -f ./data/workfile.short"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./reaim -c ./data/reaim.config -f ./data/workfile.all_utime"
+}
+
+
diff --git a/engine/tests/Benchmark.blobsallad/blobsallad.sh b/engine/tests/Benchmark.blobsallad/blobsallad.sh
deleted file mode 100755
index ed5273d..0000000
--- a/engine/tests/Benchmark.blobsallad/blobsallad.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-tarball=blobsallad-src.tar.bz2
-
-function test_build {
- patch -p0 -N -s < $TEST_HOME/blobsallad.Makefile.patch
- patch -p0 -N -s < $TEST_HOME/blobsallad.auto.patch
- patch -p0 -N -s < $TEST_HOME/bs_main.c.patch
-
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" SDKROOT="$SDKROOT" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put blobsallad $BOARD_TESTDIR/fuego.$TESTDIR/
- put maps $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1, a, \"x\"); exit(system(\"./blobsallad \" a[1] a[2]))}'"
-}
-
-
diff --git a/engine/tests/Benchmark.blobsallad/fuego_test.sh b/engine/tests/Benchmark.blobsallad/fuego_test.sh
new file mode 100755
index 0000000..ed5273d
--- /dev/null
+++ b/engine/tests/Benchmark.blobsallad/fuego_test.sh
@@ -0,0 +1,20 @@
+tarball=blobsallad-src.tar.bz2
+
+function test_build {
+ patch -p0 -N -s < $TEST_HOME/blobsallad.Makefile.patch
+ patch -p0 -N -s < $TEST_HOME/blobsallad.auto.patch
+ patch -p0 -N -s < $TEST_HOME/bs_main.c.patch
+
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" SDKROOT="$SDKROOT" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put blobsallad $BOARD_TESTDIR/fuego.$TESTDIR/
+ put maps $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1, a, \"x\"); exit(system(\"./blobsallad \" a[1] a[2]))}'"
+}
+
+
diff --git a/engine/tests/Benchmark.bonnie/bonnie.sh b/engine/tests/Benchmark.bonnie/bonnie.sh
deleted file mode 100755
index a7f7c0d..0000000
--- a/engine/tests/Benchmark.bonnie/bonnie.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-tarball=bonnie++-1.03e.tar.gz
-
-function test_build {
- ./configure --host=$HOST --build=`uname -m`-linux-gnu;
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put bonnie++ $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_BONNIE_MOUNT_BLOCKDEV
- assert_define BENCHMARK_BONNIE_MOUNT_POINT
- assert_define BENCHMARK_BONNIE_SIZE
- assert_define BENCHMARK_BONNIE_RAM
- assert_define BENCHMARK_BONNIE_ROOT
-
- hd_test_mount_prepare $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT
-
- if [ "$BENCHMARK_BONNIE_ROOT" == "true" ]; then
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -u 0:0 -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM"
- else
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM"
- fi
-
- sleep 60
-
- hd_test_clean_umount $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT
-}
-
-
diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
new file mode 100755
index 0000000..a7f7c0d
--- /dev/null
+++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
@@ -0,0 +1,32 @@
+tarball=bonnie++-1.03e.tar.gz
+
+function test_build {
+ ./configure --host=$HOST --build=`uname -m`-linux-gnu;
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put bonnie++ $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_BONNIE_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_BONNIE_MOUNT_POINT
+ assert_define BENCHMARK_BONNIE_SIZE
+ assert_define BENCHMARK_BONNIE_RAM
+ assert_define BENCHMARK_BONNIE_ROOT
+
+ hd_test_mount_prepare $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT
+
+ if [ "$BENCHMARK_BONNIE_ROOT" == "true" ]; then
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -u 0:0 -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM"
+ else
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM"
+ fi
+
+ sleep 60
+
+ hd_test_clean_umount $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT
+}
+
+
diff --git a/engine/tests/Benchmark.cyclictest/cyclictest.sh b/engine/tests/Benchmark.cyclictest/cyclictest.sh
deleted file mode 100755
index 657de9b..0000000
--- a/engine/tests/Benchmark.cyclictest/cyclictest.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-tarball=cyclictest.tar.gz
-
-function test_build {
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put cyclictest $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_CYCLICTEST_LOOPS
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./cyclictest -t 2 -l $BENCHMARK_CYCLICTEST_LOOPS -q"
-}
-
-
diff --git a/engine/tests/Benchmark.cyclictest/fuego_test.sh b/engine/tests/Benchmark.cyclictest/fuego_test.sh
new file mode 100755
index 0000000..657de9b
--- /dev/null
+++ b/engine/tests/Benchmark.cyclictest/fuego_test.sh
@@ -0,0 +1,16 @@
+tarball=cyclictest.tar.gz
+
+function test_build {
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put cyclictest $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_CYCLICTEST_LOOPS
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./cyclictest -t 2 -l $BENCHMARK_CYCLICTEST_LOOPS -q"
+}
+
+
diff --git a/engine/tests/Benchmark.dbench/dbench.sh b/engine/tests/Benchmark.dbench/dbench.sh
deleted file mode 100755
index d84c820..0000000
--- a/engine/tests/Benchmark.dbench/dbench.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-tarball=dbench-3.04.tar.gz
-
-function test_build {
- patch -N -s -p1 < $TEST_HOME/dbench_startup.patch
- ./configure --host=$HOST --build=`uname -m`-linux-gnu CFLAGS="$CFLAGS";
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put dbench client.txt $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_DBENCH_MOUNT_BLOCKDEV
- assert_define BENCHMARK_DBENCH_MOUNT_POINT
- assert_define BENCHMARK_DBENCH_TIMELIMIT
- assert_define BENCHMARK_DBENCH_NPROCS
-
- hd_test_mount_prepare $BENCHMARK_DBENCH_MOUNT_BLOCKDEV $BENCHMARK_DBENCH_MOUNT_POINT
-
- report "cd $BOARD_TESTDIR/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
-}
-
-
diff --git a/engine/tests/Benchmark.dbench/fuego_test.sh b/engine/tests/Benchmark.dbench/fuego_test.sh
new file mode 100755
index 0000000..d84c820
--- /dev/null
+++ b/engine/tests/Benchmark.dbench/fuego_test.sh
@@ -0,0 +1,28 @@
+tarball=dbench-3.04.tar.gz
+
+function test_build {
+ patch -N -s -p1 < $TEST_HOME/dbench_startup.patch
+ ./configure --host=$HOST --build=`uname -m`-linux-gnu CFLAGS="$CFLAGS";
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put dbench client.txt $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_DBENCH_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_DBENCH_MOUNT_POINT
+ assert_define BENCHMARK_DBENCH_TIMELIMIT
+ assert_define BENCHMARK_DBENCH_NPROCS
+
+ hd_test_mount_prepare $BENCHMARK_DBENCH_MOUNT_BLOCKDEV $BENCHMARK_DBENCH_MOUNT_POINT
+
+ report "cd $BOARD_TESTDIR/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
+}
+
+
diff --git a/engine/tests/Benchmark.ebizzy/ebizzy.sh b/engine/tests/Benchmark.ebizzy/ebizzy.sh
deleted file mode 100755
index 1e1e7ac..0000000
--- a/engine/tests/Benchmark.ebizzy/ebizzy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-tarball=ebizzy-0.3.tar.gz
-
-function test_build {
- $CC -Wall -Wshadow -lpthread -o ebizzy ebizzy.c && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put ebizzy $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_EBIZZY_CHUNKS
- assert_define BENCHMARK_EBIZZY_CHUNK_SIZE
- assert_define BENCHMARK_EBIZZY_TIME
- assert_define BENCHMARK_EBIZZY_THREADS
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ebizzy -m -n $BENCHMARK_EBIZZY_CHUNKS -P -R -s $BENCHMARK_EBIZZY_CHUNK_SIZE -S $BENCHMARK_EBIZZY_TIME -t $BENCHMARK_EBIZZY_THREADS"
-}
-
-
diff --git a/engine/tests/Benchmark.ebizzy/fuego_test.sh b/engine/tests/Benchmark.ebizzy/fuego_test.sh
new file mode 100755
index 0000000..1e1e7ac
--- /dev/null
+++ b/engine/tests/Benchmark.ebizzy/fuego_test.sh
@@ -0,0 +1,20 @@
+tarball=ebizzy-0.3.tar.gz
+
+function test_build {
+ $CC -Wall -Wshadow -lpthread -o ebizzy ebizzy.c && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put ebizzy $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_EBIZZY_CHUNKS
+ assert_define BENCHMARK_EBIZZY_CHUNK_SIZE
+ assert_define BENCHMARK_EBIZZY_TIME
+ assert_define BENCHMARK_EBIZZY_THREADS
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ebizzy -m -n $BENCHMARK_EBIZZY_CHUNKS -P -R -s $BENCHMARK_EBIZZY_CHUNK_SIZE -S $BENCHMARK_EBIZZY_TIME -t $BENCHMARK_EBIZZY_THREADS"
+}
+
+
diff --git a/engine/tests/Benchmark.ffsb/ffsb.sh b/engine/tests/Benchmark.ffsb/ffsb.sh
deleted file mode 100755
index 2037c8f..0000000
--- a/engine/tests/Benchmark.ffsb/ffsb.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-tarball=ffsb-6.0-rc2.tar.bz2
-
-function test_build {
- ./configure --host=$HOST --build=`uname -m`-linux-gnu CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP CFLAGS="$CFLAGS";
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- assert_define BENCHMARK_FFSB_MOUNT_POINT
- sed -i "s|/mnt/test1|$BENCHMARK_FFSB_MOUNT_POINT/fuego.$TESTDIR|g" examples/profile_everything
- put ffsb $BOARD_TESTDIR/fuego.$TESTDIR/
- put examples/profile_everything $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_FFSB_MOUNT_BLOCKDEV
- assert_define BENCHMARK_FFSB_MOUNT_POINT
-
- hd_test_mount_prepare $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ffsb profile_everything"
-
- hd_test_clean_umount $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT
-}
-
-
diff --git a/engine/tests/Benchmark.ffsb/fuego_test.sh b/engine/tests/Benchmark.ffsb/fuego_test.sh
new file mode 100755
index 0000000..2037c8f
--- /dev/null
+++ b/engine/tests/Benchmark.ffsb/fuego_test.sh
@@ -0,0 +1,26 @@
+tarball=ffsb-6.0-rc2.tar.bz2
+
+function test_build {
+ ./configure --host=$HOST --build=`uname -m`-linux-gnu CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP CFLAGS="$CFLAGS";
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ assert_define BENCHMARK_FFSB_MOUNT_POINT
+ sed -i "s|/mnt/test1|$BENCHMARK_FFSB_MOUNT_POINT/fuego.$TESTDIR|g" examples/profile_everything
+ put ffsb $BOARD_TESTDIR/fuego.$TESTDIR/
+ put examples/profile_everything $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_FFSB_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_FFSB_MOUNT_POINT
+
+ hd_test_mount_prepare $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ffsb profile_everything"
+
+ hd_test_clean_umount $BENCHMARK_FFSB_MOUNT_BLOCKDEV $BENCHMARK_FFSB_MOUNT_POINT
+}
+
+
diff --git a/engine/tests/Benchmark.fio/fio.sh b/engine/tests/Benchmark.fio/fio.sh
deleted file mode 100755
index 212ed62..0000000
--- a/engine/tests/Benchmark.fio/fio.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#tarball=fio-1.58.tar.gz
-tarball=fio-2.0.8.tar.gz
-
-function test_pre_check {
- assert_define BENCHMARK_FIO_MOUNT_BLOCKDEV
- assert_define BENCHMARK_FIO_MOUNT_POINT
- assert_define BENCHMARK_FIO_TIMEOUT
-}
-
-function test_build {
-# patch -p1 -N -s < $TEST_HOME/fio-1.58.patch
- patch -p1 -N -s < $TEST_HOME/fio-2.0.8.patch
-
-# >/dev/null
-
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
- touch ../test_suite_ready
-}
-
-function test_deploy {
- cd examples
- cp fsx fsx-current
- cp ssd-test ssd-test-current
-
- # 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/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/fuego.$TESTDIR" >> fsx-current
- cd -
-
- put fio examples/fsx-current examples/ssd-test-current $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- hd_test_mount_prepare $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./fio ssd-test-current --timeout=$BENCHMARK_FIO_TIMEOUT"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./fio fsx-current --timeout=$BENCHMARK_FIO_TIMEOUT"
-
- hd_test_clean_umount $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT
-}
-
-function test_cleanup {
- kill_procs fio
-}
-
-
diff --git a/engine/tests/Benchmark.fio/fuego_test.sh b/engine/tests/Benchmark.fio/fuego_test.sh
new file mode 100755
index 0000000..212ed62
--- /dev/null
+++ b/engine/tests/Benchmark.fio/fuego_test.sh
@@ -0,0 +1,50 @@
+#tarball=fio-1.58.tar.gz
+tarball=fio-2.0.8.tar.gz
+
+function test_pre_check {
+ assert_define BENCHMARK_FIO_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_FIO_MOUNT_POINT
+ assert_define BENCHMARK_FIO_TIMEOUT
+}
+
+function test_build {
+# patch -p1 -N -s < $TEST_HOME/fio-1.58.patch
+ patch -p1 -N -s < $TEST_HOME/fio-2.0.8.patch
+
+# >/dev/null
+
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
+ touch ../test_suite_ready
+}
+
+function test_deploy {
+ cd examples
+ cp fsx fsx-current
+ cp ssd-test ssd-test-current
+
+ # 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/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/fuego.$TESTDIR" >> fsx-current
+ cd -
+
+ put fio examples/fsx-current examples/ssd-test-current $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ hd_test_mount_prepare $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./fio ssd-test-current --timeout=$BENCHMARK_FIO_TIMEOUT"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./fio fsx-current --timeout=$BENCHMARK_FIO_TIMEOUT"
+
+ hd_test_clean_umount $BENCHMARK_FIO_MOUNT_BLOCKDEV $BENCHMARK_FIO_MOUNT_POINT
+}
+
+function test_cleanup {
+ kill_procs fio
+}
+
+
diff --git a/engine/tests/Benchmark.fs_mark/fs_mark.sh b/engine/tests/Benchmark.fs_mark/fs_mark.sh
deleted file mode 100644
index ea36f75..0000000
--- a/engine/tests/Benchmark.fs_mark/fs_mark.sh
+++ /dev/null
@@ -1 +0,0 @@
-FIXTHIS: no test definition!
diff --git a/engine/tests/Benchmark.fs_mark/fuego_test.sh b/engine/tests/Benchmark.fs_mark/fuego_test.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Benchmark.fs_mark/fuego_test.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Benchmark.fuego_check_plots/fuego_check_plots.sh b/engine/tests/Benchmark.fuego_check_plots/fuego_check_plots.sh
deleted file mode 100644
index 562b659..0000000
--- a/engine/tests/Benchmark.fuego_check_plots/fuego_check_plots.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- return 0
-}
-
-function test_run {
- RESULT=$(( 1000 + (RANDOM % 600 - 300) ))
- report "echo fuego_check_plots result: $RESULT"
-}
-
-
diff --git a/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh b/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
new file mode 100644
index 0000000..562b659
--- /dev/null
+++ b/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
@@ -0,0 +1,14 @@
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ return 0
+}
+
+function test_run {
+ RESULT=$(( 1000 + (RANDOM % 600 - 300) ))
+ report "echo fuego_check_plots result: $RESULT"
+}
+
+
diff --git a/engine/tests/Benchmark.gtkperf/fuego_test.sh b/engine/tests/Benchmark.gtkperf/fuego_test.sh
new file mode 100755
index 0000000..20e9a29
--- /dev/null
+++ b/engine/tests/Benchmark.gtkperf/fuego_test.sh
@@ -0,0 +1,30 @@
+tarball=gtkperf-0.40.tar.bz2
+
+function test_build {
+ cd src
+ patch -p0 -N -s < $TEST_HOME/gtkperf_callbacks.c.patch
+ patch -p0 -N -s < $TEST_HOME/gtkperf_interface.c.patch
+ patch -p0 -N -s < $TEST_HOME/gtkperf_main.c.patch
+ patch -p0 -N -s < $TEST_HOME/gtkperf_appdata.h.patch
+ cd ..
+ export PATH=/usr/local/bin:$PATH
+ ./configure --prefix=$BOARD_TESTDIR/$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 $BOARD_TESTDIR/fuego.$TESTDIR/share/pixmaps"
+ put src/gtkperf $BOARD_TESTDIR/fuego.$TESTDIR/
+ put pixmaps/*.png $BOARD_TESTDIR/fuego.$TESTDIR/share/pixmaps
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1,a,\"x\"); exit(system(\"./gtkperf -a -x\" a[1]\" -y\" a[2]))}'"
+}
+
+function test_cleanup {
+ kill_procs gtkperf
+}
+
+
diff --git a/engine/tests/Benchmark.gtkperf/gtkperf.sh b/engine/tests/Benchmark.gtkperf/gtkperf.sh
deleted file mode 100755
index 20e9a29..0000000
--- a/engine/tests/Benchmark.gtkperf/gtkperf.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-tarball=gtkperf-0.40.tar.bz2
-
-function test_build {
- cd src
- patch -p0 -N -s < $TEST_HOME/gtkperf_callbacks.c.patch
- patch -p0 -N -s < $TEST_HOME/gtkperf_interface.c.patch
- patch -p0 -N -s < $TEST_HOME/gtkperf_main.c.patch
- patch -p0 -N -s < $TEST_HOME/gtkperf_appdata.h.patch
- cd ..
- export PATH=/usr/local/bin:$PATH
- ./configure --prefix=$BOARD_TESTDIR/$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 $BOARD_TESTDIR/fuego.$TESTDIR/share/pixmaps"
- put src/gtkperf $BOARD_TESTDIR/fuego.$TESTDIR/
- put pixmaps/*.png $BOARD_TESTDIR/fuego.$TESTDIR/share/pixmaps
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; xrandr | awk '/\*/ {split(\$1,a,\"x\"); exit(system(\"./gtkperf -a -x\" a[1]\" -y\" a[2]))}'"
-}
-
-function test_cleanup {
- kill_procs gtkperf
-}
-
-
diff --git a/engine/tests/Benchmark.hackbench/fuego_test.sh b/engine/tests/Benchmark.hackbench/fuego_test.sh
new file mode 100755
index 0000000..3b45dd3
--- /dev/null
+++ b/engine/tests/Benchmark.hackbench/fuego_test.sh
@@ -0,0 +1,15 @@
+tarball=hackbench.tar.gz
+
+function test_build {
+ $CC -lpthread hackbench.c -o hackbench && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put hackbench $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./hackbench $groups"
+}
+
+
diff --git a/engine/tests/Benchmark.hackbench/hackbench.sh b/engine/tests/Benchmark.hackbench/hackbench.sh
deleted file mode 100755
index 3b45dd3..0000000
--- a/engine/tests/Benchmark.hackbench/hackbench.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-tarball=hackbench.tar.gz
-
-function test_build {
- $CC -lpthread hackbench.c -o hackbench && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put hackbench $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./hackbench $groups"
-}
-
-
diff --git a/engine/tests/Benchmark.himeno/fuego_test.sh b/engine/tests/Benchmark.himeno/fuego_test.sh
new file mode 100755
index 0000000..debce2f
--- /dev/null
+++ b/engine/tests/Benchmark.himeno/fuego_test.sh
@@ -0,0 +1,16 @@
+tarball=himeno.tar.bz2
+
+function test_build {
+ CFLAGS+=" -O3"
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put bmt $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./bmt"
+}
+
+
diff --git a/engine/tests/Benchmark.himeno/himeno.sh b/engine/tests/Benchmark.himeno/himeno.sh
deleted file mode 100755
index debce2f..0000000
--- a/engine/tests/Benchmark.himeno/himeno.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-tarball=himeno.tar.bz2
-
-function test_build {
- CFLAGS+=" -O3"
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put bmt $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./bmt"
-}
-
-
diff --git a/engine/tests/Benchmark.iperf/fuego_test.sh b/engine/tests/Benchmark.iperf/fuego_test.sh
new file mode 100755
index 0000000..74b4437
--- /dev/null
+++ b/engine/tests/Benchmark.iperf/fuego_test.sh
@@ -0,0 +1,44 @@
+tarball=iperf-2.0.5.tar.gz
+
+function test_build {
+ ./configure --host=$HOST --build=`./config.guess`
+ make config.h
+ sed -i -e "s/#define HAVE_MALLOC 0/#define HAVE_MALLOC 1/g" -e "s/#define malloc rpl_malloc/\/\* #undef malloc \*\//g" config.h
+ sed -i -e '/HEADERS\(\)/ a\#include "gnu_getopt.h"' src/Settings.cpp
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put src/iperf $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ cmd "killall -SIGKILL iperf 2>/dev/null; exit 0"
+
+ # Start iperf server on Jenkins host
+ iperf_exec=`which iperf`
+
+ if [ -z $iperf_exec ];
+ then
+ echo "ERROR: Cannot find iperf"
+ false
+ else
+ $iperf_exec -s &
+ fi
+
+ assert_define BENCHMARK_IPERF_SRV
+
+ if [ "$BENCHMARK_IPERF_SRV" = "default" ]; then
+ srv=$SRV_IP
+ else
+ srv=$BENCHMARK_IPERF_SRV
+ fi
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./iperf -c $srv -t 15; ./iperf -c $srv -d -t 15" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
+}
+
+function test_cleanup {
+ kill_procs iperf
+}
+
+
diff --git a/engine/tests/Benchmark.iperf/iperf.sh b/engine/tests/Benchmark.iperf/iperf.sh
deleted file mode 100755
index 74b4437..0000000
--- a/engine/tests/Benchmark.iperf/iperf.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-tarball=iperf-2.0.5.tar.gz
-
-function test_build {
- ./configure --host=$HOST --build=`./config.guess`
- make config.h
- sed -i -e "s/#define HAVE_MALLOC 0/#define HAVE_MALLOC 1/g" -e "s/#define malloc rpl_malloc/\/\* #undef malloc \*\//g" config.h
- sed -i -e '/HEADERS\(\)/ a\#include "gnu_getopt.h"' src/Settings.cpp
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put src/iperf $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- cmd "killall -SIGKILL iperf 2>/dev/null; exit 0"
-
- # Start iperf server on Jenkins host
- iperf_exec=`which iperf`
-
- if [ -z $iperf_exec ];
- then
- echo "ERROR: Cannot find iperf"
- false
- else
- $iperf_exec -s &
- fi
-
- assert_define BENCHMARK_IPERF_SRV
-
- if [ "$BENCHMARK_IPERF_SRV" = "default" ]; then
- srv=$SRV_IP
- else
- srv=$BENCHMARK_IPERF_SRV
- fi
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./iperf -c $srv -t 15; ./iperf -c $srv -d -t 15" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
-}
-
-function test_cleanup {
- kill_procs iperf
-}
-
-
diff --git a/engine/tests/Benchmark.linpack/fuego_test.sh b/engine/tests/Benchmark.linpack/fuego_test.sh
new file mode 100755
index 0000000..a42d665
--- /dev/null
+++ b/engine/tests/Benchmark.linpack/fuego_test.sh
@@ -0,0 +1,16 @@
+tarball=linpack.tar.bz2
+
+function test_build {
+ patch -p0 -N -s < $TEST_HOME/linpack.c.patch
+ $CC $CFLAGS -O -lm -o linpack linpack.c && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put linpack $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./linpack"
+}
+
+
diff --git a/engine/tests/Benchmark.linpack/linpack.sh b/engine/tests/Benchmark.linpack/linpack.sh
deleted file mode 100755
index a42d665..0000000
--- a/engine/tests/Benchmark.linpack/linpack.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-tarball=linpack.tar.bz2
-
-function test_build {
- patch -p0 -N -s < $TEST_HOME/linpack.c.patch
- $CC $CFLAGS -O -lm -o linpack linpack.c && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put linpack $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR && ./linpack"
-}
-
-
diff --git a/engine/tests/Benchmark.lmbench2/fuego_test.sh b/engine/tests/Benchmark.lmbench2/fuego_test.sh
new file mode 100755
index 0000000..67d4afe
--- /dev/null
+++ b/engine/tests/Benchmark.lmbench2/fuego_test.sh
@@ -0,0 +1,33 @@
+tarball=lmbench3.tar.gz
+
+function test_build {
+ mkdir -p SCCS
+ touch SCCS/s.ChangeSet
+ cd scripts
+ patch -p0 < $TEST_HOME/lmbench3.config-run.patch
+ patch -p0 < $TEST_HOME/lmbench.patch
+ patch -p0 < $TEST_HOME/lmbench3.mem64.patch
+ cd ../src
+ patch -p0 < $TEST_HOME/bench.h.patch
+ cd ..
+ CFLAGS+=" -g -O"
+ make OS="$PREFIX" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put * $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ LMBENCH_OS=`ls ./bin`
+ safe_cmd "rm -rf $BOARD_TESTDIR/fuego.$TESTDIR/results"
+ safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./config-run"
+ safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./results"
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; ./getsummary ../results/$LMBENCH_OS/*.0"
+}
+
+function test_cleanup {
+ kill_procs lmbench lat_mem_rd par_mem
+}
+
+
diff --git a/engine/tests/Benchmark.lmbench2/lmbench2.sh b/engine/tests/Benchmark.lmbench2/lmbench2.sh
deleted file mode 100755
index 67d4afe..0000000
--- a/engine/tests/Benchmark.lmbench2/lmbench2.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-tarball=lmbench3.tar.gz
-
-function test_build {
- mkdir -p SCCS
- touch SCCS/s.ChangeSet
- cd scripts
- patch -p0 < $TEST_HOME/lmbench3.config-run.patch
- patch -p0 < $TEST_HOME/lmbench.patch
- patch -p0 < $TEST_HOME/lmbench3.mem64.patch
- cd ../src
- patch -p0 < $TEST_HOME/bench.h.patch
- cd ..
- CFLAGS+=" -g -O"
- make OS="$PREFIX" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put * $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- LMBENCH_OS=`ls ./bin`
- safe_cmd "rm -rf $BOARD_TESTDIR/fuego.$TESTDIR/results"
- safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./config-run"
- safe_cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; OS=$LMBENCH_OS ./results"
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR/scripts; ./getsummary ../results/$LMBENCH_OS/*.0"
-}
-
-function test_cleanup {
- kill_procs lmbench lat_mem_rd par_mem
-}
-
-
diff --git a/engine/tests/Benchmark.nbench-byte/fuego_test.sh b/engine/tests/Benchmark.nbench-byte/fuego_test.sh
new file mode 100755
index 0000000..650b71f
--- /dev/null
+++ b/engine/tests/Benchmark.nbench-byte/fuego_test.sh
@@ -0,0 +1,18 @@
+tarball=nbench-byte-2.2.3.tar.gz
+
+function test_build {
+ patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
+ rm -f pointer.h && touch pointer.h
+ CFLAGS+=" -s -static -Wall -O3"
+ make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put hardware nbench sysinfo.sh *.DAT $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./nbench"
+}
+
+
diff --git a/engine/tests/Benchmark.nbench-byte/nbench-byte.sh b/engine/tests/Benchmark.nbench-byte/nbench-byte.sh
deleted file mode 100755
index 650b71f..0000000
--- a/engine/tests/Benchmark.nbench-byte/nbench-byte.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-tarball=nbench-byte-2.2.3.tar.gz
-
-function test_build {
- patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
- rm -f pointer.h && touch pointer.h
- CFLAGS+=" -s -static -Wall -O3"
- make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put hardware nbench sysinfo.sh *.DAT $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./nbench"
-}
-
-
diff --git a/engine/tests/Benchmark.nbench_byte/fuego_test.sh b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
new file mode 100755
index 0000000..42b78d1
--- /dev/null
+++ b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
@@ -0,0 +1,18 @@
+tarball=nbench-byte-2.2.3.tar.gz
+
+function test_build {
+ patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
+ rm -f pointer.h && touch pointer.h
+ CFLAGS+=" -s -static -Wall -O3"
+ make CFLAGS="${CFLAGS}" CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put hardware nbench sysinfo.sh *.DAT $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./nbench"
+}
+
+
diff --git a/engine/tests/Benchmark.nbench_byte/nbench_byte.sh b/engine/tests/Benchmark.nbench_byte/nbench_byte.sh
deleted file mode 100755
index 42b78d1..0000000
--- a/engine/tests/Benchmark.nbench_byte/nbench_byte.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-tarball=nbench-byte-2.2.3.tar.gz
-
-function test_build {
- patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
- rm -f pointer.h && touch pointer.h
- CFLAGS+=" -s -static -Wall -O3"
- make CFLAGS="${CFLAGS}" CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put hardware nbench sysinfo.sh *.DAT $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./nbench"
-}
-
-
diff --git a/engine/tests/Benchmark.netperf/fuego_test.sh b/engine/tests/Benchmark.netperf/fuego_test.sh
new file mode 100755
index 0000000..bcc7c4a
--- /dev/null
+++ b/engine/tests/Benchmark.netperf/fuego_test.sh
@@ -0,0 +1,27 @@
+# some functions are shared between Benchmark.netperf and Functional.netperf
+tarball=../netperf/netperf-2.6.0.tar.bz2
+source $FUEGO_CORE/engine/tests/netperf/netperf.sh
+
+function test_pre_check {
+ assert_define "BENCHMARK_NETPERF_SRV"
+ if [ "$FUNCTIONAL_NETPERF_SRV" = "docker" ]; then
+ check_process_is_running "netserver"
+ fi
+}
+
+function test_deploy {
+ put $TEST_HOME/netperf-rabench_script $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/netperf $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ case "$BENCHMARK_NETPERF_SRV" in
+ "default") srv=$SRV_IP ;;
+ "docker") srv=$SRV_IP ;;
+ *) srv=$BENCHMARK_NETPERF_SRV ;;
+ esac
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./netperf-rabench_script $srv"
+}
+
+
+
diff --git a/engine/tests/Benchmark.netperf/netperf.sh b/engine/tests/Benchmark.netperf/netperf.sh
deleted file mode 100755
index bcc7c4a..0000000
--- a/engine/tests/Benchmark.netperf/netperf.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# some functions are shared between Benchmark.netperf and Functional.netperf
-tarball=../netperf/netperf-2.6.0.tar.bz2
-source $FUEGO_CORE/engine/tests/netperf/netperf.sh
-
-function test_pre_check {
- assert_define "BENCHMARK_NETPERF_SRV"
- if [ "$FUNCTIONAL_NETPERF_SRV" = "docker" ]; then
- check_process_is_running "netserver"
- fi
-}
-
-function test_deploy {
- put $TEST_HOME/netperf-rabench_script $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/netperf $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- case "$BENCHMARK_NETPERF_SRV" in
- "default") srv=$SRV_IP ;;
- "docker") srv=$SRV_IP ;;
- *) srv=$BENCHMARK_NETPERF_SRV ;;
- esac
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./netperf-rabench_script $srv"
-}
-
-
-
diff --git a/engine/tests/Benchmark.netpipe/fuego_test.sh b/engine/tests/Benchmark.netpipe/fuego_test.sh
new file mode 100755
index 0000000..17b5ed5
--- /dev/null
+++ b/engine/tests/Benchmark.netpipe/fuego_test.sh
@@ -0,0 +1,53 @@
+tarball=NetPIPE-3.7.1.tar.gz
+
+function test_build {
+ patch -p1 -N -s < ../../tarballs/netpipe-makefile.patch
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put NPtcp $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ cmd "killall -SIGKILL NPtcp 2>/dev/null; exit 0"
+
+ # Start netpipe server on Jenkins host
+ netpipe_exec=`which NPtcp`
+
+ if [ -z $netpipe_exec ];
+ then
+ echo "ERROR: Cannot find netpipe"
+ false
+ else
+ $netpipe_exec -p 2 &
+ fi
+
+ assert_define BENCHMARK_NETPIPE_PERT
+
+ if [ "$BENCHMARK_NETPIPE_SRV" = "default" ]; then
+ srv=$SRV_IP
+ else
+ srv=$BENCHMARK_NETPIPE_SRV
+ fi
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
+}
+
+source $FUEGO_CORE/engine/scripts/functions.sh
+
+source $FUEGO_CORE/engine/scripts/overlays.sh
+set_overlay_vars
+
+
+pre_test $TESTDIR
+
+if $Rebuild; then
+ build
+fi
+
+deploy
+
+test_run
+
+
diff --git a/engine/tests/Benchmark.netpipe/netpipe.sh b/engine/tests/Benchmark.netpipe/netpipe.sh
deleted file mode 100755
index 17b5ed5..0000000
--- a/engine/tests/Benchmark.netpipe/netpipe.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-tarball=NetPIPE-3.7.1.tar.gz
-
-function test_build {
- patch -p1 -N -s < ../../tarballs/netpipe-makefile.patch
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put NPtcp $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- cmd "killall -SIGKILL NPtcp 2>/dev/null; exit 0"
-
- # Start netpipe server on Jenkins host
- netpipe_exec=`which NPtcp`
-
- if [ -z $netpipe_exec ];
- then
- echo "ERROR: Cannot find netpipe"
- false
- else
- $netpipe_exec -p 2 &
- fi
-
- assert_define BENCHMARK_NETPIPE_PERT
-
- if [ "$BENCHMARK_NETPIPE_SRV" = "default" ]; then
- srv=$SRV_IP
- else
- srv=$BENCHMARK_NETPIPE_SRV
- fi
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./NPtcp -h $srv -p $BENCHMARK_NETPIPE_PERT" $BOARD_TESTDIR/fuego.$TESTDIR/${TESTDIR}.log
-}
-
-source $FUEGO_CORE/engine/scripts/functions.sh
-
-source $FUEGO_CORE/engine/scripts/overlays.sh
-set_overlay_vars
-
-
-pre_test $TESTDIR
-
-if $Rebuild; then
- build
-fi
-
-deploy
-
-test_run
-
-
diff --git a/engine/tests/Benchmark.reboot/fuego_test.sh b/engine/tests/Benchmark.reboot/fuego_test.sh
new file mode 100755
index 0000000..603e545
--- /dev/null
+++ b/engine/tests/Benchmark.reboot/fuego_test.sh
@@ -0,0 +1,23 @@
+tarball=none
+
+function test_build {
+ true
+}
+
+function test_deploy {
+ put $TEST_HOME/get_reboot_time.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ # MAX_REBOOT_RETRIES can be defined in the board's file.
+ # Otherwise, the default is 20 retries
+ retries=${MAX_REBOOT_RETRIES:-20}
+ target_reboot $retries
+ # sleep a bit more, just because we're paranoid
+ # remote system may have networking up, but need more
+ # time to mount filesystems
+ sleep 10
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./get_reboot_time.sh"
+}
+
+
diff --git a/engine/tests/Benchmark.reboot/reboot.sh b/engine/tests/Benchmark.reboot/reboot.sh
deleted file mode 100755
index 603e545..0000000
--- a/engine/tests/Benchmark.reboot/reboot.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-tarball=none
-
-function test_build {
- true
-}
-
-function test_deploy {
- put $TEST_HOME/get_reboot_time.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- # MAX_REBOOT_RETRIES can be defined in the board's file.
- # Otherwise, the default is 20 retries
- retries=${MAX_REBOOT_RETRIES:-20}
- target_reboot $retries
- # sleep a bit more, just because we're paranoid
- # remote system may have networking up, but need more
- # time to mount filesystems
- sleep 10
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./get_reboot_time.sh"
-}
-
-
diff --git a/engine/tests/Benchmark.signaltest/fuego_test.sh b/engine/tests/Benchmark.signaltest/fuego_test.sh
new file mode 100755
index 0000000..7c0e3fb
--- /dev/null
+++ b/engine/tests/Benchmark.signaltest/fuego_test.sh
@@ -0,0 +1,17 @@
+tarball=signaltest.tar.gz
+
+function test_build {
+ make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put signaltest $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_SIGNALTEST_LOOPS
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./signaltest -l $BENCHMARK_SIGNALTEST_LOOPS -q"
+}
+
+
diff --git a/engine/tests/Benchmark.signaltest/signaltest.sh b/engine/tests/Benchmark.signaltest/signaltest.sh
deleted file mode 100755
index 7c0e3fb..0000000
--- a/engine/tests/Benchmark.signaltest/signaltest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-tarball=signaltest.tar.gz
-
-function test_build {
- make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put signaltest $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_SIGNALTEST_LOOPS
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./signaltest -l $BENCHMARK_SIGNALTEST_LOOPS -q"
-}
-
-
diff --git a/engine/tests/Benchmark.sysbench/fuego_test.sh b/engine/tests/Benchmark.sysbench/fuego_test.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Benchmark.sysbench/fuego_test.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Benchmark.sysbench/sysbench.sh b/engine/tests/Benchmark.sysbench/sysbench.sh
deleted file mode 100644
index ea36f75..0000000
--- a/engine/tests/Benchmark.sysbench/sysbench.sh
+++ /dev/null
@@ -1 +0,0 @@
-FIXTHIS: no test definition!
diff --git a/engine/tests/Benchmark.tiobench/fuego_test.sh b/engine/tests/Benchmark.tiobench/fuego_test.sh
new file mode 100755
index 0000000..a974859
--- /dev/null
+++ b/engine/tests/Benchmark.tiobench/fuego_test.sh
@@ -0,0 +1,26 @@
+tarball=tiobench-0.3.3.tar.gz
+
+function test_build {
+ patch -N -s -p1 < $TEST_HOME/tiobench-fix-conflicting-types.patch
+ make LINK="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS+="${CFLAGS}" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put tiotest $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV
+ assert_define BENCHMARK_TIOBENCH_MOUNT_POINT
+ assert_define BENCHMARK_TIOBENCH_THREADS
+ assert_define BENCHMARK_TIOBENCH_SIZE
+
+ hd_test_mount_prepare $BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV $BENCHMARK_TIOBENCH_MOUNT_POINT
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –S"
+ report_append "cd $BOARD_TESTDIR/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
+}
+
+
diff --git a/engine/tests/Benchmark.tiobench/tiobench.sh b/engine/tests/Benchmark.tiobench/tiobench.sh
deleted file mode 100755
index a974859..0000000
--- a/engine/tests/Benchmark.tiobench/tiobench.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-tarball=tiobench-0.3.3.tar.gz
-
-function test_build {
- patch -N -s -p1 < $TEST_HOME/tiobench-fix-conflicting-types.patch
- make LINK="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS+="${CFLAGS}" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put tiotest $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV
- assert_define BENCHMARK_TIOBENCH_MOUNT_POINT
- assert_define BENCHMARK_TIOBENCH_THREADS
- assert_define BENCHMARK_TIOBENCH_SIZE
-
- hd_test_mount_prepare $BENCHMARK_TIOBENCH_MOUNT_BLOCKDEV $BENCHMARK_TIOBENCH_MOUNT_POINT
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./tiotest -d $BENCHMARK_TIOBENCH_MOUNT_POINT -t $BENCHMARK_TIOBENCH_THREADS -f $BENCHMARK_TIOBENCH_SIZE –S"
- report_append "cd $BOARD_TESTDIR/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
-}
-
-
diff --git a/engine/tests/Benchmark.x11perf/fuego_test.sh b/engine/tests/Benchmark.x11perf/fuego_test.sh
new file mode 100755
index 0000000..b706d2b
--- /dev/null
+++ b/engine/tests/Benchmark.x11perf/fuego_test.sh
@@ -0,0 +1,24 @@
+tarball=x11perf-1.5.4.tar.gz
+
+function test_build {
+ sed -i '/XORG_MACROS_VERSION/d' ./configure.ac
+ sed -i '/xorg-macros 1.8/d' ./configure.ac
+
+ ./autogen.sh --host $HOST
+
+ ./configure $CONFIGURE_FLAGS X11PERF_LIBS="-lX11 -lXmu" # force to use libXmu instead of libXmuu
+ sed -i 's#$(SED)#sed#' Makefile # this is wrong, but somewhy $(SED) in Makefile expands to nothing
+ make && touch test_suite_ready
+}
+
+function test_deploy {
+ put x11perf $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define BENCHMARK_X11PERF_TIME
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; ./x11perf -repeat 1 -time $BENCHMARK_X11PERF_TIME -dot -oddtilerect10 -seg100c2 -64poly10complex"
+}
+
+
+
diff --git a/engine/tests/Benchmark.x11perf/x11perf.sh b/engine/tests/Benchmark.x11perf/x11perf.sh
deleted file mode 100755
index b706d2b..0000000
--- a/engine/tests/Benchmark.x11perf/x11perf.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-tarball=x11perf-1.5.4.tar.gz
-
-function test_build {
- sed -i '/XORG_MACROS_VERSION/d' ./configure.ac
- sed -i '/xorg-macros 1.8/d' ./configure.ac
-
- ./autogen.sh --host $HOST
-
- ./configure $CONFIGURE_FLAGS X11PERF_LIBS="-lX11 -lXmu" # force to use libXmu instead of libXmuu
- sed -i 's#$(SED)#sed#' Makefile # this is wrong, but somewhy $(SED) in Makefile expands to nothing
- make && touch test_suite_ready
-}
-
-function test_deploy {
- put x11perf $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define BENCHMARK_X11PERF_TIME
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export DISPLAY=:0; ./x11perf -repeat 1 -time $BENCHMARK_X11PERF_TIME -dot -oddtilerect10 -seg100c2 -64poly10complex"
-}
-
-
-
diff --git a/engine/tests/Functional.LTP/LTP.sh b/engine/tests/Functional.LTP/LTP.sh
deleted file mode 100755
index e9abd0b..0000000
--- a/engine/tests/Functional.LTP/LTP.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-# FIXTHIS: use https://github.com/linux-test-project/ltp.git instead of a tarball
-tarball=ltp-7eb77fbfd80.tar.bz2
-
-ALLTESTS="
-admin_tools fs_perms_simple ltp-aiodio.part3 net_stress.appl quickhit
-can fs_readonly ltp-aiodio.part4 net_stress.broken_ip rpc_tests
-cap_bounds fsx ltplite net_stress.interfaces sched
-commands hugetlb lvm.part1 net_stress.ipsec_icmp scsi_debug.part1
-connectors hyperthreading lvm.part2 net_stress.ipsec_tcp securebits
-containers ima math net_stress.ipsec_udp smack
-controllers input mm net_stress.multicast stress.part1
-cpuhotplug io modules net_stress.route stress.part2
-crashme io_cd net.features network_commands stress.part3
-dio io_floppy net.ipv6 nptl syscalls
-dma_thread_diotest ipc net.ipv6_lib numa syscalls-ipc
-fcntl-locktests kernel_misc net.multicast nw_under_ns timers
-filecaps ltp-aio-stress.part1 net.nfs pipes tirpc_tests
-fs ltp-aio-stress.part2 net.rpc power_management_tests tpm_tools
-fs_bind ltp-aiodio.part1 net.sctp power_management_tests_exclusive tracing
-fs_ext4 ltp-aiodio.part2 net.tcp_cmds pty"
-
-ALLPTSTESTS="AIO MEM MSG SEM SIG THR TMR TPS"
-
-ALLRTTESTS="
-perf/latency
-func/measurement
-func/hrtimer-prio
-func/gtod_latency
-func/periodic_cpu_load
-func/pthread_kill_latency
-func/sched_football
-func/pi-tests
-func/thread_clock
-func/rt-migrate
-func/matrix_mult
-func/prio-preempt
-func/prio-wake
-func/pi_perf
-func/sched_latency
-func/async_handler
-func/sched_jitter
-"
-
-function test_pre_check {
- assert_define SDKROOT
- assert_define CC
- assert_define AR
- assert_define RANLIB
- assert_define LDFLAGS
- assert_define FUNCTIONAL_LTP_TESTS
-}
-
-function test_build {
- echo "Building LTP"
-
- # patch the Posix test suite script for easier log processing
- patch -p1 -N -s < $TEST_HOME/0001-pts-merge-all-logfile-files-into-a-pts.log-for-proce.patch
-
- # Build the LTP tests
- make autotools
- ./configure CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" LDFLAGS="$LDFLAGS" SYSROOT="${SDKROOT}" \
- --with-open-posix-testsuite --with-realtime-testsuite --without-perl --without-python --target=$PREFIX --host=$PREFIX \
- --prefix=`pwd`/target_bin --build=`uname -m`-unknown-linux-gnu
- make CC="${CC}"
- make install
-
- cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
- cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
-
- touch test_suite_ready
-}
-
-function test_deploy {
- echo "Deploying LTP"
-
- # the syscalls group occupies by far the largest space so remove it if unneeded
- cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print match($0,"syscalls")}')
- if [ $cp_syscalls -eq 0 ]; then
- echo "Removing syscalls binaries"
- awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
- fi
-
- put target_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- echo "Running LTP"
-
- TESTS=""
- PTSTESTS=""
- RTTESTS=""
-
- for a in $FUNCTIONAL_LTP_TESTS; do
- for b in $ALLTESTS; do
- if [ "$a" == "$b" ]; then
- TESTS+="$a "
- fi
- done
-
- for b in $ALLPTSTESTS; do
- if [ "$a" == "$b" ]; then
- PTSTESTS+="$a "
- fi
- done
-
- for b in $ALLRTTESTS; do
- if [ "$a" == "$b" ]; then
- RTTESTS+="$a "
- fi
- done
- done
-
- # Let some of the tests fail, the information will be in the result xlsx file
- set +e
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; TESTS=\"$TESTS\"; PTSTESTS=\"$PTSTESTS\"; RTTESTS=\"$RTTESTS\"; . ./ltp_target_run.sh"
- set -e
-}
-
-function test_processing {
- echo "Processing LTP"
-
- get $BOARD_TESTDIR/fuego.$TESTDIR/result .
- cd result/
- # Restore the path so that python works properly
- export PATH=$ORIG_PATH
- cp $TEST_HOME/ltp_process.py .
- python ltp_process.py
- [ -e results.xlsx ] && cp results.xlsx ${LOGDIR}/results.xlsx
- [ -e rt.log ] && cp rt.log $FUEGO_RW/logs/$JOB_NAME/
- cd ..
- rm -rf result/
-}
-
-
diff --git a/engine/tests/Functional.LTP/fuego_test.sh b/engine/tests/Functional.LTP/fuego_test.sh
new file mode 100755
index 0000000..e9abd0b
--- /dev/null
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -0,0 +1,134 @@
+# FIXTHIS: use https://github.com/linux-test-project/ltp.git instead of a tarball
+tarball=ltp-7eb77fbfd80.tar.bz2
+
+ALLTESTS="
+admin_tools fs_perms_simple ltp-aiodio.part3 net_stress.appl quickhit
+can fs_readonly ltp-aiodio.part4 net_stress.broken_ip rpc_tests
+cap_bounds fsx ltplite net_stress.interfaces sched
+commands hugetlb lvm.part1 net_stress.ipsec_icmp scsi_debug.part1
+connectors hyperthreading lvm.part2 net_stress.ipsec_tcp securebits
+containers ima math net_stress.ipsec_udp smack
+controllers input mm net_stress.multicast stress.part1
+cpuhotplug io modules net_stress.route stress.part2
+crashme io_cd net.features network_commands stress.part3
+dio io_floppy net.ipv6 nptl syscalls
+dma_thread_diotest ipc net.ipv6_lib numa syscalls-ipc
+fcntl-locktests kernel_misc net.multicast nw_under_ns timers
+filecaps ltp-aio-stress.part1 net.nfs pipes tirpc_tests
+fs ltp-aio-stress.part2 net.rpc power_management_tests tpm_tools
+fs_bind ltp-aiodio.part1 net.sctp power_management_tests_exclusive tracing
+fs_ext4 ltp-aiodio.part2 net.tcp_cmds pty"
+
+ALLPTSTESTS="AIO MEM MSG SEM SIG THR TMR TPS"
+
+ALLRTTESTS="
+perf/latency
+func/measurement
+func/hrtimer-prio
+func/gtod_latency
+func/periodic_cpu_load
+func/pthread_kill_latency
+func/sched_football
+func/pi-tests
+func/thread_clock
+func/rt-migrate
+func/matrix_mult
+func/prio-preempt
+func/prio-wake
+func/pi_perf
+func/sched_latency
+func/async_handler
+func/sched_jitter
+"
+
+function test_pre_check {
+ assert_define SDKROOT
+ assert_define CC
+ assert_define AR
+ assert_define RANLIB
+ assert_define LDFLAGS
+ assert_define FUNCTIONAL_LTP_TESTS
+}
+
+function test_build {
+ echo "Building LTP"
+
+ # patch the Posix test suite script for easier log processing
+ patch -p1 -N -s < $TEST_HOME/0001-pts-merge-all-logfile-files-into-a-pts.log-for-proce.patch
+
+ # Build the LTP tests
+ make autotools
+ ./configure CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" LDFLAGS="$LDFLAGS" SYSROOT="${SDKROOT}" \
+ --with-open-posix-testsuite --with-realtime-testsuite --without-perl --without-python --target=$PREFIX --host=$PREFIX \
+ --prefix=`pwd`/target_bin --build=`uname -m`-unknown-linux-gnu
+ make CC="${CC}"
+ make install
+
+ cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
+ cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
+
+ touch test_suite_ready
+}
+
+function test_deploy {
+ echo "Deploying LTP"
+
+ # the syscalls group occupies by far the largest space so remove it if unneeded
+ cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print match($0,"syscalls")}')
+ if [ $cp_syscalls -eq 0 ]; then
+ echo "Removing syscalls binaries"
+ awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
+ fi
+
+ put target_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ echo "Running LTP"
+
+ TESTS=""
+ PTSTESTS=""
+ RTTESTS=""
+
+ for a in $FUNCTIONAL_LTP_TESTS; do
+ for b in $ALLTESTS; do
+ if [ "$a" == "$b" ]; then
+ TESTS+="$a "
+ fi
+ done
+
+ for b in $ALLPTSTESTS; do
+ if [ "$a" == "$b" ]; then
+ PTSTESTS+="$a "
+ fi
+ done
+
+ for b in $ALLRTTESTS; do
+ if [ "$a" == "$b" ]; then
+ RTTESTS+="$a "
+ fi
+ done
+ done
+
+ # Let some of the tests fail, the information will be in the result xlsx file
+ set +e
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; TESTS=\"$TESTS\"; PTSTESTS=\"$PTSTESTS\"; RTTESTS=\"$RTTESTS\"; . ./ltp_target_run.sh"
+ set -e
+}
+
+function test_processing {
+ echo "Processing LTP"
+
+ get $BOARD_TESTDIR/fuego.$TESTDIR/result .
+ cd result/
+ # Restore the path so that python works properly
+ export PATH=$ORIG_PATH
+ cp $TEST_HOME/ltp_process.py .
+ python ltp_process.py
+ [ -e results.xlsx ] && cp results.xlsx ${LOGDIR}/results.xlsx
+ [ -e rt.log ] && cp rt.log $FUEGO_RW/logs/$JOB_NAME/
+ cd ..
+ rm -rf result/
+}
+
+
diff --git a/engine/tests/Functional.OpenSSL/OpenSSL.sh b/engine/tests/Functional.OpenSSL/OpenSSL.sh
deleted file mode 100755
index 2cc0b16..0000000
--- a/engine/tests/Functional.OpenSSL/OpenSSL.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# some functions are shared between Benchmark.OpenSSL and Functional.OpenSSL
-tarball=../OpenSSL/openssl-0.9.8j.tar.gz
-source $FUEGO_CORE/engine/tests/OpenSSL/openssl.sh
-
-function test_deploy {
- put apps util test run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_processing {
- P_CRIT="passed|ok"
- N_CRIT="skip"
-
- log_compare "$TESTDIR" "176" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "86" "${N_CRIT}" "n"
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; bash run-tests.sh"
-}
-
-
diff --git a/engine/tests/Functional.OpenSSL/fuego_test.sh b/engine/tests/Functional.OpenSSL/fuego_test.sh
new file mode 100755
index 0000000..2cc0b16
--- /dev/null
+++ b/engine/tests/Functional.OpenSSL/fuego_test.sh
@@ -0,0 +1,21 @@
+# some functions are shared between Benchmark.OpenSSL and Functional.OpenSSL
+tarball=../OpenSSL/openssl-0.9.8j.tar.gz
+source $FUEGO_CORE/engine/tests/OpenSSL/openssl.sh
+
+function test_deploy {
+ put apps util test run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_processing {
+ P_CRIT="passed|ok"
+ N_CRIT="skip"
+
+ log_compare "$TESTDIR" "176" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "86" "${N_CRIT}" "n"
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; bash run-tests.sh"
+}
+
+
diff --git a/engine/tests/Functional.aiostress/aiostress.sh b/engine/tests/Functional.aiostress/aiostress.sh
deleted file mode 100755
index 2bebb67..0000000
--- a/engine/tests/Functional.aiostress/aiostress.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-tarball=aiostress.tar.gz
-
-function test_build {
- $CC -I $SDKROOT/usr/include -L $SDKROOT/usr/lib -Wall -lpthread -laio aiostress.c -o aiostress && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put aiostress $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV
- assert_define FUNCTIONAL_AIOSTRESS_MOUNT_POINT
- assert_define FUNCTIONAL_AIOSTRESS_SIZE
-
- hd_test_mount_prepare $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT
- report "cd $FUNCTIONAL_AIOSTRESS_MOUNT_POINT/fuego.$TESTDIR; $BOARD_TESTDIR/fuego.$TESTDIR/aiostress -s $FUNCTIONAL_AIOSTRESS_SIZE ./testfile"
-
- hd_test_clean_umount $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT
-}
-
-function test_processing {
- true
-}
-
-
-
diff --git a/engine/tests/Functional.aiostress/fuego_test.sh b/engine/tests/Functional.aiostress/fuego_test.sh
new file mode 100755
index 0000000..2bebb67
--- /dev/null
+++ b/engine/tests/Functional.aiostress/fuego_test.sh
@@ -0,0 +1,27 @@
+tarball=aiostress.tar.gz
+
+function test_build {
+ $CC -I $SDKROOT/usr/include -L $SDKROOT/usr/lib -Wall -lpthread -laio aiostress.c -o aiostress && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put aiostress $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV
+ assert_define FUNCTIONAL_AIOSTRESS_MOUNT_POINT
+ assert_define FUNCTIONAL_AIOSTRESS_SIZE
+
+ hd_test_mount_prepare $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT
+ report "cd $FUNCTIONAL_AIOSTRESS_MOUNT_POINT/fuego.$TESTDIR; $BOARD_TESTDIR/fuego.$TESTDIR/aiostress -s $FUNCTIONAL_AIOSTRESS_SIZE ./testfile"
+
+ hd_test_clean_umount $FUNCTIONAL_AIOSTRESS_MOUNT_BLOCKDEV $FUNCTIONAL_AIOSTRESS_MOUNT_POINT
+}
+
+function test_processing {
+ true
+}
+
+
+
diff --git a/engine/tests/Functional.arch_timer/arch_timer.sh b/engine/tests/Functional.arch_timer/arch_timer.sh
deleted file mode 100755
index de6922b..0000000
--- a/engine/tests/Functional.arch_timer/arch_timer.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-
-tarball=dung-3.4.25-m2.tar.gz
-
-function test_build {
- patch -N -s -p1 < $TEST_HOME/switch-bash-to-sh-arch_timer-interrupt-lager.patch
- touch test_suit_ready
-}
-
-function test_deploy {
- put ./* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR/arch_timer; ./arch_timer-interrupt-lager.sh ; ./dmesg-lager.sh; ./proc-interrupts-lager.sh"
-}
-
-function test_processing {
- assert_define FUNCTIONAL_ARCH_TIMER_RES_LINES_COUNT
-
- check_capability "RENESAS"
-
- log_compare "$TESTDIR" $FUNCTIONAL_ARCH_TIMER_RES_LINES_COUNT "Test passed" "p"
-}
-
-
-
diff --git a/engine/tests/Functional.arch_timer/fuego_test.sh b/engine/tests/Functional.arch_timer/fuego_test.sh
new file mode 100755
index 0000000..de6922b
--- /dev/null
+++ b/engine/tests/Functional.arch_timer/fuego_test.sh
@@ -0,0 +1,26 @@
+
+tarball=dung-3.4.25-m2.tar.gz
+
+function test_build {
+ patch -N -s -p1 < $TEST_HOME/switch-bash-to-sh-arch_timer-interrupt-lager.patch
+ touch test_suit_ready
+}
+
+function test_deploy {
+ put ./* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR/arch_timer; ./arch_timer-interrupt-lager.sh ; ./dmesg-lager.sh; ./proc-interrupts-lager.sh"
+}
+
+function test_processing {
+ assert_define FUNCTIONAL_ARCH_TIMER_RES_LINES_COUNT
+
+ check_capability "RENESAS"
+
+ log_compare "$TESTDIR" $FUNCTIONAL_ARCH_TIMER_RES_LINES_COUNT "Test passed" "p"
+}
+
+
+
diff --git a/engine/tests/Functional.bc/bc.sh b/engine/tests/Functional.bc/bc.sh
deleted file mode 100755
index 4c05871..0000000
--- a/engine/tests/Functional.bc/bc.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-tarball=bc-script.tar.gz
-
-function test_pre_check {
- assert_define FUNCTIONAL_BC_EXPR
- assert_define FUNCTIONAL_BC_RESULT
- is_on_target bc BC_PROGRAM /bin:/usr/bin:/usr/local/bin
- assert_define BC_PROGRAM
-}
-
-function test_build {
- echo "test compiling (is normally done here)"
-}
-
-function test_deploy {
- put bc-device.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./bc-device.sh $FUNCTIONAL_BC_EXPR $FUNCTIONAL_BC_RESULT"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "OK" "p"
-}
-
-
diff --git a/engine/tests/Functional.bc/fuego_test.sh b/engine/tests/Functional.bc/fuego_test.sh
new file mode 100755
index 0000000..4c05871
--- /dev/null
+++ b/engine/tests/Functional.bc/fuego_test.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+tarball=bc-script.tar.gz
+
+function test_pre_check {
+ assert_define FUNCTIONAL_BC_EXPR
+ assert_define FUNCTIONAL_BC_RESULT
+ is_on_target bc BC_PROGRAM /bin:/usr/bin:/usr/local/bin
+ assert_define BC_PROGRAM
+}
+
+function test_build {
+ echo "test compiling (is normally done here)"
+}
+
+function test_deploy {
+ put bc-device.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./bc-device.sh $FUNCTIONAL_BC_EXPR $FUNCTIONAL_BC_RESULT"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "OK" "p"
+}
+
+
diff --git a/engine/tests/Functional.boost/boost.sh b/engine/tests/Functional.boost/boost.sh
deleted file mode 100755
index 602b9e3..0000000
--- a/engine/tests/Functional.boost/boost.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-tarball=boost.tar.gz
-
-function test_build {
- $CXX boost-chrono.c -lboost_system -lboost_chrono -o boost-chrono
- $CXX boost-timer.c -o boost-timer
- $CXX boost-date-time.c -o boost-date-time
- $CXX boost-random.c -o boost-random
- $CXX boost-thread.c -lboost_system -lboost_thread -o boost-thread
- $CXX boost-graph.c -o boost-graph
- $CXX boost-filesystem.c -lboost_filesystem -o boost-filesystem
- $CXX boost-iostream.c -lboost_iostreams -o boost-iostream
- $CXX boost-program-options.c -lboost_program_options -o boost-program-option
- $CXX boost-regex.c -lboost_regex -o boost-regex
- $CXX boost-signal.c -o boost-signal
- $CXX boost-atomic.c -o boost-atomic
- $CXX boost-serialization.c -lboost_serialization -o boost-serialization
- $CXX boost-system.c -lboost_system -lpthread -o boost-system
- $CXX boost-test.c -o boost-test
- $CXX -g -std=c++11 boost-log.c -o boost-log -rdynamic -lpthread -lboost_log -lboost_system -lboost_thread -lboost_filesystem
-}
-
-function test_deploy {
- put boost-chrono $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-timer $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-date-time $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-random $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-thread $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-graph $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-filesystem $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-iostream $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-program-option $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-regex $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-signal $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-atomic $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-serialization $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-system $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-test $BOARD_TESTDIR/fuego.$TESTDIR/
- put boost-log $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
- if boost-chrono; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if boost-timer; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
- if boost-date-time; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
- if boost-random; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
- if boost-thread; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
- if boost-graph; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
- if boost-filesystem; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
- if boost-iostream; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
- if boost-program-option; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;\
- if boost-regex; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;\
- if boost-signal; then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;\
- if boost-atomic; then echo 'TEST-12 OK'; else echo 'TEST-12 FAILED'; fi;\
- if boost-serialization; then echo 'TEST-13 OK'; else echo 'TEST-13 FAILED'; fi;\
- if boost-system; then echo 'TEST-14 OK'; else echo 'TEST-14 FAILED'; fi;\
- if boost-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAILED'; fi;
- if boost-log; then echo 'TEST-16 OK'; else echo 'TEST-16 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "16" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.boost/fuego_test.sh b/engine/tests/Functional.boost/fuego_test.sh
new file mode 100755
index 0000000..602b9e3
--- /dev/null
+++ b/engine/tests/Functional.boost/fuego_test.sh
@@ -0,0 +1,68 @@
+tarball=boost.tar.gz
+
+function test_build {
+ $CXX boost-chrono.c -lboost_system -lboost_chrono -o boost-chrono
+ $CXX boost-timer.c -o boost-timer
+ $CXX boost-date-time.c -o boost-date-time
+ $CXX boost-random.c -o boost-random
+ $CXX boost-thread.c -lboost_system -lboost_thread -o boost-thread
+ $CXX boost-graph.c -o boost-graph
+ $CXX boost-filesystem.c -lboost_filesystem -o boost-filesystem
+ $CXX boost-iostream.c -lboost_iostreams -o boost-iostream
+ $CXX boost-program-options.c -lboost_program_options -o boost-program-option
+ $CXX boost-regex.c -lboost_regex -o boost-regex
+ $CXX boost-signal.c -o boost-signal
+ $CXX boost-atomic.c -o boost-atomic
+ $CXX boost-serialization.c -lboost_serialization -o boost-serialization
+ $CXX boost-system.c -lboost_system -lpthread -o boost-system
+ $CXX boost-test.c -o boost-test
+ $CXX -g -std=c++11 boost-log.c -o boost-log -rdynamic -lpthread -lboost_log -lboost_system -lboost_thread -lboost_filesystem
+}
+
+function test_deploy {
+ put boost-chrono $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-timer $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-date-time $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-random $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-thread $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-graph $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-filesystem $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-iostream $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-program-option $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-regex $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-signal $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-atomic $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-serialization $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-system $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-test $BOARD_TESTDIR/fuego.$TESTDIR/
+ put boost-log $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+ if boost-chrono; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if boost-timer; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+ if boost-date-time; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+ if boost-random; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
+ if boost-thread; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
+ if boost-graph; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
+ if boost-filesystem; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
+ if boost-iostream; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
+ if boost-program-option; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;\
+ if boost-regex; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;\
+ if boost-signal; then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;\
+ if boost-atomic; then echo 'TEST-12 OK'; else echo 'TEST-12 FAILED'; fi;\
+ if boost-serialization; then echo 'TEST-13 OK'; else echo 'TEST-13 FAILED'; fi;\
+ if boost-system; then echo 'TEST-14 OK'; else echo 'TEST-14 FAILED'; fi;\
+ if boost-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAILED'; fi;
+ if boost-log; then echo 'TEST-16 OK'; else echo 'TEST-16 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "16" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.bsdiff/bsdiff.sh b/engine/tests/Functional.bsdiff/bsdiff.sh
deleted file mode 100755
index 48723c0..0000000
--- a/engine/tests/Functional.bsdiff/bsdiff.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-tarball=bsdiff.tar.gz
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put data/*.modified data/*.original $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
- if bsdiff 13.bspatch.original 13.bspatch.modified 13.diff any; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if bspatch 13.bspatch.original 13.out 13.diff; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if diff 13.bspatch.modified 13.out; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.bsdiff/fuego_test.sh b/engine/tests/Functional.bsdiff/fuego_test.sh
new file mode 100755
index 0000000..48723c0
--- /dev/null
+++ b/engine/tests/Functional.bsdiff/fuego_test.sh
@@ -0,0 +1,23 @@
+tarball=bsdiff.tar.gz
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put data/*.modified data/*.original $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
+ if bsdiff 13.bspatch.original 13.bspatch.modified 13.diff any; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if bspatch 13.bspatch.original 13.out 13.diff; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if diff 13.bspatch.modified 13.out; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.bzip2/bzip2.sh b/engine/tests/Functional.bzip2/bzip2.sh
deleted file mode 100755
index f7b5ccc..0000000
--- a/engine/tests/Functional.bzip2/bzip2.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-tarball=bzip2-1.0.5.tar.gz
-
-function test_build {
- echo "#!/bin/sh
- is_busybox() {
- realname=\$(readlink -f \$1)
- if echo "\$realname" | grep -q "busybox"; then return 0; fi
- return 1
- }
- if bzip2 -1 < sample1.ref > sample1.rb2; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;
- if bzip2 -2 < sample2.ref > sample2.rb2; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
- if bzip2 -3 < sample3.ref > sample3.rb2; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;
- if bzip2 -d < sample1.bz2 > sample1.tst; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;
- if bzip2 -d < sample2.bz2 > sample2.tst; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;
- if ( is_busybox \$(which bzip2) ); then
- if bzip2 -d < sample3.bz2 > sample3.tst; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;
- else
- if bzip2 -ds < sample3.bz2 > sample3.tst; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;
- fi
- if cmp sample1.bz2 sample1.rb2; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;
- if cmp sample2.bz2 sample2.rb2; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;
- if cmp sample3.bz2 sample3.rb2; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;
- if cmp sample1.tst sample1.ref; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;
- if cmp sample2.tst sample2.ref; then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;" > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put {sample*,run-tests.sh} $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "11" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.bzip2/fuego_test.sh b/engine/tests/Functional.bzip2/fuego_test.sh
new file mode 100755
index 0000000..f7b5ccc
--- /dev/null
+++ b/engine/tests/Functional.bzip2/fuego_test.sh
@@ -0,0 +1,41 @@
+tarball=bzip2-1.0.5.tar.gz
+
+function test_build {
+ echo "#!/bin/sh
+ is_busybox() {
+ realname=\$(readlink -f \$1)
+ if echo "\$realname" | grep -q "busybox"; then return 0; fi
+ return 1
+ }
+ if bzip2 -1 < sample1.ref > sample1.rb2; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;
+ if bzip2 -2 < sample2.ref > sample2.rb2; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
+ if bzip2 -3 < sample3.ref > sample3.rb2; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;
+ if bzip2 -d < sample1.bz2 > sample1.tst; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;
+ if bzip2 -d < sample2.bz2 > sample2.tst; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;
+ if ( is_busybox \$(which bzip2) ); then
+ if bzip2 -d < sample3.bz2 > sample3.tst; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;
+ else
+ if bzip2 -ds < sample3.bz2 > sample3.tst; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;
+ fi
+ if cmp sample1.bz2 sample1.rb2; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;
+ if cmp sample2.bz2 sample2.rb2; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;
+ if cmp sample3.bz2 sample3.rb2; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;
+ if cmp sample1.tst sample1.ref; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;
+ if cmp sample2.tst sample2.ref; then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;" > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put {sample*,run-tests.sh} $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "11" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.cmt/cmt.sh b/engine/tests/Functional.cmt/cmt.sh
deleted file mode 100755
index 5a0482d..0000000
--- a/engine/tests/Functional.cmt/cmt.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-tarball=dung-3.4.25-m2.tar.gz
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put ./* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR/cmt; ./cmt-interrupt.sh; ./dmesg.sh; ./proc-interrupts.sh"
-}
-
-function test_processing {
- check_capability "RENESAS"
-
- log_compare "$TESTDIR" $FUNCTIONAL_CMT_LINES_COUNT "Test passed" "p"
-}
-
-
-
diff --git a/engine/tests/Functional.cmt/fuego_test.sh b/engine/tests/Functional.cmt/fuego_test.sh
new file mode 100755
index 0000000..5a0482d
--- /dev/null
+++ b/engine/tests/Functional.cmt/fuego_test.sh
@@ -0,0 +1,22 @@
+tarball=dung-3.4.25-m2.tar.gz
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put ./* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR/cmt; ./cmt-interrupt.sh; ./dmesg.sh; ./proc-interrupts.sh"
+}
+
+function test_processing {
+ check_capability "RENESAS"
+
+ log_compare "$TESTDIR" $FUNCTIONAL_CMT_LINES_COUNT "Test passed" "p"
+}
+
+
+
diff --git a/engine/tests/Functional.commonAPI_C++/commonAPI_C++.sh b/engine/tests/Functional.commonAPI_C++/commonAPI_C++.sh
deleted file mode 100755
index 94d74c4..0000000
--- a/engine/tests/Functional.commonAPI_C++/commonAPI_C++.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-tarball=commonAPI_C++.tar.gz
-
-function test_build {
- $CXX -std=gnu++11 ./commonAPI_Dbus/HelloWorldService.cpp ./commonAPI_Dbus/HelloWorldStubImpl.cpp ./commonAPI_Dbus/HelloWorldDBusStubAdapter.cpp ./commonAPI_Dbus/HelloWorldStubDefault.cpp ./commonAPI_Dbus/HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldService_Dbus
- $CXX -std=gnu++11 ./commonAPI_Dbus/HelloWorldClient.cpp ./commonAPI_Dbus/HelloWorldDBusProxy.cpp ./commonAPI_Dbus/HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldClient_Dbus
-
- $CXX -std=gnu++11 ./commonAPI_SomeIp/HelloWorldService.cpp ./commonAPI_SomeIp/HelloWorldStubImpl.cpp ./commonAPI_SomeIp/HelloWorldSomeIPStubAdapter.cpp ./commonAPI_SomeIp/HelloWorldStubDefault.cpp ./commonAPI_SomeIp/HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldService_SomeIp
- $CXX -std=gnu++11 ./commonAPI_SomeIp/HelloWorldClient.cpp ./commonAPI_SomeIp/HelloWorldSomeIPProxy.cpp ./commonAPI_SomeIp/HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldClient_SomeIp
-}
-
-function test_deploy {
- put HelloWorldService_Dbus $BOARD_TESTDIR/fuego.$TESTDIR/
- put HelloWorldClient_Dbus $BOARD_TESTDIR/fuego.$TESTDIR/
-
- put HelloWorldService_SomeIp $BOARD_TESTDIR/fuego.$TESTDIR/
- put HelloWorldClient_SomeIp $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./commonAPI_SomeIp/fidl/vsomeip.json $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; export VSOMEIP_CONFIGURATION_FILE=./fidl/vsomeip.json; chmod 777 *;
- if (./HelloWorldService_Dbus &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if ./HelloWorldClient_Dbus; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
- pkill HelloWorldServi
-
- if (VSOMEIP_APPLICATION_NAME=service-sample ./HelloWorldService_SomeIp &); then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
- if (VSOMEIP_APPLICATION_NAME=client-sample ./HelloWorldClient_SomeIp); then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;
- pkill HelloWorldServi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.commonAPI_C++/fuego_test.sh b/engine/tests/Functional.commonAPI_C++/fuego_test.sh
new file mode 100755
index 0000000..94d74c4
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_C++/fuego_test.sh
@@ -0,0 +1,40 @@
+tarball=commonAPI_C++.tar.gz
+
+function test_build {
+ $CXX -std=gnu++11 ./commonAPI_Dbus/HelloWorldService.cpp ./commonAPI_Dbus/HelloWorldStubImpl.cpp ./commonAPI_Dbus/HelloWorldDBusStubAdapter.cpp ./commonAPI_Dbus/HelloWorldStubDefault.cpp ./commonAPI_Dbus/HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldService_Dbus
+ $CXX -std=gnu++11 ./commonAPI_Dbus/HelloWorldClient.cpp ./commonAPI_Dbus/HelloWorldDBusProxy.cpp ./commonAPI_Dbus/HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldClient_Dbus
+
+ $CXX -std=gnu++11 ./commonAPI_SomeIp/HelloWorldService.cpp ./commonAPI_SomeIp/HelloWorldStubImpl.cpp ./commonAPI_SomeIp/HelloWorldSomeIPStubAdapter.cpp ./commonAPI_SomeIp/HelloWorldStubDefault.cpp ./commonAPI_SomeIp/HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldService_SomeIp
+ $CXX -std=gnu++11 ./commonAPI_SomeIp/HelloWorldClient.cpp ./commonAPI_SomeIp/HelloWorldSomeIPProxy.cpp ./commonAPI_SomeIp/HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldClient_SomeIp
+}
+
+function test_deploy {
+ put HelloWorldService_Dbus $BOARD_TESTDIR/fuego.$TESTDIR/
+ put HelloWorldClient_Dbus $BOARD_TESTDIR/fuego.$TESTDIR/
+
+ put HelloWorldService_SomeIp $BOARD_TESTDIR/fuego.$TESTDIR/
+ put HelloWorldClient_SomeIp $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./commonAPI_SomeIp/fidl/vsomeip.json $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; export VSOMEIP_CONFIGURATION_FILE=./fidl/vsomeip.json; chmod 777 *;
+ if (./HelloWorldService_Dbus &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if ./HelloWorldClient_Dbus; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
+ pkill HelloWorldServi
+
+ if (VSOMEIP_APPLICATION_NAME=service-sample ./HelloWorldService_SomeIp &); then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+ if (VSOMEIP_APPLICATION_NAME=client-sample ./HelloWorldClient_SomeIp); then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;
+ pkill HelloWorldServi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.sh b/engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.sh
deleted file mode 100755
index 485d279..0000000
--- a/engine/tests/Functional.commonAPI_Dbus/commonAPI_Dbus.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-tarball=commonAPI_Dbus.tar.gz
-
-function test_build {
- $CXX -std=gnu++11 HelloWorldService.cpp HelloWorldStubImpl.cpp HelloWorldDBusStubAdapter.cpp HelloWorldStubDefault.cpp HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldService
- $CXX -std=gnu++11 HelloWorldClient.cpp HelloWorldDBusProxy.cpp HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldClient
-}
-
-function test_deploy {
- put HelloWorldService $BOARD_TESTDIR/fuego.$TESTDIR/
- put HelloWorldClient $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
- if (./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if ./HelloWorldClient; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
- pkill HelloWorldServi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh b/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
new file mode 100755
index 0000000..485d279
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_Dbus/fuego_test.sh
@@ -0,0 +1,27 @@
+tarball=commonAPI_Dbus.tar.gz
+
+function test_build {
+ $CXX -std=gnu++11 HelloWorldService.cpp HelloWorldStubImpl.cpp HelloWorldDBusStubAdapter.cpp HelloWorldStubDefault.cpp HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldService
+ $CXX -std=gnu++11 HelloWorldClient.cpp HelloWorldDBusProxy.cpp HelloWorldDBusDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-DBus -ldbus-1 -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -I $SDKTARGETSYSROOT/usr/include/dbus-1.0/ -I $SDKTARGETSYSROOT/usr/lib/dbus-1.0/include/ -o HelloWorldClient
+}
+
+function test_deploy {
+ put HelloWorldService $BOARD_TESTDIR/fuego.$TESTDIR/
+ put HelloWorldClient $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+ if (./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if ./HelloWorldClient; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
+ pkill HelloWorldServi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.commonAPI_SomeIp/commonAPI_SomeIp.sh b/engine/tests/Functional.commonAPI_SomeIp/commonAPI_SomeIp.sh
deleted file mode 100755
index c47d56b..0000000
--- a/engine/tests/Functional.commonAPI_SomeIp/commonAPI_SomeIp.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-tarball=commonAPI_SomeIp.tar.gz
-
-function test_build {
- $CXX -std=gnu++11 HelloWorldService.cpp HelloWorldStubImpl.cpp HelloWorldSomeIPStubAdapter.cpp HelloWorldStubDefault.cpp HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldService
- $CXX -std=gnu++11 HelloWorldClient.cpp HelloWorldSomeIPProxy.cpp HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldClient
-}
-
-function test_deploy {
- put HelloWorldService $BOARD_TESTDIR/fuego.$TESTDIR/
- put HelloWorldClient $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./fidl/vsomeip.json $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; export VSOMEIP_CONFIGURATION_FILE=./fidl/vsomeip.json; chmod 777 *;
- if (VSOMEIP_APPLICATION_NAME=service-sample ./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if (VSOMEIP_APPLICATION_NAME=client-sample ./HelloWorldClient); then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
- pkill HelloWorldServi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.commonAPI_SomeIp/fuego_test.sh b/engine/tests/Functional.commonAPI_SomeIp/fuego_test.sh
new file mode 100755
index 0000000..c47d56b
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_SomeIp/fuego_test.sh
@@ -0,0 +1,28 @@
+tarball=commonAPI_SomeIp.tar.gz
+
+function test_build {
+ $CXX -std=gnu++11 HelloWorldService.cpp HelloWorldStubImpl.cpp HelloWorldSomeIPStubAdapter.cpp HelloWorldStubDefault.cpp HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldService
+ $CXX -std=gnu++11 HelloWorldClient.cpp HelloWorldSomeIPProxy.cpp HelloWorldSomeIPDeployment.cpp -rdynamic -lCommonAPI -lCommonAPI-SomeIP -lvsomeip -I $SDKTARGETSYSROOT/usr/include/CommonAPI-3.1/ -o HelloWorldClient
+}
+
+function test_deploy {
+ put HelloWorldService $BOARD_TESTDIR/fuego.$TESTDIR/
+ put HelloWorldClient $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./fidl/vsomeip.json $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; export VSOMEIP_CONFIGURATION_FILE=./fidl/vsomeip.json; chmod 777 *;
+ if (VSOMEIP_APPLICATION_NAME=service-sample ./HelloWorldService &); then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if (VSOMEIP_APPLICATION_NAME=client-sample ./HelloWorldClient); then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;
+ pkill HelloWorldServi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.crashme/crashme.sh b/engine/tests/Functional.crashme/crashme.sh
deleted file mode 100755
index 58eac9f..0000000
--- a/engine/tests/Functional.crashme/crashme.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-tarball=crashme_2.4.tar.bz2
-
-function test_build {
- patch -p1 -N -s < $TEST_HOME/crashme_2.4-9.patch
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put crashme $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_CRASHME_NBYTES
- assert_define FUNCTIONAL_CRASHME_INC
- assert_define FUNCTIONAL_CRASHME_SRAND
- assert_define FUNCTIONAL_CRASHME_NTRYS
- assert_define FUNCTIONAL_CRASHME_NSUB
-
- report "cd $BOARD_TESTDIR/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"
-}
-
-
diff --git a/engine/tests/Functional.crashme/fuego_test.sh b/engine/tests/Functional.crashme/fuego_test.sh
new file mode 100755
index 0000000..58eac9f
--- /dev/null
+++ b/engine/tests/Functional.crashme/fuego_test.sh
@@ -0,0 +1,26 @@
+tarball=crashme_2.4.tar.bz2
+
+function test_build {
+ patch -p1 -N -s < $TEST_HOME/crashme_2.4-9.patch
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put crashme $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_CRASHME_NBYTES
+ assert_define FUNCTIONAL_CRASHME_INC
+ assert_define FUNCTIONAL_CRASHME_SRAND
+ assert_define FUNCTIONAL_CRASHME_NTRYS
+ assert_define FUNCTIONAL_CRASHME_NSUB
+
+ report "cd $BOARD_TESTDIR/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"
+}
+
+
diff --git a/engine/tests/Functional.croco/croco.sh b/engine/tests/Functional.croco/croco.sh
deleted file mode 100755
index f1a26dc..0000000
--- a/engine/tests/Functional.croco/croco.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-tarball=libcroco-0.6.11.tar.gz
-
-function test_build {
- echo " test_build croco.sh "
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}usr/share/aclocal
- autoreconf --verbose --install --force --exclude=autopoint
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX --enable-Bsymbolic=auto
- make
- mkdir -p test_croco
- cp tests/.libs/* test_croco
- cp tests/test-inputs/test*.css test_croco
- tar czvf croco_test_libs.tar.gz test_croco
-}
-
-function test_deploy {
- put croco_test_libs.tar.gz $BOARD_TESTDIR/fuego.$TESTDIR/;
- put $TEST_HOME/croco_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v croco_test.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "10" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.croco/fuego_test.sh b/engine/tests/Functional.croco/fuego_test.sh
new file mode 100755
index 0000000..f1a26dc
--- /dev/null
+++ b/engine/tests/Functional.croco/fuego_test.sh
@@ -0,0 +1,33 @@
+tarball=libcroco-0.6.11.tar.gz
+
+function test_build {
+ echo " test_build croco.sh "
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}usr/share/aclocal
+ autoreconf --verbose --install --force --exclude=autopoint
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX --enable-Bsymbolic=auto
+ make
+ mkdir -p test_croco
+ cp tests/.libs/* test_croco
+ cp tests/test-inputs/test*.css test_croco
+ tar czvf croco_test_libs.tar.gz test_croco
+}
+
+function test_deploy {
+ put croco_test_libs.tar.gz $BOARD_TESTDIR/fuego.$TESTDIR/;
+ put $TEST_HOME/croco_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v croco_test.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "10" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.curl/curl.sh b/engine/tests/Functional.curl/curl.sh
deleted file mode 100755
index bdd3d88..0000000
--- a/engine/tests/Functional.curl/curl.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- true
-}
-
-function test_run {
-report "if curl -o test.html www.baidu.com > /dev/null; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if curl -i -r 0-1024 http://www.sina.com.cn -o sina_part1.html > /dev/null; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
-if curl -v www.baidu.com > /dev/null; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
-if curl -V > /dev/null; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
-if curl -y 30 www.baidu.com > /dev/null; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
-if curl -q www.baidu.com > /dev/null;then echo Enter && echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "6" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.curl/fuego_test.sh b/engine/tests/Functional.curl/fuego_test.sh
new file mode 100755
index 0000000..bdd3d88
--- /dev/null
+++ b/engine/tests/Functional.curl/fuego_test.sh
@@ -0,0 +1,23 @@
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ true
+}
+
+function test_run {
+report "if curl -o test.html www.baidu.com > /dev/null; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if curl -i -r 0-1024 http://www.sina.com.cn -o sina_part1.html > /dev/null; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+if curl -v www.baidu.com > /dev/null; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+if curl -V > /dev/null; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
+if curl -y 30 www.baidu.com > /dev/null; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
+if curl -q www.baidu.com > /dev/null;then echo Enter && echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "6" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.expat/expat.sh b/engine/tests/Functional.expat/expat.sh
deleted file mode 100755
index 7b41cbf..0000000
--- a/engine/tests/Functional.expat/expat.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-tarball=expat-2.0.0.tar.gz
-
-function test_build {
- # This patch adds pass/fail output for tests.
- cd tests
- patch -p0 < $TEST_HOME/xmltest.sh.patch
- cd -
-
- # XML Test Suite
- mkdir -p XML-Test-Suite
-
- # Possible defect - hardcoded xmlts name
- tar zxf $TEST_HOME/xmlts20080827.tar.gz -C XML-Test-Suite
-
- CXXFLAGS='-I. -I./lib -g -O2'
- ./configure --build=`uname -m`-gnu-linux --host="$PREFIX" #CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
- make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" 1>/dev/null
- make CFLAGS="$CFLAGS" CC="$CC" CXX=$PREFIX-g++ CXX="$CXX" CXXFLAGS="$CXXFLAGS" tests/runtestspp; 1>/dev/null && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- tar cf XML-Test-Suite.tar XML-Test-Suite/
- put XML-Test-Suite.tar tests/.libs/* tests/xmltest.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
-
- cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; tar xf XML-Test-Suite.tar"
- cmd "mkdir -p $BOARD_TESTDIR/xmlwf";
-
- put xmlwf/.libs/xmlwf $BOARD_TESTDIR/xmlwf/xmlwf;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./runtestspp 2>&1 | tr ',' '\n'| sed s/^\ //"
- report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./xmltest.sh"
-}
-
-function test_processing {
- assert_define EXPAT_SUBTEST_COUNT_POS
- assert_define EXPAT_SUBTEST_COUNT_NEG
-
- log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_POS "100%: Checks: 48|passed" "p"
- log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_NEG "failed" "n"
-}
-
-
-
diff --git a/engine/tests/Functional.expat/fuego_test.sh b/engine/tests/Functional.expat/fuego_test.sh
new file mode 100755
index 0000000..7b41cbf
--- /dev/null
+++ b/engine/tests/Functional.expat/fuego_test.sh
@@ -0,0 +1,45 @@
+tarball=expat-2.0.0.tar.gz
+
+function test_build {
+ # This patch adds pass/fail output for tests.
+ cd tests
+ patch -p0 < $TEST_HOME/xmltest.sh.patch
+ cd -
+
+ # XML Test Suite
+ mkdir -p XML-Test-Suite
+
+ # Possible defect - hardcoded xmlts name
+ tar zxf $TEST_HOME/xmlts20080827.tar.gz -C XML-Test-Suite
+
+ CXXFLAGS='-I. -I./lib -g -O2'
+ ./configure --build=`uname -m`-gnu-linux --host="$PREFIX" #CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
+ make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" 1>/dev/null
+ make CFLAGS="$CFLAGS" CC="$CC" CXX=$PREFIX-g++ CXX="$CXX" CXXFLAGS="$CXXFLAGS" tests/runtestspp; 1>/dev/null && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ tar cf XML-Test-Suite.tar XML-Test-Suite/
+ put XML-Test-Suite.tar tests/.libs/* tests/xmltest.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+
+ cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; tar xf XML-Test-Suite.tar"
+ cmd "mkdir -p $BOARD_TESTDIR/xmlwf";
+
+ put xmlwf/.libs/xmlwf $BOARD_TESTDIR/xmlwf/xmlwf;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./runtestspp 2>&1 | tr ',' '\n'| sed s/^\ //"
+ report_append "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./xmltest.sh"
+}
+
+function test_processing {
+ assert_define EXPAT_SUBTEST_COUNT_POS
+ assert_define EXPAT_SUBTEST_COUNT_NEG
+
+ log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_POS "100%: Checks: 48|passed" "p"
+ log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_NEG "failed" "n"
+}
+
+
+
diff --git a/engine/tests/Functional.fixesproto/fixesproto.sh b/engine/tests/Functional.fixesproto/fixesproto.sh
deleted file mode 100755
index 8521368..0000000
--- a/engine/tests/Functional.fixesproto/fixesproto.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#tarball=images.tar.gz
-
-function test_build {
- echo "#!/bin/bash
- if [ -f /usr/include/X11/extensions/xfixesproto.h ]; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- if [ -f /usr/include/X11/extensions/xfixeswire.h ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
- if [ -f /usr/lib/pkgconfig/fixesproto.pc ]; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
- " > run-tests.sh
-
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.fixesproto/fuego_test.sh b/engine/tests/Functional.fixesproto/fuego_test.sh
new file mode 100755
index 0000000..8521368
--- /dev/null
+++ b/engine/tests/Functional.fixesproto/fuego_test.sh
@@ -0,0 +1,26 @@
+#tarball=images.tar.gz
+
+function test_build {
+ echo "#!/bin/bash
+ if [ -f /usr/include/X11/extensions/xfixesproto.h ]; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ if [ -f /usr/include/X11/extensions/xfixeswire.h ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
+ if [ -f /usr/lib/pkgconfig/fixesproto.pc ]; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
+ " > run-tests.sh
+
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.fontconfig/fontconfig.sh b/engine/tests/Functional.fontconfig/fontconfig.sh
deleted file mode 100755
index a80d2e4..0000000
--- a/engine/tests/Functional.fontconfig/fontconfig.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-tarball=fontconfig-2.6.0.tar.gz
-
-function test_build {
- sed -i -e "s/FCLIST=\.\.\/fc\-list\/fc\-list/FCLIST=\/usr\/bin\/fc\-list/g" -e "s/FCCACHE=\.\.\/fc\-cache\/fc\-cache/FCCACHE=\/usr\/bin\/fc\-cache/g" test/run-test.sh
-}
-
-function test_deploy {
- put test/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; if ''bash run-test.sh''; then echo 'TEST PASS'; else echo 'TEST FAIL'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "TEST PASS" "p"
- log_compare "$TESTDIR" "0" "TEST FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.fontconfig/fuego_test.sh b/engine/tests/Functional.fontconfig/fuego_test.sh
new file mode 100755
index 0000000..a80d2e4
--- /dev/null
+++ b/engine/tests/Functional.fontconfig/fuego_test.sh
@@ -0,0 +1,20 @@
+tarball=fontconfig-2.6.0.tar.gz
+
+function test_build {
+ sed -i -e "s/FCLIST=\.\.\/fc\-list\/fc\-list/FCLIST=\/usr\/bin\/fc\-list/g" -e "s/FCCACHE=\.\.\/fc\-cache\/fc\-cache/FCCACHE=\/usr\/bin\/fc\-cache/g" test/run-test.sh
+}
+
+function test_deploy {
+ put test/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; if ''bash run-test.sh''; then echo 'TEST PASS'; else echo 'TEST FAIL'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "TEST PASS" "p"
+ log_compare "$TESTDIR" "0" "TEST FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.fsfuzz/fsfuzz.sh b/engine/tests/Functional.fsfuzz/fsfuzz.sh
deleted file mode 100644
index ea36f75..0000000
--- a/engine/tests/Functional.fsfuzz/fsfuzz.sh
+++ /dev/null
@@ -1 +0,0 @@
-FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.fsfuzz/fuego_test.sh b/engine/tests/Functional.fsfuzz/fuego_test.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Functional.fsfuzz/fuego_test.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.ft2demos/ft2demos.sh b/engine/tests/Functional.ft2demos/ft2demos.sh
deleted file mode 100755
index e9ea078..0000000
--- a/engine/tests/Functional.ft2demos/ft2demos.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-tarball=ft2demos-2.3.6.tar.bz2
-
-function test_build {
- # ft2demos depends on already built freetype2. Moreover,
- # it is expected that freetype2 directory is located on the same
- # level with ft2demos. Hence, nostrip flag.
- # Freetype2
-
- # A2 variable represents FT2 version
- a2=${tarball/*-}
- # Original Freetype2 package w/o tests.
- ft_tarball=freetype-${a2%.*.*}.tar.bz2
-
- tar jxf "$TEST_HOME/$ft_tarball"
- mv ${ft_tarball%.*.*} freetype2
-
- cd freetype2
- ./configure --build=`uname -m`-linux-gnu --host=$HOST $OPTIONS CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" --target="$HOST"
- make
-
- # Freetype2 Demos
-
- cd ../${tarball%.tar*}
- patch -N -s -p0 < $TEST_HOME/ft2demos.Makefile.patch
- export PATH=/usr/local/bin/:$PATH
- SDKROOT=$SDKROOT CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP LD=$LD make && touch ../test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put ${tarball%.tar*}/bin/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1"
-}
-
-
-function test_processing {
- log_compare "$TESTDIR" "12" ".*family:" "p"
- log_compare "$TESTDIR" "0" "fail|error|FAIL|ERROR" "n"
-}
-
-source $FUEGO_CORE/engine/scripts/overlays.sh
-set_overlay_vars
-
-source $FUEGO_CORE/engine/scripts/reports.sh
-source $FUEGO_CORE/engine/scripts/functions.sh
-
-pre_test $TESTDIR
-
-if $Rebuild; then
- build nostrip
-fi
-
-deploy
-
-test_run
-
-get_testlog $TESTDIR
-
-test_processing
diff --git a/engine/tests/Functional.ft2demos/fuego_test.sh b/engine/tests/Functional.ft2demos/fuego_test.sh
new file mode 100755
index 0000000..e9ea078
--- /dev/null
+++ b/engine/tests/Functional.ft2demos/fuego_test.sh
@@ -0,0 +1,61 @@
+tarball=ft2demos-2.3.6.tar.bz2
+
+function test_build {
+ # ft2demos depends on already built freetype2. Moreover,
+ # it is expected that freetype2 directory is located on the same
+ # level with ft2demos. Hence, nostrip flag.
+ # Freetype2
+
+ # A2 variable represents FT2 version
+ a2=${tarball/*-}
+ # Original Freetype2 package w/o tests.
+ ft_tarball=freetype-${a2%.*.*}.tar.bz2
+
+ tar jxf "$TEST_HOME/$ft_tarball"
+ mv ${ft_tarball%.*.*} freetype2
+
+ cd freetype2
+ ./configure --build=`uname -m`-linux-gnu --host=$HOST $OPTIONS CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" --target="$HOST"
+ make
+
+ # Freetype2 Demos
+
+ cd ../${tarball%.tar*}
+ patch -N -s -p0 < $TEST_HOME/ft2demos.Makefile.patch
+ export PATH=/usr/local/bin/:$PATH
+ SDKROOT=$SDKROOT CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP LD=$LD make && touch ../test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put ${tarball%.tar*}/bin/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ls -1 /usr/share/fonts/truetype/* | xargs -n1 ./ftdump $1"
+}
+
+
+function test_processing {
+ log_compare "$TESTDIR" "12" ".*family:" "p"
+ log_compare "$TESTDIR" "0" "fail|error|FAIL|ERROR" "n"
+}
+
+source $FUEGO_CORE/engine/scripts/overlays.sh
+set_overlay_vars
+
+source $FUEGO_CORE/engine/scripts/reports.sh
+source $FUEGO_CORE/engine/scripts/functions.sh
+
+pre_test $TESTDIR
+
+if $Rebuild; then
+ build nostrip
+fi
+
+deploy
+
+test_run
+
+get_testlog $TESTDIR
+
+test_processing
diff --git a/engine/tests/Functional.fuego_abort/fuego_abort.sh b/engine/tests/Functional.fuego_abort/fuego_abort.sh
deleted file mode 100755
index 6865052..0000000
--- a/engine/tests/Functional.fuego_abort/fuego_abort.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-set -x
-
-tarball=none
-
-function test_pre_check {
- # if you don't use nohup, ssh transport will hang trying to background fuegosleep
- is_on_target nohup PROGRAM_NOHUP /usr/bin
- assert_define PROGRAM_NOHUP
- echo "This test has pid $$"
-}
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- true
-}
-
-function test_run {
- # leave a process running on the target
- cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; ln -sf /bin/sleep fuegosleep ; $PROGRAM_NOHUP ./fuegosleep 10000 >/dev/null 2>&1 &"
- report 'echo "Started fuegosleep command from test_run"'
- # leave time here, for user to abort job
- # 1) in Jenkins interface
- # 2) from command line (ftc abort-test)
- # 3) from command line (kill fuego_abort.sh)
- sleep 120
- # now do an internal abort job
- abort_job
-}
-
-function test_processing {
- true
-}
-
-function more_handler1 {
- echo "in more_handler1 - got another SIGTERM"
- echo "in more_handler1 - got another SIGTERM" >>$LOGFILE
-}
-
-function more_handler2 {
- echo "in more_handler2 - got another SIGINT"
- echo "in more_handler2 - got another SIGINT" >>$LOGFILE
-}
-
-function more_handler3 {
- echo "in more_handler3 - got another SIGHUP"
- echo "in more_handler3 - got another SIGHUP" >>$LOGFILE
-}
-
-function more_handler4 {
- echo "in more_handler4 - got another ERR"
- echo "in more_handler4 - got another ERR" >>$LOGFILE
-}
-
-function more_handler5 {
- echo "in more_handler5 - got another EXIT"
- echo "in more_handler5 - got another EXIT" >>$LOGFILE
-}
-
-function test_cleanup {
- set +e
-
- # last chance to put something into the log
- # but have to do it directly
- LOGFILE=${LOGDIR}/testlog.txt
-
- # check if more traps occur
- trap more_handler1 SIGTERM
- trap more_handler2 SIGINT
- trap more_handler3 SIGHUP
- trap more_handler4 ERR
- trap more_handler5 EXIT
-
- echo "########" >>$LOGFILE
- echo "Items from here on are from 'test_cleanup' (after the actual test run)" >>$LOGFILE
- echo "this means we are in post_test" >>$LOGFILE
-
- # do some timing to see how long this lasts:
- for i in $(seq 10) ; do
- echo "$i delay"
- echo "$i delay" >>$LOGFILE
- sleep 1
- done
-
- # see if fuegosleep is still running on target
- TMPFILE="/tmp/$$-${RANDOM}"
- TMPFILE2="/tmp/$$-${RANDOM}"
- cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
- get $TMPFILE $TMPFILE2
- cmd "rm $TMPFILE"
-
- echo "'fuegosleep' should appear in this log exactly once (except on docker board)" >>$LOGFILE
- echo "before kill_procs:" >>$LOGFILE
- cat $TMPFILE2 >>$LOGFILE
- rm $TMPFILE2
-
- # try to kill fuegosleep
- kill_procs fuegosleep
-
- # check if fuegosleep is still running on target
- TMPFILE="/tmp/$$-${RANDOM}"
- TMPFILE2="/tmp/$$-${RANDOM}"
- cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
- get $TMPFILE $TMPFILE2
- cmd "rm $TMPFILE"
- echo "after kill_procs:" >>$LOGFILE
- cat $TMPFILE2 >>$LOGFILE
- rm $TMPFILE2
-
- echo "Leaving test_cleanup"
- echo "Leaving test_cleanup" >>$LOGFILE
- set -e
-}
-
-
diff --git a/engine/tests/Functional.fuego_abort/fuego_test.sh b/engine/tests/Functional.fuego_abort/fuego_test.sh
new file mode 100755
index 0000000..6865052
--- /dev/null
+++ b/engine/tests/Functional.fuego_abort/fuego_test.sh
@@ -0,0 +1,119 @@
+#!/bin/bash
+
+set -x
+
+tarball=none
+
+function test_pre_check {
+ # if you don't use nohup, ssh transport will hang trying to background fuegosleep
+ is_on_target nohup PROGRAM_NOHUP /usr/bin
+ assert_define PROGRAM_NOHUP
+ echo "This test has pid $$"
+}
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ true
+}
+
+function test_run {
+ # leave a process running on the target
+ cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; ln -sf /bin/sleep fuegosleep ; $PROGRAM_NOHUP ./fuegosleep 10000 >/dev/null 2>&1 &"
+ report 'echo "Started fuegosleep command from test_run"'
+ # leave time here, for user to abort job
+ # 1) in Jenkins interface
+ # 2) from command line (ftc abort-test)
+ # 3) from command line (kill fuego_abort.sh)
+ sleep 120
+ # now do an internal abort job
+ abort_job
+}
+
+function test_processing {
+ true
+}
+
+function more_handler1 {
+ echo "in more_handler1 - got another SIGTERM"
+ echo "in more_handler1 - got another SIGTERM" >>$LOGFILE
+}
+
+function more_handler2 {
+ echo "in more_handler2 - got another SIGINT"
+ echo "in more_handler2 - got another SIGINT" >>$LOGFILE
+}
+
+function more_handler3 {
+ echo "in more_handler3 - got another SIGHUP"
+ echo "in more_handler3 - got another SIGHUP" >>$LOGFILE
+}
+
+function more_handler4 {
+ echo "in more_handler4 - got another ERR"
+ echo "in more_handler4 - got another ERR" >>$LOGFILE
+}
+
+function more_handler5 {
+ echo "in more_handler5 - got another EXIT"
+ echo "in more_handler5 - got another EXIT" >>$LOGFILE
+}
+
+function test_cleanup {
+ set +e
+
+ # last chance to put something into the log
+ # but have to do it directly
+ LOGFILE=${LOGDIR}/testlog.txt
+
+ # check if more traps occur
+ trap more_handler1 SIGTERM
+ trap more_handler2 SIGINT
+ trap more_handler3 SIGHUP
+ trap more_handler4 ERR
+ trap more_handler5 EXIT
+
+ echo "########" >>$LOGFILE
+ echo "Items from here on are from 'test_cleanup' (after the actual test run)" >>$LOGFILE
+ echo "this means we are in post_test" >>$LOGFILE
+
+ # do some timing to see how long this lasts:
+ for i in $(seq 10) ; do
+ echo "$i delay"
+ echo "$i delay" >>$LOGFILE
+ sleep 1
+ done
+
+ # see if fuegosleep is still running on target
+ TMPFILE="/tmp/$$-${RANDOM}"
+ TMPFILE2="/tmp/$$-${RANDOM}"
+ cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
+ get $TMPFILE $TMPFILE2
+ cmd "rm $TMPFILE"
+
+ echo "'fuegosleep' should appear in this log exactly once (except on docker board)" >>$LOGFILE
+ echo "before kill_procs:" >>$LOGFILE
+ cat $TMPFILE2 >>$LOGFILE
+ rm $TMPFILE2
+
+ # try to kill fuegosleep
+ kill_procs fuegosleep
+
+ # check if fuegosleep is still running on target
+ TMPFILE="/tmp/$$-${RANDOM}"
+ TMPFILE2="/tmp/$$-${RANDOM}"
+ cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
+ get $TMPFILE $TMPFILE2
+ cmd "rm $TMPFILE"
+ echo "after kill_procs:" >>$LOGFILE
+ cat $TMPFILE2 >>$LOGFILE
+ rm $TMPFILE2
+
+ echo "Leaving test_cleanup"
+ echo "Leaving test_cleanup" >>$LOGFILE
+ set -e
+}
+
+
diff --git a/engine/tests/Functional.fuego_board_check/fuego_board_check.sh b/engine/tests/Functional.fuego_board_check/fuego_board_check.sh
deleted file mode 100755
index 2374ae4..0000000
--- a/engine/tests/Functional.fuego_board_check/fuego_board_check.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-tarfile=scan_for_items.sh
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put $TEST_HOME/scan_for_items.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scan_for_items.sh $BOARD_TESTDIR"
-
- # now do some host-driven tests
-
- # do a transport speed test
- tmpfile=$(mktemp)
- filename=$(basename $tmpfile)
- dd if=/dev/urandom bs=1000 count=10 of=$tmpfile
- put_start=$(date +"%s.%N")
- put $tmpfile $BOARD_TESTDIR/fuego.$TESTDIR/
- put_end=$(date +"%s.%N")
- put_time=$(python -c "print \"%.2f\" % ($put_end - $put_start)")
-
- put_str="Time to put 10K file: $put_time"
- rm "$tmpfile"
-
- get_start=$(date +"%s.%N")
- get $BOARD_TESTDIR/fuego.$TESTDIR/$filename $tmpfile
- get_end=$(date +"%s.%N")
- get_time=$(python -c "print \"%.2f\" % ($get_end - $get_start)")
- get_str="Time to get 10K file: $get_time"
-
- rm "$tmpfile"
- cmd "rm $BOARD_TESTDIR/fuego.$TESTDIR/$filename"
-
- cmd_start=$(date +"%s.%N")
- for i in $(seq 10) ; do
- cmd true ;
- done
- cmd_end=$(date +"%s.%N")
- cmd_time=$(python -c "print \"%.2f\" % ($cmd_end - $cmd_start)")
- cmd_str="Time to do 10 cmds: $cmd_time"
- cmd1_time=$(python -c "print \"%.2f\" % ($cmd_time / 10 )")
- cmd1_str="Average time per cmd: $cmd1_time"
-
- report_append "echo Data from host:"
- report_append "echo TRANSPORT=$TRANSPORT"
- report_append "echo $put_str"
- report_append "echo $get_str"
- report_append "echo $cmd_str"
- report_append "echo $cmd1_str"
-
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "SUCCESS" "p"
-}
-
-
diff --git a/engine/tests/Functional.fuego_board_check/fuego_test.sh b/engine/tests/Functional.fuego_board_check/fuego_test.sh
new file mode 100755
index 0000000..2374ae4
--- /dev/null
+++ b/engine/tests/Functional.fuego_board_check/fuego_test.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+tarfile=scan_for_items.sh
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put $TEST_HOME/scan_for_items.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scan_for_items.sh $BOARD_TESTDIR"
+
+ # now do some host-driven tests
+
+ # do a transport speed test
+ tmpfile=$(mktemp)
+ filename=$(basename $tmpfile)
+ dd if=/dev/urandom bs=1000 count=10 of=$tmpfile
+ put_start=$(date +"%s.%N")
+ put $tmpfile $BOARD_TESTDIR/fuego.$TESTDIR/
+ put_end=$(date +"%s.%N")
+ put_time=$(python -c "print \"%.2f\" % ($put_end - $put_start)")
+
+ put_str="Time to put 10K file: $put_time"
+ rm "$tmpfile"
+
+ get_start=$(date +"%s.%N")
+ get $BOARD_TESTDIR/fuego.$TESTDIR/$filename $tmpfile
+ get_end=$(date +"%s.%N")
+ get_time=$(python -c "print \"%.2f\" % ($get_end - $get_start)")
+ get_str="Time to get 10K file: $get_time"
+
+ rm "$tmpfile"
+ cmd "rm $BOARD_TESTDIR/fuego.$TESTDIR/$filename"
+
+ cmd_start=$(date +"%s.%N")
+ for i in $(seq 10) ; do
+ cmd true ;
+ done
+ cmd_end=$(date +"%s.%N")
+ cmd_time=$(python -c "print \"%.2f\" % ($cmd_end - $cmd_start)")
+ cmd_str="Time to do 10 cmds: $cmd_time"
+ cmd1_time=$(python -c "print \"%.2f\" % ($cmd_time / 10 )")
+ cmd1_str="Average time per cmd: $cmd1_time"
+
+ report_append "echo Data from host:"
+ report_append "echo TRANSPORT=$TRANSPORT"
+ report_append "echo $put_str"
+ report_append "echo $get_str"
+ report_append "echo $cmd_str"
+ report_append "echo $cmd1_str"
+
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "SUCCESS" "p"
+}
+
+
diff --git a/engine/tests/Functional.fuego_test_phases/fuego_test.sh b/engine/tests/Functional.fuego_test_phases/fuego_test.sh
new file mode 100755
index 0000000..80251c9
--- /dev/null
+++ b/engine/tests/Functional.fuego_test_phases/fuego_test.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+tarball=none
+
+export PHASE_STR="script load"
+
+# use string concatenation to test phase ordering
+function test_pre_check {
+ PHASE_STR="${PHASE_STR}:test_pre_check"
+ # if you don't use nohup, ssh transport will hang trying to background fuegosleep
+ is_on_target nohup PROGRAM_NOHUP /usr/bin
+ assert_define PROGRAM_NOHUP
+}
+
+function test_build {
+ PHASE_STR="${PHASE_STR}:test_build"
+ touch test_suite_ready
+}
+
+function test_deploy {
+ PHASE_STR="${PHASE_STR}:test_deploy"
+ true
+}
+
+function test_run {
+ PHASE_STR="${PHASE_STR}:test_run"
+ # leave a process running on the target
+ cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; ln -sf /bin/sleep fuegosleep ; $PROGRAM_NOHUP ./fuegosleep 10000 >/dev/null 2>&1 &"
+ report 'echo "Started fuegosleep command from test_run" ; echo "PHASE_STR (so far)=${PHASE_STR}"'
+}
+
+function test_processing {
+ PHASE_STR="${PHASE_STR}:test_processing"
+ true
+}
+
+function test_cleanup {
+ PHASE_STR="${PHASE_STR}:test_cleanup"
+
+ set +e
+
+ # last chance to put something into the log
+ # but have to do it directly
+ LOGFILE=${LOGDIR}/testlog.txt
+ echo "########" >>$LOGFILE
+ echo "Items from here on are from 'test_cleanup' (after the actual test run)" >>$LOGFILE
+
+ # see if fuegosleep is still running on target
+ TMPFILE="/tmp/$$-${RANDOM}"
+ TMPFILE2="/tmp/$$-${RANDOM}"
+ cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
+ get $TMPFILE $TMPFILE2
+ cmd "rm $TMPFILE"
+
+ echo "'fuegosleep' should appear in this log exactly once" >>$LOGFILE
+ echo "before kill_procs:" >>$LOGFILE
+ cat $TMPFILE2 >>$LOGFILE
+ rm $TMPFILE2
+
+ # try to kill fuegosleep
+ kill_procs fuegosleep
+
+ # check if fuegosleep is still running on target
+ TMPFILE="/tmp/$$-${RANDOM}"
+ TMPFILE2="/tmp/$$-${RANDOM}"
+ cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
+ get $TMPFILE $TMPFILE2
+ cmd "rm $TMPFILE"
+ echo "after kill_procs:" >>$LOGFILE
+ cat $TMPFILE2 >>$LOGFILE
+ rm $TMPFILE2
+
+ echo "PHASE_STR=$PHASE_STR" >>$LOGFILE
+ set -e
+}
+
+
diff --git a/engine/tests/Functional.fuego_test_phases/fuego_test_phases.sh b/engine/tests/Functional.fuego_test_phases/fuego_test_phases.sh
deleted file mode 100755
index 80251c9..0000000
--- a/engine/tests/Functional.fuego_test_phases/fuego_test_phases.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-
-tarball=none
-
-export PHASE_STR="script load"
-
-# use string concatenation to test phase ordering
-function test_pre_check {
- PHASE_STR="${PHASE_STR}:test_pre_check"
- # if you don't use nohup, ssh transport will hang trying to background fuegosleep
- is_on_target nohup PROGRAM_NOHUP /usr/bin
- assert_define PROGRAM_NOHUP
-}
-
-function test_build {
- PHASE_STR="${PHASE_STR}:test_build"
- touch test_suite_ready
-}
-
-function test_deploy {
- PHASE_STR="${PHASE_STR}:test_deploy"
- true
-}
-
-function test_run {
- PHASE_STR="${PHASE_STR}:test_run"
- # leave a process running on the target
- cmd "cd $BOARD_TESTDIR/fuego.$TESTDIR; ln -sf /bin/sleep fuegosleep ; $PROGRAM_NOHUP ./fuegosleep 10000 >/dev/null 2>&1 &"
- report 'echo "Started fuegosleep command from test_run" ; echo "PHASE_STR (so far)=${PHASE_STR}"'
-}
-
-function test_processing {
- PHASE_STR="${PHASE_STR}:test_processing"
- true
-}
-
-function test_cleanup {
- PHASE_STR="${PHASE_STR}:test_cleanup"
-
- set +e
-
- # last chance to put something into the log
- # but have to do it directly
- LOGFILE=${LOGDIR}/testlog.txt
- echo "########" >>$LOGFILE
- echo "Items from here on are from 'test_cleanup' (after the actual test run)" >>$LOGFILE
-
- # see if fuegosleep is still running on target
- TMPFILE="/tmp/$$-${RANDOM}"
- TMPFILE2="/tmp/$$-${RANDOM}"
- cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
- get $TMPFILE $TMPFILE2
- cmd "rm $TMPFILE"
-
- echo "'fuegosleep' should appear in this log exactly once" >>$LOGFILE
- echo "before kill_procs:" >>$LOGFILE
- cat $TMPFILE2 >>$LOGFILE
- rm $TMPFILE2
-
- # try to kill fuegosleep
- kill_procs fuegosleep
-
- # check if fuegosleep is still running on target
- TMPFILE="/tmp/$$-${RANDOM}"
- TMPFILE2="/tmp/$$-${RANDOM}"
- cmd "ps | grep fuegosleep | grep -v grep >$TMPFILE"
- get $TMPFILE $TMPFILE2
- cmd "rm $TMPFILE"
- echo "after kill_procs:" >>$LOGFILE
- cat $TMPFILE2 >>$LOGFILE
- rm $TMPFILE2
-
- echo "PHASE_STR=$PHASE_STR" >>$LOGFILE
- set -e
-}
-
-
diff --git a/engine/tests/Functional.fuego_transport/fuego_test.sh b/engine/tests/Functional.fuego_transport/fuego_test.sh
new file mode 100644
index 0000000..bf4667b
--- /dev/null
+++ b/engine/tests/Functional.fuego_transport/fuego_test.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+tarball=fuego-transport-1.0.tgz
+
+function test_build {
+ return 0
+}
+
+function test_deploy {
+ return 0
+}
+
+function test_run {
+ # copy some files to the target under different conditions
+ # get is tested by the system, with log retrieval
+ desc="test single file put"
+ DESTDIR=$BOARD_TESTDIR/fuego.$TESTDIR
+ put bartop $DESTDIR
+ report "if [ -f $DESTDIR/bartop ] ; then echo \"ok 1 $desc\" ; else echo \"not ok 1 $desc\" ; fi"
+ cmd "rm $DESTDIR/bartop"
+
+ desc="test multiple file put"
+ put footop foo2top $DESTDIR
+ report_append "if [ -f $DESTDIR/footop -a -f $DESTDIR/foo2top ] ; then echo \"ok 2 $desc\" ; else echo \"not ok 2 $desc\" ; fi"
+ cmd "rm $DESTDIR/foo*top"
+
+ desc="test wildcard file put"
+ put foo*top $DESTDIR
+ report_append "if [ -f $DESTDIR/footop -a -f $DESTDIR/foo2top ] ; then echo \"ok 3 $desc\" ; else echo \"not ok 3 $desc\" ; fi"
+ cmd "rm $DESTDIR/foo*top"
+
+ desc="test recursive directory put"
+ put dir1 $DESTDIR
+ report_append "if [ -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar ] ; then echo \"ok 4 $desc\" ; else echo \"not ok 4 $desc\" ; fi"
+ cmd "rm $DESTDIR/dir1/*"
+ cmd "rmdir $DESTDIR/dir1"
+
+ desc="test multiple recursive dir put"
+ put dir1 dir2 $DESTDIR
+ report_append "if [ -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar -a -f $DESTDIR/dir2/d2foo -a -f $DESTDIR/dir2/d2bar ] ; then echo \"ok 5 $desc\" ; else echo \"not ok 5 $desc\" ; fi"
+ cmd "rm $DESTDIR/dir1/* $DESTDIR/dir2/*"
+ cmd "rmdir $DESTDIR/dir1 $DESTDIR/dir2"
+
+ desc="test multiple files, wildcards and recursive dirs put"
+ put bartop foo*top dir* $DESTDIR
+ report_append "if [ -f $DESTDIR/bartop -a -f $DESTDIR/footop -a -f $DESTDIR/foo2top -a -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar -a -f $DESTDIR/dir2/d2foo -a -f $DESTDIR/dir2/d2bar ] ; then echo \"ok 6 $desc\" ; else echo \"not ok 6 $desc\" ; fi"
+ cmd "rm $DESTDIR/bartop $DESTDIR/foo*top $DESTDIR/dir1/* $DESTDIR/dir2/*"
+ cmd "rmdir $DESTDIR/dir1 $DESTDIR/dir2"
+
+ # FIXTHIS - should try some file encodings that would be problematic for some transports
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "6" "^ok" "p"
+}
+
+
diff --git a/engine/tests/Functional.fuego_transport/fuego_transport.sh b/engine/tests/Functional.fuego_transport/fuego_transport.sh
deleted file mode 100644
index bf4667b..0000000
--- a/engine/tests/Functional.fuego_transport/fuego_transport.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-tarball=fuego-transport-1.0.tgz
-
-function test_build {
- return 0
-}
-
-function test_deploy {
- return 0
-}
-
-function test_run {
- # copy some files to the target under different conditions
- # get is tested by the system, with log retrieval
- desc="test single file put"
- DESTDIR=$BOARD_TESTDIR/fuego.$TESTDIR
- put bartop $DESTDIR
- report "if [ -f $DESTDIR/bartop ] ; then echo \"ok 1 $desc\" ; else echo \"not ok 1 $desc\" ; fi"
- cmd "rm $DESTDIR/bartop"
-
- desc="test multiple file put"
- put footop foo2top $DESTDIR
- report_append "if [ -f $DESTDIR/footop -a -f $DESTDIR/foo2top ] ; then echo \"ok 2 $desc\" ; else echo \"not ok 2 $desc\" ; fi"
- cmd "rm $DESTDIR/foo*top"
-
- desc="test wildcard file put"
- put foo*top $DESTDIR
- report_append "if [ -f $DESTDIR/footop -a -f $DESTDIR/foo2top ] ; then echo \"ok 3 $desc\" ; else echo \"not ok 3 $desc\" ; fi"
- cmd "rm $DESTDIR/foo*top"
-
- desc="test recursive directory put"
- put dir1 $DESTDIR
- report_append "if [ -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar ] ; then echo \"ok 4 $desc\" ; else echo \"not ok 4 $desc\" ; fi"
- cmd "rm $DESTDIR/dir1/*"
- cmd "rmdir $DESTDIR/dir1"
-
- desc="test multiple recursive dir put"
- put dir1 dir2 $DESTDIR
- report_append "if [ -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar -a -f $DESTDIR/dir2/d2foo -a -f $DESTDIR/dir2/d2bar ] ; then echo \"ok 5 $desc\" ; else echo \"not ok 5 $desc\" ; fi"
- cmd "rm $DESTDIR/dir1/* $DESTDIR/dir2/*"
- cmd "rmdir $DESTDIR/dir1 $DESTDIR/dir2"
-
- desc="test multiple files, wildcards and recursive dirs put"
- put bartop foo*top dir* $DESTDIR
- report_append "if [ -f $DESTDIR/bartop -a -f $DESTDIR/footop -a -f $DESTDIR/foo2top -a -f $DESTDIR/dir1/d1foo -a -f $DESTDIR/dir1/d1bar -a -f $DESTDIR/dir2/d2foo -a -f $DESTDIR/dir2/d2bar ] ; then echo \"ok 6 $desc\" ; else echo \"not ok 6 $desc\" ; fi"
- cmd "rm $DESTDIR/bartop $DESTDIR/foo*top $DESTDIR/dir1/* $DESTDIR/dir2/*"
- cmd "rmdir $DESTDIR/dir1 $DESTDIR/dir2"
-
- # FIXTHIS - should try some file encodings that would be problematic for some transports
-}
-
-function test_processing {
- log_compare "$TESTDIR" "6" "^ok" "p"
-}
-
-
diff --git a/engine/tests/Functional.fuse/fuego_test.sh b/engine/tests/Functional.fuse/fuego_test.sh
new file mode 100755
index 0000000..2d6405a
--- /dev/null
+++ b/engine/tests/Functional.fuse/fuego_test.sh
@@ -0,0 +1,27 @@
+tarball=fuse-2.9.4.tar.gz
+
+function test_build {
+ echo "fuse test build"
+ patch -p1 -N < $TEST_HOME/patch_files/0001-fuse-fix-the-return-value-of-help-option.patch
+ patch -p1 -N < $TEST_HOME/patch_files/aarch64.patch
+ patch -p1 -N < $TEST_HOME/patch_files/gold-unversioned-symbol.patch
+ ./configure --host=$PREFIX
+ make
+ tar cjf fuse_test_libs.tar.bz2 example/.libs
+}
+
+function test_deploy {
+ put fuse_test_libs.tar.bz2 $BOARD_TESTDIR/fuego.$TESTDIR/;
+ put $TEST_HOME/fuse_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v fuse_test.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "9" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.fuse/fuse.sh b/engine/tests/Functional.fuse/fuse.sh
deleted file mode 100755
index 2d6405a..0000000
--- a/engine/tests/Functional.fuse/fuse.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-tarball=fuse-2.9.4.tar.gz
-
-function test_build {
- echo "fuse test build"
- patch -p1 -N < $TEST_HOME/patch_files/0001-fuse-fix-the-return-value-of-help-option.patch
- patch -p1 -N < $TEST_HOME/patch_files/aarch64.patch
- patch -p1 -N < $TEST_HOME/patch_files/gold-unversioned-symbol.patch
- ./configure --host=$PREFIX
- make
- tar cjf fuse_test_libs.tar.bz2 example/.libs
-}
-
-function test_deploy {
- put fuse_test_libs.tar.bz2 $BOARD_TESTDIR/fuego.$TESTDIR/;
- put $TEST_HOME/fuse_test.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v fuse_test.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "9" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.giflib/fuego_test.sh b/engine/tests/Functional.giflib/fuego_test.sh
new file mode 100755
index 0000000..6c300c9
--- /dev/null
+++ b/engine/tests/Functional.giflib/fuego_test.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+tarball=giflib-4.1.6.tar.bz2
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put pic/* util/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; echo 11111111 > test_raw.raw; \
+ if gifbg -d tl -s 320 200 -c 255 255 255 -l 64 > bg1.gif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if gifwedge > test_gifwedge.gif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if gif2epsn cover.gif > cover.epsn; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if gif2ps cover.gif > cover.ps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if gif2rgb -o cover cover.gif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if gifasm bg1.gif porsche.gif > test_gifasm.gif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if gifclip -i 222 0 390 134 solid2.gif > test_gifclip.gif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if gifclrmp -i 2 cover.gif > test_gifclrmp.gif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if gifcomb porsche.gif bg1.gif > test_gifcomb.gif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if text2gif -t 'abcde' > abcde.gif; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if giffiltr <abcde.gif > test_giffiltr.gif; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if gifspnge <porsche.gif > test_gifspnge.gif; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+ if giffix cover.gif > test_giffix.gif; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if gifflip -r solid2.gif > test_gifflip.gif; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if gifhisto -b -s 200 512 porsche.gif > test_gifhisto.gif; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if gifinfo cover.gif; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if gifinter cover.gif > test_gifinter.gif; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if gifbg | gifinto test_gifinto.gif; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if gifbg | gifovly > test_gifovly.gif; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
+ if gifpos -s 720 348 -i 400 148 porsche.gif > test_gifpos.gif; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
+ if gifrotat -a 45 cover.gif > test_gifrotat.gif; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
+ if gifrsize -s 0.45 solid2.gif > test_gifrsize.gif; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
+ if giftext cover.gif > giftext.txt; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
+ if icon2gif sample.ico > test_icon2gif.gif; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
+ if raw2gif -s 1 1 test_raw.raw > test_raw2gif.gif; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
+ if gif2rgb x-trans.gif | rgb2gif -s 100 100 > test_rgb2gif.gif; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "26" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
+
diff --git a/engine/tests/Functional.giflib/giflib.sh b/engine/tests/Functional.giflib/giflib.sh
deleted file mode 100755
index 6c300c9..0000000
--- a/engine/tests/Functional.giflib/giflib.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-tarball=giflib-4.1.6.tar.bz2
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put pic/* util/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; echo 11111111 > test_raw.raw; \
- if gifbg -d tl -s 320 200 -c 255 255 255 -l 64 > bg1.gif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if gifwedge > test_gifwedge.gif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if gif2epsn cover.gif > cover.epsn; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if gif2ps cover.gif > cover.ps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if gif2rgb -o cover cover.gif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if gifasm bg1.gif porsche.gif > test_gifasm.gif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if gifclip -i 222 0 390 134 solid2.gif > test_gifclip.gif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if gifclrmp -i 2 cover.gif > test_gifclrmp.gif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if gifcomb porsche.gif bg1.gif > test_gifcomb.gif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if text2gif -t 'abcde' > abcde.gif; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if giffiltr <abcde.gif > test_giffiltr.gif; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if gifspnge <porsche.gif > test_gifspnge.gif; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
- if giffix cover.gif > test_giffix.gif; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if gifflip -r solid2.gif > test_gifflip.gif; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if gifhisto -b -s 200 512 porsche.gif > test_gifhisto.gif; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if gifinfo cover.gif; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if gifinter cover.gif > test_gifinter.gif; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if gifbg | gifinto test_gifinto.gif; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if gifbg | gifovly > test_gifovly.gif; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
- if gifpos -s 720 348 -i 400 148 porsche.gif > test_gifpos.gif; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
- if gifrotat -a 45 cover.gif > test_gifrotat.gif; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
- if gifrsize -s 0.45 solid2.gif > test_gifrsize.gif; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
- if giftext cover.gif > giftext.txt; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
- if icon2gif sample.ico > test_icon2gif.gif; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
- if raw2gif -s 1 1 test_raw.raw > test_raw2gif.gif; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
- if gif2rgb x-trans.gif | rgb2gif -s 100 100 > test_rgb2gif.gif; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "26" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
-
diff --git a/engine/tests/Functional.glib/fuego_test.sh b/engine/tests/Functional.glib/fuego_test.sh
new file mode 100755
index 0000000..c346f05
--- /dev/null
+++ b/engine/tests/Functional.glib/fuego_test.sh
@@ -0,0 +1,51 @@
+tarball=glib-2.22.1.tar.bz2
+
+function test_build {
+ patch -p0 -N -s < $TEST_HOME/glib-strfuncs.patch
+ # Don't run tests on the build host
+ find . -name 'Makefile*' | xargs sed -i '/@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}/d'
+ echo -e "glib_cv_stack_grows=no \nglib_cv_uscore=no \nac_cv_func_posix_getpwuid_r=no \nac_cv_func_nonposix_getpwuid_r=no \nac_cv_func_posix_getgrgid_r=no" > config.cross
+ ./configure --prefix=`pwd`/build --cache-file=config.cross --host=$HOST --target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CXXFLAGS="$CXXFLAGS"
+ make 2>&1
+ cd tests && make test; cd -
+ cd glib/tests && make test; cd - && touch test_suite_ready || build_error "error while building test"
+}
+
+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` $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+# Excluded tests
+# --------------
+# gtester - test runner
+# echo-server - requires wrapper script
+# errorcheck-mutex-test - requires wrapper script
+# timeloop - hangs
+# unicode-normalize - requires external data
+# glib-genmarshal - requires external ???
+# socket-server, socket-client - require wrapper script
+# send-data - requires wrapper script
+# testglib - ???
+# testing - crashes
+# gobject-query - requires external data
+# desktop-app-info - requires supported desktop ???
+# resolver - requires wrapper script
+# unicode-collate - requires some locale data
+# markup-subparser
+# live-g-file
+# filter-streams
+
+function test_run {
+ report "cd $BOARD_TESTDIR/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 $BOARD_TESTDIR/fuego.$TESTDIR"
+
+ #log_compare "$TESTDIR" "196" "OK" "p"
+ #log_compare "$TESTDIR" "0" "ERROR" "n"
+ true
+}
+
+
diff --git a/engine/tests/Functional.glib/glib.sh b/engine/tests/Functional.glib/glib.sh
deleted file mode 100755
index c346f05..0000000
--- a/engine/tests/Functional.glib/glib.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-tarball=glib-2.22.1.tar.bz2
-
-function test_build {
- patch -p0 -N -s < $TEST_HOME/glib-strfuncs.patch
- # Don't run tests on the build host
- find . -name 'Makefile*' | xargs sed -i '/@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}/d'
- echo -e "glib_cv_stack_grows=no \nglib_cv_uscore=no \nac_cv_func_posix_getpwuid_r=no \nac_cv_func_nonposix_getpwuid_r=no \nac_cv_func_posix_getgrgid_r=no" > config.cross
- ./configure --prefix=`pwd`/build --cache-file=config.cross --host=$HOST --target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CXXFLAGS="$CXXFLAGS"
- make 2>&1
- cd tests && make test; cd -
- cd glib/tests && make test; cd - && touch test_suite_ready || build_error "error while building test"
-}
-
-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` $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-# Excluded tests
-# --------------
-# gtester - test runner
-# echo-server - requires wrapper script
-# errorcheck-mutex-test - requires wrapper script
-# timeloop - hangs
-# unicode-normalize - requires external data
-# glib-genmarshal - requires external ???
-# socket-server, socket-client - require wrapper script
-# send-data - requires wrapper script
-# testglib - ???
-# testing - crashes
-# gobject-query - requires external data
-# desktop-app-info - requires supported desktop ???
-# resolver - requires wrapper script
-# unicode-collate - requires some locale data
-# markup-subparser
-# live-g-file
-# filter-streams
-
-function test_run {
- report "cd $BOARD_TESTDIR/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 $BOARD_TESTDIR/fuego.$TESTDIR"
-
- #log_compare "$TESTDIR" "196" "OK" "p"
- #log_compare "$TESTDIR" "0" "ERROR" "n"
- true
-}
-
-
diff --git a/engine/tests/Functional.glib2/fuego_test.sh b/engine/tests/Functional.glib2/fuego_test.sh
new file mode 100755
index 0000000..3be0ab0
--- /dev/null
+++ b/engine/tests/Functional.glib2/fuego_test.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+tarball=glib2-test.tar.bz2
+
+function test_build {
+
+ cd ./glib-2.46.2
+
+ if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
+ echo "This is porter!"
+ else
+ ./configure --host=$PREFIX --disable-silent-rules --disable-dependency-tracking --enable-included-printf=no --disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man --disable-static --enable-nls --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --with-pcre=system --enable-always-build-tests
+ make
+ fi
+}
+
+function test_deploy {
+ if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
+ put -r ./glib-2.46.2/bin_porter/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+ else
+ put -r ./glib-2.46.2/tests $BOARD_TESTDIR/fuego.$TESTDIR/
+ fi
+
+
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ cd tests/.libs; \
+ cp * ..; \
+ cd ..; \
+
+ if ./asyncqueue-test; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./atomic-test; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ./bit-test; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ./child-test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./completion-test; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./datetime; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if ./dirname-test; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if ./env-test; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if ./file-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if ./gio-test; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if ./mainloop-test; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if ./mapping-test; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+ export LD_LIBRARY_PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH/tests:$LD_LIBRARY_PATH; \
+ if ./module-test; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if ./onceinit; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if ./qsort-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if ./relation-test; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if ./slice-color; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if ./slice-concurrent; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if ./slice-test; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
+ if ./slice-threadinit; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
+ if ./sources; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
+ if ./spawn-test; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
+ if ./testgdate; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
+ if ./testglib; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
+ if ./threadpool-test; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
+ if ./thread-test; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi; \
+ if ./timeloop; then echo 'TEST-27 OK'; else echo 'TEST-27 FAIL'; fi; \
+ if ./type-test; then echo 'TEST-28 OK'; else echo 'TEST-28 FAIL'; fi; \
+ if ./unicode-caseconv; then echo 'TEST-29 OK'; else echo 'TEST-29 FAIL'; fi"
+# if ./iochannel-test; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-caseconv; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-collate; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
+# if ./unicode-encoding; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi
+}
+
+function test_processing {
+ P_CRIT="TEST.*"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "29" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.glib2/glib2.sh b/engine/tests/Functional.glib2/glib2.sh
deleted file mode 100755
index 3be0ab0..0000000
--- a/engine/tests/Functional.glib2/glib2.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-tarball=glib2-test.tar.bz2
-
-function test_build {
-
- cd ./glib-2.46.2
-
- if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
- echo "This is porter!"
- else
- ./configure --host=$PREFIX --disable-silent-rules --disable-dependency-tracking --enable-included-printf=no --disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man --disable-static --enable-nls --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --with-pcre=system --enable-always-build-tests
- make
- fi
-}
-
-function test_deploy {
- if [ $PREFIX = "arm-agl-linux-gnueabi" ] ; then
- put -r ./glib-2.46.2/bin_porter/tests $BOARD_TESTDIR/fuego.$TESTDIR/
- else
- put -r ./glib-2.46.2/tests $BOARD_TESTDIR/fuego.$TESTDIR/
- fi
-
-
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- cd tests/.libs; \
- cp * ..; \
- cd ..; \
-
- if ./asyncqueue-test; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./atomic-test; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ./bit-test; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ./child-test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./completion-test; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./datetime; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if ./dirname-test; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if ./env-test; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if ./file-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if ./gio-test; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if ./mainloop-test; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if ./mapping-test; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
- export LD_LIBRARY_PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH/tests:$LD_LIBRARY_PATH; \
- if ./module-test; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if ./onceinit; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if ./qsort-test; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if ./relation-test; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if ./slice-color; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if ./slice-concurrent; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if ./slice-test; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi; \
- if ./slice-threadinit; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi; \
- if ./sources; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi; \
- if ./spawn-test; then echo 'TEST-22 OK'; else echo 'TEST-22 FAIL'; fi; \
- if ./testgdate; then echo 'TEST-23 OK'; else echo 'TEST-23 FAIL'; fi; \
- if ./testglib; then echo 'TEST-24 OK'; else echo 'TEST-24 FAIL'; fi; \
- if ./threadpool-test; then echo 'TEST-25 OK'; else echo 'TEST-25 FAIL'; fi; \
- if ./thread-test; then echo 'TEST-26 OK'; else echo 'TEST-26 FAIL'; fi; \
- if ./timeloop; then echo 'TEST-27 OK'; else echo 'TEST-27 FAIL'; fi; \
- if ./type-test; then echo 'TEST-28 OK'; else echo 'TEST-28 FAIL'; fi; \
- if ./unicode-caseconv; then echo 'TEST-29 OK'; else echo 'TEST-29 FAIL'; fi"
-# if ./iochannel-test; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-caseconv; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-collate; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi; \
-# if ./unicode-encoding; then echo 'TEST- OK'; else echo 'TEST- FAIL'; fi
-}
-
-function test_processing {
- P_CRIT="TEST.*"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "29" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.glibc/fuego_test.sh b/engine/tests/Functional.glibc/fuego_test.sh
new file mode 100755
index 0000000..e387900
--- /dev/null
+++ b/engine/tests/Functional.glibc/fuego_test.sh
@@ -0,0 +1,58 @@
+tarball=glibc_tests.tar.gz
+
+function test_build {
+ CC="$CC" AR="$AR" RANLIB="$RANLIB"
+ make all
+
+ echo "#!/bin/bash
+ # ./c is test case for libc and ld
+ if ./c; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ if ./pthread 10; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
+ if ./rt; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
+ if ./util; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
+ if ./resolv mit.edu; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
+ if ./m; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
+ if ./crypt; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
+ if ./dl; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
+ if ./anl localhost; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
+ if ./nsl; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
+
+ useradd test;
+ passwd test << EOF
+hello
+hello
+EOF
+ if ./nss_compat test hello; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
+ userdel test; rm /home/test/ -rf;
+
+ cp /etc/nsswitch.conf nsswitch.conf.bk;
+ sed 's/^hosts.*$/hosts: files/g' nsswitch.conf.bk > /etc/nsswitch.conf;
+ if ./nss localhost; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;
+ cp nsswitch.conf.bk /etc/nsswitch.conf;
+
+ cp /etc/nsswitch.conf nsswitch.conf.bk;
+ sed 's/^hosts.*$/hosts: dns/g' nsswitch.conf.bk > /etc/nsswitch.conf;
+ if ./nss localhost; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi;
+ cp nsswitch.conf.bk /etc/nsswitch.conf;
+
+ if [ -f /lib/libBrokenLocale-2.23.so ];
+ then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi;
+ " > run-tests.sh
+
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh test_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "14" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.glibc/glibc.sh b/engine/tests/Functional.glibc/glibc.sh
deleted file mode 100755
index e387900..0000000
--- a/engine/tests/Functional.glibc/glibc.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-tarball=glibc_tests.tar.gz
-
-function test_build {
- CC="$CC" AR="$AR" RANLIB="$RANLIB"
- make all
-
- echo "#!/bin/bash
- # ./c is test case for libc and ld
- if ./c; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- if ./pthread 10; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
- if ./rt; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
- if ./util; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
- if ./resolv mit.edu; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
- if ./m; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
- if ./crypt; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
- if ./dl; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
- if ./anl localhost; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
- if ./nsl; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
-
- useradd test;
- passwd test << EOF
-hello
-hello
-EOF
- if ./nss_compat test hello; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
- userdel test; rm /home/test/ -rf;
-
- cp /etc/nsswitch.conf nsswitch.conf.bk;
- sed 's/^hosts.*$/hosts: files/g' nsswitch.conf.bk > /etc/nsswitch.conf;
- if ./nss localhost; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;
- cp nsswitch.conf.bk /etc/nsswitch.conf;
-
- cp /etc/nsswitch.conf nsswitch.conf.bk;
- sed 's/^hosts.*$/hosts: dns/g' nsswitch.conf.bk > /etc/nsswitch.conf;
- if ./nss localhost; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi;
- cp nsswitch.conf.bk /etc/nsswitch.conf;
-
- if [ -f /lib/libBrokenLocale-2.23.so ];
- then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi;
- " > run-tests.sh
-
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh test_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "14" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.hciattach/fuego_test.sh b/engine/tests/Functional.hciattach/fuego_test.sh
new file mode 100755
index 0000000..afe66aa
--- /dev/null
+++ b/engine/tests/Functional.hciattach/fuego_test.sh
@@ -0,0 +1,18 @@
+function test_build {
+ echo True
+}
+
+function test_deploy {
+ echo True
+}
+
+function test_run {
+report "if hciattach -l;then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.hciattach/hciattach.sh b/engine/tests/Functional.hciattach/hciattach.sh
deleted file mode 100755
index afe66aa..0000000
--- a/engine/tests/Functional.hciattach/hciattach.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-function test_build {
- echo True
-}
-
-function test_deploy {
- echo True
-}
-
-function test_run {
-report "if hciattach -l;then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.hello_world/fuego_test.sh b/engine/tests/Functional.hello_world/fuego_test.sh
new file mode 100755
index 0000000..27a8344
--- /dev/null
+++ b/engine/tests/Functional.hello_world/fuego_test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+tarball=hello-test-1.1.tgz
+
+function test_build {
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put hello $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+# assert_define FUNCTIONAL_HELLO_WORLD_ARG
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./hello $FUNCTIONAL_HELLO_WORLD_ARG"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "SUCCESS" "p"
+}
+
+
diff --git a/engine/tests/Functional.hello_world/hello_world.sh b/engine/tests/Functional.hello_world/hello_world.sh
deleted file mode 100755
index 27a8344..0000000
--- a/engine/tests/Functional.hello_world/hello_world.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-tarball=hello-test-1.1.tgz
-
-function test_build {
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put hello $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-# assert_define FUNCTIONAL_HELLO_WORLD_ARG
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./hello $FUNCTIONAL_HELLO_WORLD_ARG"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "SUCCESS" "p"
-}
-
-
diff --git a/engine/tests/Functional.imagemagick/fuego_test.sh b/engine/tests/Functional.imagemagick/fuego_test.sh
new file mode 100755
index 0000000..3f1c69f
--- /dev/null
+++ b/engine/tests/Functional.imagemagick/fuego_test.sh
@@ -0,0 +1,63 @@
+#tarball=jpeg-6b.tar.gz
+tarball=images.tar.gz
+
+function test_build {
+# ./configure --host=$PREFIX --build=`./config.guess` CC="$CC" AR="$AR" RANLIB="$RANLIB"
+# make
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+ <image>
+ <read filename=\"button.gif\" />
+ <get width=\"base-width\" height=\"base-height\" />
+ <resize geometry=\"%[dimensions]\" />
+ <get width=\"resize-width\" height=\"resize-height\" />
+ <print output=\"Image sized from %[base-width]x%[base-height] to %[resize-width]x%[resize-height].\n\" />
+ <write filename=\"button.png\" />
+ </image>" > incantation.msl
+
+ echo "#!/bin/bash
+ if convert rose.jpg -sharpen 0x1 reconstruct.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ compare rose.jpg reconstruct.jpg difference1.png; if [ -f difference1.png ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
+ compare -compose src rose.jpg reconstruct.jpg difference2.png; if [ -f difference2.png ]; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
+ if mogrify -resize 50% rose.jpg; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
+ if mogrify -resize 256x256 *.jpg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
+ if mogrify -format jpg *.png; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
+ if composite -gravity center smile.gif rose: rose-over.png; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
+ if convert -size 70x70 canvas:none -fill red -draw 'circle 35,35 10,30' red-circle.png; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
+ if convert -size 70x70 canvas:none -draw 'circle 35,35 35,20' -negate -channel a -gaussian-blur 0x8 white-highlight.png; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
+ if identify -verbose rose.jpg; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
+ if composite -compose atop -geometry -13-17 white-highlight.png red-circle.png red-ball.png; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
+ conjure -dimensions 400x400 incantation.msl; if [ -f button.png ]; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;
+ if montage -background '#336699' -geometry +4+4 rose.jpg red-ball.png montage.jpg; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi;
+ if montage -label %f -frame 5 -background '#336699' -geometry +4+4 rose.jpg red-ball.png frame.jpg; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi;
+ if convert rose.jpg rose.png; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi;
+ if convert rose.jpg -resize 50% rose.png; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi;
+ if convert -size 640x480 canvas:none -fill red -draw \"circle 320,240 320,100\" fuzzy-magick.png; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi;
+ if convert red-ball.png -colorspace rgb +sigmoidal-contrast 11.6933 \
+ -define filter:filter=sinc -define filter:window=jinc -define filter:lobes=3 \
+ -resize 400% -sigmoidal-contrast 11.6933 -colorspace srgb output.png; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi;
+ if stream -map rgb -storage-type char rose.jpg pixels.dat; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi;
+ if convert rose.jpg image.tif; stream -map i -storage-type double -extract 100x100+30+40 image.tif gray.raw; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi;
+ if stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi;
+ " > run-tests.sh
+
+# echo "#!/bin/bash
+# if ./djpeg -dct int -ppm -outfile testout.ppm testorig.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+# " > run-tests.sh
+
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh *.jpg *.png *.gif incantation.msl $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "21" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.imagemagick/imagemagick.sh b/engine/tests/Functional.imagemagick/imagemagick.sh
deleted file mode 100755
index 3f1c69f..0000000
--- a/engine/tests/Functional.imagemagick/imagemagick.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#tarball=jpeg-6b.tar.gz
-tarball=images.tar.gz
-
-function test_build {
-# ./configure --host=$PREFIX --build=`./config.guess` CC="$CC" AR="$AR" RANLIB="$RANLIB"
-# make
- echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
- <image>
- <read filename=\"button.gif\" />
- <get width=\"base-width\" height=\"base-height\" />
- <resize geometry=\"%[dimensions]\" />
- <get width=\"resize-width\" height=\"resize-height\" />
- <print output=\"Image sized from %[base-width]x%[base-height] to %[resize-width]x%[resize-height].\n\" />
- <write filename=\"button.png\" />
- </image>" > incantation.msl
-
- echo "#!/bin/bash
- if convert rose.jpg -sharpen 0x1 reconstruct.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- compare rose.jpg reconstruct.jpg difference1.png; if [ -f difference1.png ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
- compare -compose src rose.jpg reconstruct.jpg difference2.png; if [ -f difference2.png ]; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
- if mogrify -resize 50% rose.jpg; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
- if mogrify -resize 256x256 *.jpg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
- if mogrify -format jpg *.png; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
- if composite -gravity center smile.gif rose: rose-over.png; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
- if convert -size 70x70 canvas:none -fill red -draw 'circle 35,35 10,30' red-circle.png; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
- if convert -size 70x70 canvas:none -draw 'circle 35,35 35,20' -negate -channel a -gaussian-blur 0x8 white-highlight.png; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
- if identify -verbose rose.jpg; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
- if composite -compose atop -geometry -13-17 white-highlight.png red-circle.png red-ball.png; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
- conjure -dimensions 400x400 incantation.msl; if [ -f button.png ]; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;
- if montage -background '#336699' -geometry +4+4 rose.jpg red-ball.png montage.jpg; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi;
- if montage -label %f -frame 5 -background '#336699' -geometry +4+4 rose.jpg red-ball.png frame.jpg; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi;
- if convert rose.jpg rose.png; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi;
- if convert rose.jpg -resize 50% rose.png; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi;
- if convert -size 640x480 canvas:none -fill red -draw \"circle 320,240 320,100\" fuzzy-magick.png; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi;
- if convert red-ball.png -colorspace rgb +sigmoidal-contrast 11.6933 \
- -define filter:filter=sinc -define filter:window=jinc -define filter:lobes=3 \
- -resize 400% -sigmoidal-contrast 11.6933 -colorspace srgb output.png; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi;
- if stream -map rgb -storage-type char rose.jpg pixels.dat; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi;
- if convert rose.jpg image.tif; stream -map i -storage-type double -extract 100x100+30+40 image.tif gray.raw; then echo 'TEST-20 OK'; else echo 'TEST-20 FAIL'; fi;
- if stream -map i -storage-type double 'image.tif[100x100+30+40]' gray.raw; then echo 'TEST-21 OK'; else echo 'TEST-21 FAIL'; fi;
- " > run-tests.sh
-
-# echo "#!/bin/bash
-# if ./djpeg -dct int -ppm -outfile testout.ppm testorig.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
-# " > run-tests.sh
-
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh *.jpg *.png *.gif incantation.msl $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "21" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.iptables/fuego_test.sh b/engine/tests/Functional.iptables/fuego_test.sh
new file mode 100755
index 0000000..023c2d9
--- /dev/null
+++ b/engine/tests/Functional.iptables/fuego_test.sh
@@ -0,0 +1,72 @@
+function test_build {
+ echo ' build OK '
+}
+
+function test_deploy {
+ echo ' deploy OK '
+}
+
+function test_run {
+ report " \
+ if iptables -A INPUT -t filter -p tcp --dport 80 -j DROP; then \
+ echo 'TEST-1 OK'; \
+ else \
+ echo 'TEST-1 FAIL'; \
+ fi; \
+ if iptables -t mangle -A PREROUTING -p tcp --dport 80 -j TOS --set-tos Maximize-Throughput; then \
+ echo 'TEST-2 OK'; \
+ else \
+ echo 'TEST-2 FAIL'; \
+ fi; \
+ if iptables -t raw -I PREROUTING -p udp --dport 53 -j NOTRACK &&
+ iptables -t raw -I OUTPUT -p udp --dport 53 -j NOTRACK; then \
+ echo 'TEST-3 OK'; \
+ else \
+ echo 'TEST-3 FAIL'; \
+ fi; \
+ if iptables -N dropchain && \
+ iptables -A dropchain -j DROP && \
+ iptables -A INPUT -p udp --dport 80 -j dropchain; then \
+ echo 'TEST-4 OK'; \
+ else \
+ echo 'TEST-4 FAIL'; \
+ fi; \
+ if iptables -A INPUT -d 192.168.3.100 -j DROP; then \
+ echo 'TEST-5 OK'; \
+ else \
+ echo 'TEST-5 FAIL'; \
+ fi; \
+ if iptables -A INPUT -p tcp --tcp-flags SYN,RST,ACK SYN --dport 80 -j ACCEPT; then \
+ echo 'TEST-6 OK'; \
+ else \
+ echo 'TEST-6 FAIL'; \
+ fi; \
+ if iptables-save >> iptables_before.log; then \
+ echo 'TEST-7 OK'; \
+ else \
+ echo 'TEST-7 FAIL'; \
+ fi; \
+ if iptables -t filter -D INPUT 2; then \
+ echo 'TEST-8 OK'; \
+ else \
+ echo 'TEST-8 FAIL'; \
+ fi; \
+ if iptables-save >> iptables_after.log; then \
+ echo 'TEST-9 OK'; \
+ else \
+ echo 'TEST-9 FAIL'; \
+ fi \
+ "
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "9" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.iptables/iptables.sh b/engine/tests/Functional.iptables/iptables.sh
deleted file mode 100755
index 023c2d9..0000000
--- a/engine/tests/Functional.iptables/iptables.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-function test_build {
- echo ' build OK '
-}
-
-function test_deploy {
- echo ' deploy OK '
-}
-
-function test_run {
- report " \
- if iptables -A INPUT -t filter -p tcp --dport 80 -j DROP; then \
- echo 'TEST-1 OK'; \
- else \
- echo 'TEST-1 FAIL'; \
- fi; \
- if iptables -t mangle -A PREROUTING -p tcp --dport 80 -j TOS --set-tos Maximize-Throughput; then \
- echo 'TEST-2 OK'; \
- else \
- echo 'TEST-2 FAIL'; \
- fi; \
- if iptables -t raw -I PREROUTING -p udp --dport 53 -j NOTRACK &&
- iptables -t raw -I OUTPUT -p udp --dport 53 -j NOTRACK; then \
- echo 'TEST-3 OK'; \
- else \
- echo 'TEST-3 FAIL'; \
- fi; \
- if iptables -N dropchain && \
- iptables -A dropchain -j DROP && \
- iptables -A INPUT -p udp --dport 80 -j dropchain; then \
- echo 'TEST-4 OK'; \
- else \
- echo 'TEST-4 FAIL'; \
- fi; \
- if iptables -A INPUT -d 192.168.3.100 -j DROP; then \
- echo 'TEST-5 OK'; \
- else \
- echo 'TEST-5 FAIL'; \
- fi; \
- if iptables -A INPUT -p tcp --tcp-flags SYN,RST,ACK SYN --dport 80 -j ACCEPT; then \
- echo 'TEST-6 OK'; \
- else \
- echo 'TEST-6 FAIL'; \
- fi; \
- if iptables-save >> iptables_before.log; then \
- echo 'TEST-7 OK'; \
- else \
- echo 'TEST-7 FAIL'; \
- fi; \
- if iptables -t filter -D INPUT 2; then \
- echo 'TEST-8 OK'; \
- else \
- echo 'TEST-8 FAIL'; \
- fi; \
- if iptables-save >> iptables_after.log; then \
- echo 'TEST-9 OK'; \
- else \
- echo 'TEST-9 FAIL'; \
- fi \
- "
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "9" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.iputils/fuego_test.sh b/engine/tests/Functional.iputils/fuego_test.sh
new file mode 100755
index 0000000..1a043b4
--- /dev/null
+++ b/engine/tests/Functional.iputils/fuego_test.sh
@@ -0,0 +1,31 @@
+#tarball=testtmp.tar.gz
+
+function test_build {
+ echo "testtmp.sh build"
+}
+
+function test_deploy {
+ echo "testtmp.sh deploy"
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+ (ifconfig eth0 inet6 add 2001:da8:2004:1000:202:116:160:41/61);
+ (route -A inet6 add default gw 2001:da8:2004:1000:1);
+ if traceroute6 ipv6.scau.edu.cn; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if clockdiff -o localhost ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+ if ping -c 4 www.baidu.com; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+ if tracepath www.baidu.com; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
+ if ping6 -c 5 ::1; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
+ if tracepath6 ipv6.scau.edu.cn; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "6" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
+
diff --git a/engine/tests/Functional.iputils/iputils.sh b/engine/tests/Functional.iputils/iputils.sh
deleted file mode 100755
index 1a043b4..0000000
--- a/engine/tests/Functional.iputils/iputils.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#tarball=testtmp.tar.gz
-
-function test_build {
- echo "testtmp.sh build"
-}
-
-function test_deploy {
- echo "testtmp.sh deploy"
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
- (ifconfig eth0 inet6 add 2001:da8:2004:1000:202:116:160:41/61);
- (route -A inet6 add default gw 2001:da8:2004:1000:1);
- if traceroute6 ipv6.scau.edu.cn; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if clockdiff -o localhost ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
- if ping -c 4 www.baidu.com; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
- if tracepath www.baidu.com; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
- if ping6 -c 5 ::1; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
- if tracepath6 ipv6.scau.edu.cn; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "6" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
-
diff --git a/engine/tests/Functional.ipv6connect/fuego_test.sh b/engine/tests/Functional.ipv6connect/fuego_test.sh
new file mode 100755
index 0000000..bcda1f3
--- /dev/null
+++ b/engine/tests/Functional.ipv6connect/fuego_test.sh
@@ -0,0 +1,19 @@
+tarball=ipv6connect.tar.gz
+
+function test_build {
+ make CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put ipv6connect $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ipv6connect"
+}
+
+function test_processing {
+ true
+}
+
+
diff --git a/engine/tests/Functional.ipv6connect/ipv6connect.sh b/engine/tests/Functional.ipv6connect/ipv6connect.sh
deleted file mode 100755
index bcda1f3..0000000
--- a/engine/tests/Functional.ipv6connect/ipv6connect.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-tarball=ipv6connect.tar.gz
-
-function test_build {
- make CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put ipv6connect $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./ipv6connect"
-}
-
-function test_processing {
- true
-}
-
-
diff --git a/engine/tests/Functional.jpeg/fuego_test.sh b/engine/tests/Functional.jpeg/fuego_test.sh
new file mode 100755
index 0000000..55f34d6
--- /dev/null
+++ b/engine/tests/Functional.jpeg/fuego_test.sh
@@ -0,0 +1,35 @@
+tarball=jpeg-6b.tar.gz
+
+function test_build {
+ ./configure --host=$PREFIX --build=`./config.guess` CC="$CC" AR="$AR" RANLIB="$RANLIB"
+ make
+ echo "#!/bin/bash
+ if ./djpeg -dct int -ppm -outfile testout.ppm testorig.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ if ./djpeg -dct int -bmp -colors 256 -outfile testout.bmp testorig.jpg; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi ;
+ if ./cjpeg -dct int -outfile testout.jpg testimg.ppm; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
+ if ./djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
+ if ./cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
+ if ./jpegtran -outfile testoutt.jpg testprog.jpg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
+ if cmp testimg.ppm testout.ppm; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
+ if cmp testimg.bmp testout.bmp; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
+ if cmp testimg.jpg testout.jpg; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
+ if cmp testimg.ppm testoutp.ppm; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
+ if cmp testimgp.jpg testoutp.jpg; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
+ if cmp testorig.jpg testoutt.jpg; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;" > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh test* djpeg cjpeg jpegtran $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "12" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.jpeg/jpeg.sh b/engine/tests/Functional.jpeg/jpeg.sh
deleted file mode 100755
index 55f34d6..0000000
--- a/engine/tests/Functional.jpeg/jpeg.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-tarball=jpeg-6b.tar.gz
-
-function test_build {
- ./configure --host=$PREFIX --build=`./config.guess` CC="$CC" AR="$AR" RANLIB="$RANLIB"
- make
- echo "#!/bin/bash
- if ./djpeg -dct int -ppm -outfile testout.ppm testorig.jpg; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- if ./djpeg -dct int -bmp -colors 256 -outfile testout.bmp testorig.jpg; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi ;
- if ./cjpeg -dct int -outfile testout.jpg testimg.ppm; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
- if ./djpeg -dct int -ppm -outfile testoutp.ppm testprog.jpg; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
- if ./cjpeg -dct int -progressive -opt -outfile testoutp.jpg testimg.ppm; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
- if ./jpegtran -outfile testoutt.jpg testprog.jpg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
- if cmp testimg.ppm testout.ppm; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
- if cmp testimg.bmp testout.bmp; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi;
- if cmp testimg.jpg testout.jpg; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi;
- if cmp testimg.ppm testoutp.ppm; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi;
- if cmp testimgp.jpg testoutp.jpg; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi;
- if cmp testorig.jpg testoutt.jpg; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi;" > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh test* djpeg cjpeg jpegtran $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "12" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.kernel_build/fuego_test.sh b/engine/tests/Functional.kernel_build/fuego_test.sh
new file mode 100755
index 0000000..c3c1744
--- /dev/null
+++ b/engine/tests/Functional.kernel_build/fuego_test.sh
@@ -0,0 +1,80 @@
+function test_pre_check {
+ echo "Doing a pre_check"
+ # FIXTHIS: if making uImage, check for mkimage
+}
+
+function test_build {
+ FOLDER="$(basename "$FUNCTIONAL_KERNEL_BUILD_REPO" .git)"
+
+ # Clone if no tarball was defined
+ if [ -z ${tarball+x} ]; then
+ assert_define FUNCTIONAL_KERNEL_BUILD_REPO
+
+ # Set branch or tag (default: "master" branch)
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_TAG+x} ]; then
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_BRANCH+x} ]; then
+ FUNCTIONAL_KERNEL_BUILD_BRANCH="master"
+ fi
+ else
+ FUNCTIONAL_KERNEL_BUILD_BRANCH=$FUNCTIONAL_KERNEL_BUILD_TAG
+ fi
+
+ # FIXTHIS: the folder gets removed with the rebuild flag set to true
+ if [ ! -d "$FOLDER" ]; then
+ echo "Cloning $FUNCTIONAL_KERNEL_BUILD_REPO:$FUNCTIONAL_KERNEL_BUILD_BRANCH"
+ git clone --depth 1 "$FUNCTIONAL_KERNEL_BUILD_REPO" \
+ --branch $FUNCTIONAL_KERNEL_BUILD_BRANCH
+ cd "$FOLDER"
+ else
+ cd "$FOLDER"
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_TAG+x} ]; then
+ make mrproper
+ git pull
+ fi
+ fi
+ fi
+
+ # Configuration
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_ARCH+x} ]; then
+ FUNCTIONAL_KERNEL_BUILD_ARCH="x86_64"
+ fi
+
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_CONFIG+x} ]; then
+ FUNCTIONAL_KERNEL_BUILD_CONFIG="defconfig"
+ fi
+ echo "Configuring kernel with $FUNCTIONAL_KERNEL_BUILD_CONFIG"
+ make ARCH=$FUNCTIONAL_KERNEL_BUILD_ARCH $FUNCTIONAL_KERNEL_BUILD_CONFIG
+
+ # Building
+ echo "Building Kernel"
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_PARAMS+x} ]; then
+ $FUNCTIONAL_KERNEL_BUILD_PARAMS="-j4 bzImage modules"
+ fi
+
+ if [ ! -z ${FUNCTIONAL_KERNEL_BUILD_PLATFORM+x} ]; then
+ OLD_PLATFORM=$PLATFORM
+ PLATFORM=$FUNCTIONAL_KERNEL_BUILD_PLATFORM
+ source $FUEGO_RO/toolchains/tools.sh
+ PLATFORM=$OLD_PLATFORM
+ fi
+
+ make ARCH=$FUNCTIONAL_KERNEL_BUILD_ARCH $FUNCTIONAL_KERNEL_BUILD_PARAMS > build.log 2>&1 || true
+
+ report "cat build.log"
+}
+
+function test_deploy {
+ echo "Deploying kernel"
+ # FIXTHIS: copy to tftp folder for lava etc..
+}
+
+function test_processing {
+ echo "Processing kernel build log"
+ if [ -z ${FUNCTIONAL_KERNEL_BUILD_REGEX_P+x} ]; then
+ log_compare "$TESTDIR" "1" "^Kernel: arch/.* is ready" "p"
+ else
+ log_compare "$TESTDIR" "1" "$FUNCTIONAL_KERNEL_BUILD_REGEX_P" "p"
+ fi
+}
+
+
diff --git a/engine/tests/Functional.kernel_build/kernel_build.sh b/engine/tests/Functional.kernel_build/kernel_build.sh
deleted file mode 100755
index c3c1744..0000000
--- a/engine/tests/Functional.kernel_build/kernel_build.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-function test_pre_check {
- echo "Doing a pre_check"
- # FIXTHIS: if making uImage, check for mkimage
-}
-
-function test_build {
- FOLDER="$(basename "$FUNCTIONAL_KERNEL_BUILD_REPO" .git)"
-
- # Clone if no tarball was defined
- if [ -z ${tarball+x} ]; then
- assert_define FUNCTIONAL_KERNEL_BUILD_REPO
-
- # Set branch or tag (default: "master" branch)
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_TAG+x} ]; then
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_BRANCH+x} ]; then
- FUNCTIONAL_KERNEL_BUILD_BRANCH="master"
- fi
- else
- FUNCTIONAL_KERNEL_BUILD_BRANCH=$FUNCTIONAL_KERNEL_BUILD_TAG
- fi
-
- # FIXTHIS: the folder gets removed with the rebuild flag set to true
- if [ ! -d "$FOLDER" ]; then
- echo "Cloning $FUNCTIONAL_KERNEL_BUILD_REPO:$FUNCTIONAL_KERNEL_BUILD_BRANCH"
- git clone --depth 1 "$FUNCTIONAL_KERNEL_BUILD_REPO" \
- --branch $FUNCTIONAL_KERNEL_BUILD_BRANCH
- cd "$FOLDER"
- else
- cd "$FOLDER"
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_TAG+x} ]; then
- make mrproper
- git pull
- fi
- fi
- fi
-
- # Configuration
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_ARCH+x} ]; then
- FUNCTIONAL_KERNEL_BUILD_ARCH="x86_64"
- fi
-
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_CONFIG+x} ]; then
- FUNCTIONAL_KERNEL_BUILD_CONFIG="defconfig"
- fi
- echo "Configuring kernel with $FUNCTIONAL_KERNEL_BUILD_CONFIG"
- make ARCH=$FUNCTIONAL_KERNEL_BUILD_ARCH $FUNCTIONAL_KERNEL_BUILD_CONFIG
-
- # Building
- echo "Building Kernel"
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_PARAMS+x} ]; then
- $FUNCTIONAL_KERNEL_BUILD_PARAMS="-j4 bzImage modules"
- fi
-
- if [ ! -z ${FUNCTIONAL_KERNEL_BUILD_PLATFORM+x} ]; then
- OLD_PLATFORM=$PLATFORM
- PLATFORM=$FUNCTIONAL_KERNEL_BUILD_PLATFORM
- source $FUEGO_RO/toolchains/tools.sh
- PLATFORM=$OLD_PLATFORM
- fi
-
- make ARCH=$FUNCTIONAL_KERNEL_BUILD_ARCH $FUNCTIONAL_KERNEL_BUILD_PARAMS > build.log 2>&1 || true
-
- report "cat build.log"
-}
-
-function test_deploy {
- echo "Deploying kernel"
- # FIXTHIS: copy to tftp folder for lava etc..
-}
-
-function test_processing {
- echo "Processing kernel build log"
- if [ -z ${FUNCTIONAL_KERNEL_BUILD_REGEX_P+x} ]; then
- log_compare "$TESTDIR" "1" "^Kernel: arch/.* is ready" "p"
- else
- log_compare "$TESTDIR" "1" "$FUNCTIONAL_KERNEL_BUILD_REGEX_P" "p"
- fi
-}
-
-
diff --git a/engine/tests/Functional.kmod/fuego_test.sh b/engine/tests/Functional.kmod/fuego_test.sh
new file mode 100755
index 0000000..d9236ad
--- /dev/null
+++ b/engine/tests/Functional.kmod/fuego_test.sh
@@ -0,0 +1,32 @@
+#tarball=kmod.tar.gz
+
+function test_build {
+ echo " test_build_kmod.sh "
+}
+
+function test_deploy {
+ echo " test_deploy_kmod.sh "
+}
+
+function test_run {
+ report " \
+ if lsmod | grep 'rfcomm' && rmmod rfcomm.ko; then echo 'Prepare for Test-1'; fi;\
+ if modinfo -n rfcomm|xargs insmod; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if lsmod | grep 'rfcomm' && echo 'rfcomm is loaded' ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+ if modinfo rfcomm; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+ if rmmod rfcomm.ko; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
+ if lsmod | grep 'rfcomm' || echo 'rfcomm.ko is removed'; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
+ if depmod -w ; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
+ if modprobe rfcomm; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
+ if lsmod | grep 'rfcomm' && echo 'rfcomm is loaded' ; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
+ if kmod list | grep 'rfcomm' && echo 'rfcomm is loaded check by kmodlist' ; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "9" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.kmod/kmod.sh b/engine/tests/Functional.kmod/kmod.sh
deleted file mode 100755
index d9236ad..0000000
--- a/engine/tests/Functional.kmod/kmod.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#tarball=kmod.tar.gz
-
-function test_build {
- echo " test_build_kmod.sh "
-}
-
-function test_deploy {
- echo " test_deploy_kmod.sh "
-}
-
-function test_run {
- report " \
- if lsmod | grep 'rfcomm' && rmmod rfcomm.ko; then echo 'Prepare for Test-1'; fi;\
- if modinfo -n rfcomm|xargs insmod; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if lsmod | grep 'rfcomm' && echo 'rfcomm is loaded' ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
- if modinfo rfcomm; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
- if rmmod rfcomm.ko; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
- if lsmod | grep 'rfcomm' || echo 'rfcomm.ko is removed'; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
- if depmod -w ; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
- if modprobe rfcomm; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
- if lsmod | grep 'rfcomm' && echo 'rfcomm is loaded' ; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
- if kmod list | grep 'rfcomm' && echo 'rfcomm is loaded check by kmodlist' ; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "9" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.libogg/fuego_test.sh b/engine/tests/Functional.libogg/fuego_test.sh
new file mode 100755
index 0000000..1a71032
--- /dev/null
+++ b/engine/tests/Functional.libogg/fuego_test.sh
@@ -0,0 +1,25 @@
+tarball=ogg.tar.gz
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
+ put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.libogg/libogg.sh b/engine/tests/Functional.libogg/libogg.sh
deleted file mode 100755
index 1a71032..0000000
--- a/engine/tests/Functional.libogg/libogg.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=ogg.tar.gz
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
- put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
-if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.libpcap/fuego_test.sh b/engine/tests/Functional.libpcap/fuego_test.sh
new file mode 100755
index 0000000..b013249
--- /dev/null
+++ b/engine/tests/Functional.libpcap/fuego_test.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+tarball=libpcap-tests.tar.gz
+
+function test_build {
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o capturetest capturetest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o filtertest filtertest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o findalldevstest findalldevstest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o opentest opentest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o reactivatetest reactivatetest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o selpolltest selpolltest.c -lpcap
+ $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o valgrindtest valgrindtest.c -lpcap
+}
+
+function test_deploy {
+ put capturetest filtertest findalldevstest opentest reactivatetest selpolltest valgrindtest $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; \
+ if capturetest -c 10 ; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if filtertest 1 ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if findalldevstest ; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if opentest ; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if reactivatetest ; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if selpolltest -c 10 ; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if valgrindtest ; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
+
diff --git a/engine/tests/Functional.libpcap/libpcap.sh b/engine/tests/Functional.libpcap/libpcap.sh
deleted file mode 100755
index b013249..0000000
--- a/engine/tests/Functional.libpcap/libpcap.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-tarball=libpcap-tests.tar.gz
-
-function test_build {
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o capturetest capturetest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o filtertest filtertest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o findalldevstest findalldevstest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o opentest opentest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o reactivatetest reactivatetest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o selpolltest selpolltest.c -lpcap
- $CC -fpic -O2 -pipe -g -feliminate-unused-debug-types -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I. -o valgrindtest valgrindtest.c -lpcap
-}
-
-function test_deploy {
- put capturetest filtertest findalldevstest opentest reactivatetest selpolltest valgrindtest $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *; \
- if capturetest -c 10 ; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if filtertest 1 ; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if findalldevstest ; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if opentest ; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if reactivatetest ; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if selpolltest -c 10 ; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if valgrindtest ; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
-
diff --git a/engine/tests/Functional.librsvg/fuego_test.sh b/engine/tests/Functional.librsvg/fuego_test.sh
new file mode 100755
index 0000000..75513a0
--- /dev/null
+++ b/engine/tests/Functional.librsvg/fuego_test.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+tarball=librsvg-2.40.15.tar.bz2
+
+function test_build {
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}/usr/share/aclocal
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX --enable-always-build-tests --disable-pixbuf-loader
+ make rsvg-convert
+ cd tests
+ make
+ ./rsvg-test
+ ./styles
+ ./crash
+ cd ../tools
+ make
+}
+
+function test_deploy {
+ put ./.libs/rsvg-convert $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./tests/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./tests/fixtures $BOARD_TESTDIR/fuego.$TESTDIR/
+ put ./tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ if rsvg-convert -f png -d 100 -p 100 -x 2 -y 2 -z 1 -w 100 -h 100 -a -b white ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.png; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if rsvg-convert -f pdf ./fixtures/reftests/duplicate-id.svg > duplicate-id.pdf; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if rsvg-convert -f ps ./fixtures/reftests/duplicate-id.svg > duplicate-id.ps; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if rsvg-convert -f eps ./fixtures/reftests/duplicate-id.svg > duplicate-id.eps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if rsvg-convert -f svg ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.svg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if rsvg-convert -o test ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if rsvg-dimensions ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if test-performance ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if lt-rsvg-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if lt-styles; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if lt-crash; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "11" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.librsvg/librsvg.sh b/engine/tests/Functional.librsvg/librsvg.sh
deleted file mode 100755
index 75513a0..0000000
--- a/engine/tests/Functional.librsvg/librsvg.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-tarball=librsvg-2.40.15.tar.bz2
-
-function test_build {
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}/usr/share/aclocal
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX --enable-always-build-tests --disable-pixbuf-loader
- make rsvg-convert
- cd tests
- make
- ./rsvg-test
- ./styles
- ./crash
- cd ../tools
- make
-}
-
-function test_deploy {
- put ./.libs/rsvg-convert $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./tests/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./tests/fixtures $BOARD_TESTDIR/fuego.$TESTDIR/
- put ./tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- if rsvg-convert -f png -d 100 -p 100 -x 2 -y 2 -z 1 -w 100 -h 100 -a -b white ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.png; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if rsvg-convert -f pdf ./fixtures/reftests/duplicate-id.svg > duplicate-id.pdf; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if rsvg-convert -f ps ./fixtures/reftests/duplicate-id.svg > duplicate-id.ps; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if rsvg-convert -f eps ./fixtures/reftests/duplicate-id.svg > duplicate-id.eps; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if rsvg-convert -f svg ./fixtures/reftests/duplicate-id.svg > duplicate-id_test.svg; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if rsvg-convert -o test ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if rsvg-dimensions ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if test-performance ./fixtures/reftests/duplicate-id.svg; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if lt-rsvg-test; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if lt-styles; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if lt-crash; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "11" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.libspeex/fuego_test.sh b/engine/tests/Functional.libspeex/fuego_test.sh
new file mode 100755
index 0000000..5395a88
--- /dev/null
+++ b/engine/tests/Functional.libspeex/fuego_test.sh
@@ -0,0 +1,25 @@
+tarball=speex.tar.gz
+
+function test_build {
+ ./configure $CONFIGURE_FLAGS
+ make
+}
+
+function test_deploy {
+ put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
+ put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.libspeex/libspeex.sh b/engine/tests/Functional.libspeex/libspeex.sh
deleted file mode 100755
index 5395a88..0000000
--- a/engine/tests/Functional.libspeex/libspeex.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=speex.tar.gz
-
-function test_build {
- ./configure $CONFIGURE_FLAGS
- make
-}
-
-function test_deploy {
- put src/.libs/speexdec $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/.libs/speexenc $BOARD_TESTDIR/fuego.$TESTDIR/
- put 1.wav $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
-if ./speexenc 1.wav 1.speex; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if ./speexdec 1.speex 2.wav;then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.libtar/fuego_test.sh b/engine/tests/Functional.libtar/fuego_test.sh
new file mode 100755
index 0000000..06ef34b
--- /dev/null
+++ b/engine/tests/Functional.libtar/fuego_test.sh
@@ -0,0 +1,41 @@
+function test_build {
+ echo "#!/bin/bash
+ rm -f testfile testfile.tar
+ echo 'testfile' > testfile;
+ libtar -C $BOARD_TESTDIR/fuego.$TESTDIR -c testfile.tar testfile;
+ if [ -f testfile.tar ] ; then
+ echo 'TEST-1 OK'
+ else
+ echo 'TEST-1 FAILED'
+ fi
+ rm -f testfile
+ libtar -t testfile.tar | grep testfile
+ if echo $ == 0 ; then
+ echo 'TEST-2 OK'
+ else
+ echo 'TEST-2 FAILED'
+ fi
+ rm -f testfile
+ libtar -x testfile.tar
+ if [ -f testfile ] ; then
+ echo 'TEST-3 OK'
+ else
+ echo 'TEST-3 FAILED'
+ fi" > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.libtar/libtar.sh b/engine/tests/Functional.libtar/libtar.sh
deleted file mode 100755
index 06ef34b..0000000
--- a/engine/tests/Functional.libtar/libtar.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-function test_build {
- echo "#!/bin/bash
- rm -f testfile testfile.tar
- echo 'testfile' > testfile;
- libtar -C $BOARD_TESTDIR/fuego.$TESTDIR -c testfile.tar testfile;
- if [ -f testfile.tar ] ; then
- echo 'TEST-1 OK'
- else
- echo 'TEST-1 FAILED'
- fi
- rm -f testfile
- libtar -t testfile.tar | grep testfile
- if echo $ == 0 ; then
- echo 'TEST-2 OK'
- else
- echo 'TEST-2 FAILED'
- fi
- rm -f testfile
- libtar -x testfile.tar
- if [ -f testfile ] ; then
- echo 'TEST-3 OK'
- else
- echo 'TEST-3 FAILED'
- fi" > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "3" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.libwebsocket/fuego_test.sh b/engine/tests/Functional.libwebsocket/fuego_test.sh
new file mode 100755
index 0000000..2d950c5
--- /dev/null
+++ b/engine/tests/Functional.libwebsocket/fuego_test.sh
@@ -0,0 +1,39 @@
+tarball=libwebsocket.tar.gz
+
+function test_build {
+ mkdir build
+ cd build
+ cmake -DOPENSSL_ROOT_DIR=$SDKTARGETSYSROOT/usr/lib -DOPENSSL_INCLUDE_DIR=$SDKTARGETSYSROOT/usr/include \
+ -DOPENSSL_LIBRARIES=$SDKTARGETSYSROOT/usr/lib/ .. -DZLIB_LIBRARY=$SDKTARGETSYSROOT/usr/lib/libz.so -DZLIB_INCLUDE_DIR=$SDKTARGETSYSROOT/usr/include ..
+ make
+}
+
+function test_deploy {
+ put build/bin/libwebsockets-test-server $BOARD_TESTDIR/fuego.$TESTDIR/
+ put build/bin/libwebsockets-test-client $BOARD_TESTDIR/fuego.$TESTDIR/
+ put build/bin/libwebsockets-test-echo $BOARD_TESTDIR/fuego.$TESTDIR/
+ put build/bin/libwebsockets-test-ping $BOARD_TESTDIR/fuego.$TESTDIR/
+ put build/bin/libwebsockets-test-fraggle $BOARD_TESTDIR/fuego.$TESTDIR/
+
+ put libwebsockets-test-server.pem /usr/share
+ put libwebsockets-test-server.key.pem /usr/share
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+ (./libwebsockets-test-server --resource_path=/usr/share &);
+ if ./libwebsockets-test-client localhost ; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+ if ./libwebsockets-test-echo --client echo.websocket.org; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+ if ./libwebsockets-test-echo --client localhost --port 7681; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+ if ./libwebsockets-test-ping localhost; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi
+ killall libwebsockets-test-server"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.libwebsocket/libwebsocket.sh b/engine/tests/Functional.libwebsocket/libwebsocket.sh
deleted file mode 100755
index 2d950c5..0000000
--- a/engine/tests/Functional.libwebsocket/libwebsocket.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-tarball=libwebsocket.tar.gz
-
-function test_build {
- mkdir build
- cd build
- cmake -DOPENSSL_ROOT_DIR=$SDKTARGETSYSROOT/usr/lib -DOPENSSL_INCLUDE_DIR=$SDKTARGETSYSROOT/usr/include \
- -DOPENSSL_LIBRARIES=$SDKTARGETSYSROOT/usr/lib/ .. -DZLIB_LIBRARY=$SDKTARGETSYSROOT/usr/lib/libz.so -DZLIB_INCLUDE_DIR=$SDKTARGETSYSROOT/usr/include ..
- make
-}
-
-function test_deploy {
- put build/bin/libwebsockets-test-server $BOARD_TESTDIR/fuego.$TESTDIR/
- put build/bin/libwebsockets-test-client $BOARD_TESTDIR/fuego.$TESTDIR/
- put build/bin/libwebsockets-test-echo $BOARD_TESTDIR/fuego.$TESTDIR/
- put build/bin/libwebsockets-test-ping $BOARD_TESTDIR/fuego.$TESTDIR/
- put build/bin/libwebsockets-test-fraggle $BOARD_TESTDIR/fuego.$TESTDIR/
-
- put libwebsockets-test-server.pem /usr/share
- put libwebsockets-test-server.key.pem /usr/share
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
- (./libwebsockets-test-server --resource_path=/usr/share &);
- if ./libwebsockets-test-client localhost ; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
- if ./libwebsockets-test-echo --client echo.websocket.org; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
- if ./libwebsockets-test-echo --client localhost --port 7681; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
- if ./libwebsockets-test-ping localhost; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi
- killall libwebsockets-test-server"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.linus_stress/fuego_test.sh b/engine/tests/Functional.linus_stress/fuego_test.sh
new file mode 100755
index 0000000..b5b2afb
--- /dev/null
+++ b/engine/tests/Functional.linus_stress/fuego_test.sh
@@ -0,0 +1,29 @@
+tarball=linus_stress.tar.gz
+
+function test_build {
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put linus_stress $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_LINUS_STRESS_DIRTY_BG
+ assert_define FUNCTIONAL_LINUS_STRESS_DIRTY
+
+ report "cd $BOARD_TESTDIR/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 'WARNING: /proc/sys/vm/dirty_ratio is read-only'; \
+ echo $FUNCTIONAL_LINUS_STRESS_DIRTY_BG > /proc/sys/vm/dirty_background_ratio || echo 'WARNING: /proc/sys/vm/dirty_background_ratio is read-only'; \
+ ./linus_stress; \
+ cat ./dirty_ratio > /proc/sys/vm/dirty_ratio; \
+ cat ./dirty_bg > /proc/sys/vm/dirty_background_ratio || echo 'WARNING: /proc/sys/vm/dirty_background_ratio is read-only'"
+}
+
+function test_processing {
+ true
+}
+
+
diff --git a/engine/tests/Functional.linus_stress/linus_stress.sh b/engine/tests/Functional.linus_stress/linus_stress.sh
deleted file mode 100755
index b5b2afb..0000000
--- a/engine/tests/Functional.linus_stress/linus_stress.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-tarball=linus_stress.tar.gz
-
-function test_build {
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put linus_stress $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_LINUS_STRESS_DIRTY_BG
- assert_define FUNCTIONAL_LINUS_STRESS_DIRTY
-
- report "cd $BOARD_TESTDIR/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 'WARNING: /proc/sys/vm/dirty_ratio is read-only'; \
- echo $FUNCTIONAL_LINUS_STRESS_DIRTY_BG > /proc/sys/vm/dirty_background_ratio || echo 'WARNING: /proc/sys/vm/dirty_background_ratio is read-only'; \
- ./linus_stress; \
- cat ./dirty_ratio > /proc/sys/vm/dirty_ratio; \
- cat ./dirty_bg > /proc/sys/vm/dirty_background_ratio || echo 'WARNING: /proc/sys/vm/dirty_background_ratio is read-only'"
-}
-
-function test_processing {
- true
-}
-
-
diff --git a/engine/tests/Functional.lwip/fuego_test.sh b/engine/tests/Functional.lwip/fuego_test.sh
new file mode 100755
index 0000000..d5c8c80
--- /dev/null
+++ b/engine/tests/Functional.lwip/fuego_test.sh
@@ -0,0 +1,48 @@
+tarball=lwip.tar.gz
+
+function test_build {
+ cd contrib/apps/func_tests
+ make
+ cd -
+ echo "#!/bin/bash
+ export IP_TEST='192.168.1.3';
+ if ./httpd_test > /dev/null & then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ sleep 2;
+ if wget \${IP_TEST}; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
+ killall httpd_test
+
+ if ./tftpd_test > /dev/null & then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
+ sleep 2;
+ if tftp -g -r Makefile \${IP_TEST}; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
+ killall tftpd_test
+
+ if ./mdns_test > /dev/null & then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
+ sleep 1;
+ killall mdns_test
+
+ if ./snmp_test > /dev/null & then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
+ sleep 1;
+ killall snmp_test
+
+ if ./sntp_test > /dev/null & then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
+ sleep 1;
+ killall sntp_test
+
+" > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh contrib/apps/func_tests/*_test $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "7" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.lwip/lwip.sh b/engine/tests/Functional.lwip/lwip.sh
deleted file mode 100755
index d5c8c80..0000000
--- a/engine/tests/Functional.lwip/lwip.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-tarball=lwip.tar.gz
-
-function test_build {
- cd contrib/apps/func_tests
- make
- cd -
- echo "#!/bin/bash
- export IP_TEST='192.168.1.3';
- if ./httpd_test > /dev/null & then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- sleep 2;
- if wget \${IP_TEST}; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
- killall httpd_test
-
- if ./tftpd_test > /dev/null & then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi;
- sleep 2;
- if tftp -g -r Makefile \${IP_TEST}; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi;
- killall tftpd_test
-
- if ./mdns_test > /dev/null & then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi;
- sleep 1;
- killall mdns_test
-
- if ./snmp_test > /dev/null & then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi;
- sleep 1;
- killall snmp_test
-
- if ./sntp_test > /dev/null & then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi;
- sleep 1;
- killall sntp_test
-
-" > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh contrib/apps/func_tests/*_test $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "7" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.mesa-demos/fuego_test.sh b/engine/tests/Functional.mesa-demos/fuego_test.sh
new file mode 100644
index 0000000..ea36f75
--- /dev/null
+++ b/engine/tests/Functional.mesa-demos/fuego_test.sh
@@ -0,0 +1 @@
+FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.mesa-demos/mesa-demos.sh b/engine/tests/Functional.mesa-demos/mesa-demos.sh
deleted file mode 100644
index ea36f75..0000000
--- a/engine/tests/Functional.mesa-demos/mesa-demos.sh
+++ /dev/null
@@ -1 +0,0 @@
-FIXTHIS: no test definition!
diff --git a/engine/tests/Functional.neon/fuego_test.sh b/engine/tests/Functional.neon/fuego_test.sh
new file mode 100755
index 0000000..58b4c9f
--- /dev/null
+++ b/engine/tests/Functional.neon/fuego_test.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+tarball=neon-test.tar.bz2
+
+function test_build {
+ chmod -R 777 *
+ patch -p0 < gnutls_4.3_fixup.patch
+ patch -p0 < pkgconfig.patch
+ cd ./neon-0.30.1
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}usr/share/aclocal
+ autoreconf --verbose --install --force --exclude=autopoint -I macros
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX --with-libxml2 -with-expat --enable-shared --without-gssapi --with-ssl=gnutls CPPFLAGS="-DHAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION=1"
+ make
+ cd ./test
+ make
+ chmod -R 777 *
+ ./makekeys
+
+ gzip -c --no-name ../NEWS > file1.gz
+ gzip -c --name ../NEWS > file2.gz
+ gzip -c --no-name ../NEWS > trailing.gz
+ echo "hello, world" >> trailing.gz
+ dd of=badcsum.gz if=file1.gz bs=1 count=`perl -e 'printf "%d", (stat("file1.gz"))[7] - 8;'`
+
+ echo 'broken!' >> badcsum.gz
+ dd if=file1.gz of=truncated.gz bs=2048 count=2
+
+ dd of=corrupt1.gz if=file1.gz bs=1 count=500
+
+ cat ../NEWS >> corrupt1.gz
+ cat ../NEWS > corrupt2.gz
+ touch empty.gz
+ cat ../NEWS > random.txt
+ echo foobar > foobar.txt
+}
+
+function test_deploy {
+ put -r ./neon-0.30.1/test/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ if ./acl3744; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./auth; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ./basic; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ./compress; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./lock; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./oldacl; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if ./props; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+ if ./redirect; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ if ./request; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+ if ./session; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+ if ./socket; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+ if ./socket-ssl; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+
+ if ./string-tests; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ if ./stubs; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if ./uri-tests; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+ if ./util-tests; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
+ if ./xml; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
+ if ./xmlreq; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi"
+# if ./ssl; then echo 'TEST-13 FAIL'; else echo 'TEST-13 OK'; fi; \
+}
+
+function test_processing {
+ P_CRIT="TEST.*"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "18" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.neon/neon.sh b/engine/tests/Functional.neon/neon.sh
deleted file mode 100755
index 58b4c9f..0000000
--- a/engine/tests/Functional.neon/neon.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-tarball=neon-test.tar.bz2
-
-function test_build {
- chmod -R 777 *
- patch -p0 < gnutls_4.3_fixup.patch
- patch -p0 < pkgconfig.patch
- cd ./neon-0.30.1
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}usr/share/aclocal
- autoreconf --verbose --install --force --exclude=autopoint -I macros
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX --with-libxml2 -with-expat --enable-shared --without-gssapi --with-ssl=gnutls CPPFLAGS="-DHAVE_GNUTLS_CERTIFICATE_SET_RETRIEVE_FUNCTION=1"
- make
- cd ./test
- make
- chmod -R 777 *
- ./makekeys
-
- gzip -c --no-name ../NEWS > file1.gz
- gzip -c --name ../NEWS > file2.gz
- gzip -c --no-name ../NEWS > trailing.gz
- echo "hello, world" >> trailing.gz
- dd of=badcsum.gz if=file1.gz bs=1 count=`perl -e 'printf "%d", (stat("file1.gz"))[7] - 8;'`
-
- echo 'broken!' >> badcsum.gz
- dd if=file1.gz of=truncated.gz bs=2048 count=2
-
- dd of=corrupt1.gz if=file1.gz bs=1 count=500
-
- cat ../NEWS >> corrupt1.gz
- cat ../NEWS > corrupt2.gz
- touch empty.gz
- cat ../NEWS > random.txt
- echo foobar > foobar.txt
-}
-
-function test_deploy {
- put -r ./neon-0.30.1/test/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- if ./acl3744; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./auth; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ./basic; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ./compress; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./lock; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./oldacl; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if ./props; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
- if ./redirect; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- if ./request; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
- if ./session; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
- if ./socket; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
- if ./socket-ssl; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
-
- if ./string-tests; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- if ./stubs; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if ./uri-tests; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
- if ./util-tests; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi; \
- if ./xml; then echo 'TEST-18 OK'; else echo 'TEST-18 FAIL'; fi; \
- if ./xmlreq; then echo 'TEST-19 OK'; else echo 'TEST-19 FAIL'; fi"
-# if ./ssl; then echo 'TEST-13 FAIL'; else echo 'TEST-13 OK'; fi; \
-}
-
-function test_processing {
- P_CRIT="TEST.*"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "18" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.net-tools/fuego_test.sh b/engine/tests/Functional.net-tools/fuego_test.sh
new file mode 100755
index 0000000..b25f8b7
--- /dev/null
+++ b/engine/tests/Functional.net-tools/fuego_test.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+function test_build {
+ true
+}
+
+function test_deploy {
+ pwd
+}
+
+function test_run {
+ report "if arp; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if hostname; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ if ifconfig; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ if ipmaddr; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if iptunnel; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if netstat; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+ if route; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.net-tools/net-tools.sh b/engine/tests/Functional.net-tools/net-tools.sh
deleted file mode 100755
index b25f8b7..0000000
--- a/engine/tests/Functional.net-tools/net-tools.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-function test_build {
- true
-}
-
-function test_deploy {
- pwd
-}
-
-function test_run {
- report "if arp; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if hostname; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- if ifconfig; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- if ipmaddr; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if iptunnel; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if netstat; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
- if route; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "7" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.netperf/fuego_test.sh b/engine/tests/Functional.netperf/fuego_test.sh
new file mode 100755
index 0000000..5a3029e
--- /dev/null
+++ b/engine/tests/Functional.netperf/fuego_test.sh
@@ -0,0 +1,26 @@
+# some functions are shared between Benchmark.netperf and Functional.netperf
+tarball=../netperf/netperf-2.6.0.tar.bz2
+source $FUEGO_CORE/engine/tests/netperf/netperf.sh
+
+function test_pre_check {
+ assert_define "FUNCTIONAL_NETPERF_SRV"
+ if [ "$FUNCTIONAL_NETPERF_SRV" = "docker" ]; then
+ check_process_is_running "netserver"
+ fi
+}
+
+function test_deploy {
+ put $TEST_HOME/netperf-random_rr_script $BOARD_TESTDIR/fuego.$TESTDIR/
+ put src/netperf $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ case "$FUNCTIONAL_NETPERF_SRV" in
+ "default") srv=$SRV_IP ;;
+ "docker") srv=$SRV_IP ;;
+ *) srv=$FUNCTIONAL_NETPERF_SRV ;;
+ esac
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./netperf-random_rr_script $srv 50 5"
+}
+
+
diff --git a/engine/tests/Functional.netperf/netperf.sh b/engine/tests/Functional.netperf/netperf.sh
deleted file mode 100755
index 5a3029e..0000000
--- a/engine/tests/Functional.netperf/netperf.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# some functions are shared between Benchmark.netperf and Functional.netperf
-tarball=../netperf/netperf-2.6.0.tar.bz2
-source $FUEGO_CORE/engine/tests/netperf/netperf.sh
-
-function test_pre_check {
- assert_define "FUNCTIONAL_NETPERF_SRV"
- if [ "$FUNCTIONAL_NETPERF_SRV" = "docker" ]; then
- check_process_is_running "netserver"
- fi
-}
-
-function test_deploy {
- put $TEST_HOME/netperf-random_rr_script $BOARD_TESTDIR/fuego.$TESTDIR/
- put src/netperf $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- case "$FUNCTIONAL_NETPERF_SRV" in
- "default") srv=$SRV_IP ;;
- "docker") srv=$SRV_IP ;;
- *) srv=$FUNCTIONAL_NETPERF_SRV ;;
- esac
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./netperf-random_rr_script $srv 50 5"
-}
-
-
diff --git a/engine/tests/Functional.pi_tests/fuego_test.sh b/engine/tests/Functional.pi_tests/fuego_test.sh
new file mode 100755
index 0000000..b8d3f87
--- /dev/null
+++ b/engine/tests/Functional.pi_tests/fuego_test.sh
@@ -0,0 +1,20 @@
+tarball=pi_tests.tar.bz2
+
+function test_build {
+ sed -i -e "1d" ./Makefile
+ make CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put ./pi_stress $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_PI_TESTS_INVERSIONS
+ assert_define FUNCTIONAL_PI_TESTS_GROUPS
+ assert_define FUNCTIONAL_PI_TESTS_TIMEOUT
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true"
+}
+
+. $FUEGO_CORE/engine/scripts/stress.sh
diff --git a/engine/tests/Functional.pi_tests/pi_tests.sh b/engine/tests/Functional.pi_tests/pi_tests.sh
deleted file mode 100755
index b8d3f87..0000000
--- a/engine/tests/Functional.pi_tests/pi_tests.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-tarball=pi_tests.tar.bz2
-
-function test_build {
- sed -i -e "1d" ./Makefile
- make CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put ./pi_stress $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_PI_TESTS_INVERSIONS
- assert_define FUNCTIONAL_PI_TESTS_GROUPS
- assert_define FUNCTIONAL_PI_TESTS_TIMEOUT
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true"
-}
-
-. $FUEGO_CORE/engine/scripts/stress.sh
diff --git a/engine/tests/Functional.pixman/fuego_test.sh b/engine/tests/Functional.pixman/fuego_test.sh
new file mode 100755
index 0000000..7999b0d
--- /dev/null
+++ b/engine/tests/Functional.pixman/fuego_test.sh
@@ -0,0 +1,209 @@
+tarball=pixman-0.32.8.tar.gz
+
+function test_build {
+ libtoolize --automake
+ aclocal --system-acdir=${SDKROOT}usr/share/aclocal
+ autoreconf --verbose --install --force --exclude=autopoint
+ autoconf
+ autoheader
+ automake -a
+ ./configure --host=$PREFIX
+ make
+ echo "#!/bin/bash
+ if ./a1-trap-test ; then
+ echo 'TEST-1 OK'
+ else
+ echo 'TEST-1 FAILED'
+ fi
+
+ if ./alpha-loop ; then
+ echo 'TEST-2 OK'
+ else
+ echo 'TEST-2 FAILED'
+ fi
+
+ if ./alphamap ; then
+ echo 'TEST-3 OK'
+ else
+ echo 'TEST-3 FAILED'
+ fi
+
+ if ./affine-test ; then
+ echo 'TEST-4 OK'
+ else
+ echo 'TEST-4 FAILED'
+ fi
+
+ if ./blitters-test ; then
+ echo 'TEST-5 OK'
+ else
+ echo 'TEST-5 FAILED'
+ fi
+
+ if ./composite-traps-test ; then
+ echo 'TEST-6 OK'
+ else
+ echo 'TEST-6 FAILED'
+ fi
+
+ if ./glyph-test ; then
+ echo 'TEST-7 OK'
+ else
+ echo 'TEST-7 FAILED'
+ fi
+
+ if ./matrix-test ; then
+ echo 'TEST-8 OK'
+ else
+ echo 'TEST-8 FAILED'
+ fi
+
+ if ./rotate-test ; then
+ echo 'TEST-9 OK'
+ else
+ echo 'TEST-9 FAILED'
+ fi
+
+ if ./check-formats xor x8r8g8b8 x2r10g10b10 ; then
+ echo 'TEST-10 OK'
+ else
+ echo 'TEST-10 FAILED'
+ fi
+
+ if ./pixel-test ; then
+ echo 'TEST-11 OK'
+ else
+ echo 'TEST-11 FAILED'
+ fi
+
+ if ./prng-test ; then
+ echo 'TEST-12 OK'
+ else
+ echo 'TEST-12 FAILED'
+ fi
+
+ if ./combiner-test ; then
+ echo 'TEST-13 OK'
+ else
+ echo 'TEST-13 FAILED'
+ fi
+
+ if ./composite ; then
+ echo 'TEST-14 OK'
+ else
+ echo 'TEST-14 FAILED'
+ fi
+
+ if ./oob-test ; then
+ echo 'TEST-15 OK'
+ else
+ echo 'TEST-15 FAILED'
+ fi
+
+ if ./pdf-op-test ; then
+ echo 'TEST-16 OK'
+ else
+ echo 'TEST-16 FAILED'
+ fi
+
+ if ./fetch-test ; then
+ echo 'TEST-17 OK'
+ else
+ echo 'TEST-17 FAILED'
+ fi
+
+ if ./radial-perf-test ; then
+ echo 'TEST-18 OK'
+ else
+ echo 'TEST-18 FAILED'
+ fi
+
+ if ./gradient-crash-test ; then
+ echo 'TEST-19 OK'
+ else
+ echo 'TEST-19 FAILED'
+ fi
+
+ if ./region-contains-test ; then
+ echo 'TEST-20 OK'
+ else
+ echo 'TEST-20 FAILED'
+ fi
+
+ if ./region-test ; then
+ echo 'TEST-21 OK'
+ else
+ echo 'TEST-21 FAILED'
+ fi
+
+ if ./region-translate-test ; then
+ echo 'TEST-22 OK'
+ else
+ echo 'TEST-22 FAILED'
+ fi
+
+ if ./scaling-crash-test ; then
+ echo 'TEST-23 OK'
+ else
+ echo 'TEST-23 FAILED'
+ fi
+
+ if ./scaling-helpers-test ; then
+ echo 'TEST-24 OK'
+ else
+ echo 'TEST-24 FAILED'
+ fi
+
+ if ./scaling-test ; then
+ echo 'TEST-25 OK'
+ else
+ echo 'TEST-25 FAILED'
+ fi
+
+ if ./thread-test ; then
+ echo 'TEST-26 OK'
+ else
+ echo 'TEST-26 FAILED'
+ fi
+
+ if ./stress-test ; then
+ echo 'TEST-27 OK'
+ else
+ echo 'TEST-27 FAILED'
+ fi
+
+ if ./trap-crasher ; then
+ echo 'TEST-28 OK'
+ else
+ echo 'TEST-28 FAILED'
+ fi
+
+ if ./infinite-loop ; then
+ echo 'TEST-29 OK'
+ else
+ echo 'TEST-29 FAILED'
+ fi
+
+ if ./lowlevel-blt-bench -b -c add_n_8888 ; then
+ echo 'TEST-30 OK'
+ else
+ echo 'TEST-30 FAILED'
+ fi
+ " > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put test/.libs/* run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR;ls; sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "30" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.pixman/pixman.sh b/engine/tests/Functional.pixman/pixman.sh
deleted file mode 100755
index 7999b0d..0000000
--- a/engine/tests/Functional.pixman/pixman.sh
+++ /dev/null
@@ -1,209 +0,0 @@
-tarball=pixman-0.32.8.tar.gz
-
-function test_build {
- libtoolize --automake
- aclocal --system-acdir=${SDKROOT}usr/share/aclocal
- autoreconf --verbose --install --force --exclude=autopoint
- autoconf
- autoheader
- automake -a
- ./configure --host=$PREFIX
- make
- echo "#!/bin/bash
- if ./a1-trap-test ; then
- echo 'TEST-1 OK'
- else
- echo 'TEST-1 FAILED'
- fi
-
- if ./alpha-loop ; then
- echo 'TEST-2 OK'
- else
- echo 'TEST-2 FAILED'
- fi
-
- if ./alphamap ; then
- echo 'TEST-3 OK'
- else
- echo 'TEST-3 FAILED'
- fi
-
- if ./affine-test ; then
- echo 'TEST-4 OK'
- else
- echo 'TEST-4 FAILED'
- fi
-
- if ./blitters-test ; then
- echo 'TEST-5 OK'
- else
- echo 'TEST-5 FAILED'
- fi
-
- if ./composite-traps-test ; then
- echo 'TEST-6 OK'
- else
- echo 'TEST-6 FAILED'
- fi
-
- if ./glyph-test ; then
- echo 'TEST-7 OK'
- else
- echo 'TEST-7 FAILED'
- fi
-
- if ./matrix-test ; then
- echo 'TEST-8 OK'
- else
- echo 'TEST-8 FAILED'
- fi
-
- if ./rotate-test ; then
- echo 'TEST-9 OK'
- else
- echo 'TEST-9 FAILED'
- fi
-
- if ./check-formats xor x8r8g8b8 x2r10g10b10 ; then
- echo 'TEST-10 OK'
- else
- echo 'TEST-10 FAILED'
- fi
-
- if ./pixel-test ; then
- echo 'TEST-11 OK'
- else
- echo 'TEST-11 FAILED'
- fi
-
- if ./prng-test ; then
- echo 'TEST-12 OK'
- else
- echo 'TEST-12 FAILED'
- fi
-
- if ./combiner-test ; then
- echo 'TEST-13 OK'
- else
- echo 'TEST-13 FAILED'
- fi
-
- if ./composite ; then
- echo 'TEST-14 OK'
- else
- echo 'TEST-14 FAILED'
- fi
-
- if ./oob-test ; then
- echo 'TEST-15 OK'
- else
- echo 'TEST-15 FAILED'
- fi
-
- if ./pdf-op-test ; then
- echo 'TEST-16 OK'
- else
- echo 'TEST-16 FAILED'
- fi
-
- if ./fetch-test ; then
- echo 'TEST-17 OK'
- else
- echo 'TEST-17 FAILED'
- fi
-
- if ./radial-perf-test ; then
- echo 'TEST-18 OK'
- else
- echo 'TEST-18 FAILED'
- fi
-
- if ./gradient-crash-test ; then
- echo 'TEST-19 OK'
- else
- echo 'TEST-19 FAILED'
- fi
-
- if ./region-contains-test ; then
- echo 'TEST-20 OK'
- else
- echo 'TEST-20 FAILED'
- fi
-
- if ./region-test ; then
- echo 'TEST-21 OK'
- else
- echo 'TEST-21 FAILED'
- fi
-
- if ./region-translate-test ; then
- echo 'TEST-22 OK'
- else
- echo 'TEST-22 FAILED'
- fi
-
- if ./scaling-crash-test ; then
- echo 'TEST-23 OK'
- else
- echo 'TEST-23 FAILED'
- fi
-
- if ./scaling-helpers-test ; then
- echo 'TEST-24 OK'
- else
- echo 'TEST-24 FAILED'
- fi
-
- if ./scaling-test ; then
- echo 'TEST-25 OK'
- else
- echo 'TEST-25 FAILED'
- fi
-
- if ./thread-test ; then
- echo 'TEST-26 OK'
- else
- echo 'TEST-26 FAILED'
- fi
-
- if ./stress-test ; then
- echo 'TEST-27 OK'
- else
- echo 'TEST-27 FAILED'
- fi
-
- if ./trap-crasher ; then
- echo 'TEST-28 OK'
- else
- echo 'TEST-28 FAILED'
- fi
-
- if ./infinite-loop ; then
- echo 'TEST-29 OK'
- else
- echo 'TEST-29 FAILED'
- fi
-
- if ./lowlevel-blt-bench -b -c add_n_8888 ; then
- echo 'TEST-30 OK'
- else
- echo 'TEST-30 FAILED'
- fi
- " > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put test/.libs/* run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR;ls; sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "30" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.pppd/fuego_test.sh b/engine/tests/Functional.pppd/fuego_test.sh
new file mode 100755
index 0000000..a622f95
--- /dev/null
+++ b/engine/tests/Functional.pppd/fuego_test.sh
@@ -0,0 +1,42 @@
+tarball=ppp-2.4.7.tar.gz
+
+function test_build {
+ ${CC} ppp_response.c -o ppp_response
+ echo "#!/bin/bash
+
+ python vserial.py &
+ sleep 1
+ pwd; ls
+ ./ppp_response \$(cat slave1) &
+ sleep 1
+ pppd connect 'chat -v \"\" AT OK ATDT5551212 CONNECT' \$(cat slave2) 38400 debug defaultroute nocrtscts idle 60 &
+ sleep 5
+ ifconfig -a
+ if ifconfig ppp0 ; then
+ echo 'TEST-1 OK'
+ else
+ echo 'TEST-1 FAILED'
+ fi
+
+ killall python
+ killall ppp_response
+# killall pppd
+ " > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ pwd
+ ls
+ put * run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
diff --git a/engine/tests/Functional.pppd/pppd.sh b/engine/tests/Functional.pppd/pppd.sh
deleted file mode 100755
index a622f95..0000000
--- a/engine/tests/Functional.pppd/pppd.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-tarball=ppp-2.4.7.tar.gz
-
-function test_build {
- ${CC} ppp_response.c -o ppp_response
- echo "#!/bin/bash
-
- python vserial.py &
- sleep 1
- pwd; ls
- ./ppp_response \$(cat slave1) &
- sleep 1
- pppd connect 'chat -v \"\" AT OK ATDT5551212 CONNECT' \$(cat slave2) 38400 debug defaultroute nocrtscts idle 60 &
- sleep 5
- ifconfig -a
- if ifconfig ppp0 ; then
- echo 'TEST-1 OK'
- else
- echo 'TEST-1 FAILED'
- fi
-
- killall python
- killall ppp_response
-# killall pppd
- " > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- pwd
- ls
- put * run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
diff --git a/engine/tests/Functional.protobuf/fuego_test.sh b/engine/tests/Functional.protobuf/fuego_test.sh
new file mode 100755
index 0000000..57037d3
--- /dev/null
+++ b/engine/tests/Functional.protobuf/fuego_test.sh
@@ -0,0 +1,46 @@
+tarball=protobuf-2.6.1.tar.gz
+
+function test_build {
+ echo "#!/bin/bash
+ protoc --cpp_out=. --java_out=. --python_out=. addressbook.proto;
+
+ if [ -f addressbook_pb2.py ] ; then
+ echo 'TEST-1 OK'
+ else
+ echo 'TEST-1 FAILED'
+ fi
+
+ if [ -f addressbook.pb.cc ] ; then
+ echo 'TEST-2 OK'
+ else
+ echo 'TEST-2 FAILED'
+ fi
+
+ if [ -f addressbook.pb.h ] ; then
+ echo 'TEST-3 OK'
+ else
+ echo 'TEST-3 FAILED'
+ fi
+
+ if [ -d com ] ; then
+ echo 'TEST-4 OK'
+ else
+ echo 'TEST-4 FAILED'
+ fi" > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put examples/* run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.protobuf/protobuf.sh b/engine/tests/Functional.protobuf/protobuf.sh
deleted file mode 100755
index 57037d3..0000000
--- a/engine/tests/Functional.protobuf/protobuf.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-tarball=protobuf-2.6.1.tar.gz
-
-function test_build {
- echo "#!/bin/bash
- protoc --cpp_out=. --java_out=. --python_out=. addressbook.proto;
-
- if [ -f addressbook_pb2.py ] ; then
- echo 'TEST-1 OK'
- else
- echo 'TEST-1 FAILED'
- fi
-
- if [ -f addressbook.pb.cc ] ; then
- echo 'TEST-2 OK'
- else
- echo 'TEST-2 FAILED'
- fi
-
- if [ -f addressbook.pb.h ] ; then
- echo 'TEST-3 OK'
- else
- echo 'TEST-3 FAILED'
- fi
-
- if [ -d com ] ; then
- echo 'TEST-4 OK'
- else
- echo 'TEST-4 FAILED'
- fi" > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- put examples/* run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "4" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.rmaptest/fuego_test.sh b/engine/tests/Functional.rmaptest/fuego_test.sh
new file mode 100755
index 0000000..69e08b0
--- /dev/null
+++ b/engine/tests/Functional.rmaptest/fuego_test.sh
@@ -0,0 +1,25 @@
+tarball=rmaptest.tar.gz
+
+function test_build {
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put rmap-test $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_RMAPTEST_ITERATIONS
+ assert_define FUNCTIONAL_RMAPTEST_VMA
+ assert_define FUNCTIONAL_RMAPTEST_VMA_SIZE
+ assert_define FUNCTIONAL_RMAPTEST_TASKS
+ assert_define FUNCTIONAL_RMAPTEST_VMAS_FOR_PROCESS
+
+ report "cd $BOARD_TESTDIR/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
+}
+
+
diff --git a/engine/tests/Functional.rmaptest/rmaptest.sh b/engine/tests/Functional.rmaptest/rmaptest.sh
deleted file mode 100755
index 69e08b0..0000000
--- a/engine/tests/Functional.rmaptest/rmaptest.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=rmaptest.tar.gz
-
-function test_build {
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put rmap-test $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_RMAPTEST_ITERATIONS
- assert_define FUNCTIONAL_RMAPTEST_VMA
- assert_define FUNCTIONAL_RMAPTEST_VMA_SIZE
- assert_define FUNCTIONAL_RMAPTEST_TASKS
- assert_define FUNCTIONAL_RMAPTEST_VMAS_FOR_PROCESS
-
- report "cd $BOARD_TESTDIR/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
-}
-
-
diff --git a/engine/tests/Functional.scifab/fuego_test.sh b/engine/tests/Functional.scifab/fuego_test.sh
new file mode 100755
index 0000000..d874964
--- /dev/null
+++ b/engine/tests/Functional.scifab/fuego_test.sh
@@ -0,0 +1,25 @@
+tarball=dung-3.4.25-m2.tar.gz
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put ./* $OSV_HOME/osv.$TESTDIR/
+}
+
+function test_run {
+ report "cd $OSV_HOME/osv.$TESTDIR/scifab; ./dmesg-sh-sci.0.sh; ./proc-interrupts.sh"
+}
+
+function test_processing {
+ assert_define FUNCTIONAL_SCIFAB_RES_LINES_COUNT
+ assert_define FUNCTIONAL_SCIFAB_RES_PASS_COUNT
+ assert_define FUNCTIONAL_SCIFAB_RES_FAIL_COUNT
+
+ check_capability "RENESAS"
+
+ log_compare "$TESTDIR" $FUNCTIONAL_SCIFAB_RES_LINES_COUNT "Passed:$FUNCTIONAL_SCIFAB_RES_PASS_COUNT Failed:$FUNCTIONAL_SCIFAB_RES_FAIL_COUNT" "p"
+}
+
+
diff --git a/engine/tests/Functional.scifab/scifab.sh b/engine/tests/Functional.scifab/scifab.sh
deleted file mode 100755
index d874964..0000000
--- a/engine/tests/Functional.scifab/scifab.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=dung-3.4.25-m2.tar.gz
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put ./* $OSV_HOME/osv.$TESTDIR/
-}
-
-function test_run {
- report "cd $OSV_HOME/osv.$TESTDIR/scifab; ./dmesg-sh-sci.0.sh; ./proc-interrupts.sh"
-}
-
-function test_processing {
- assert_define FUNCTIONAL_SCIFAB_RES_LINES_COUNT
- assert_define FUNCTIONAL_SCIFAB_RES_PASS_COUNT
- assert_define FUNCTIONAL_SCIFAB_RES_FAIL_COUNT
-
- check_capability "RENESAS"
-
- log_compare "$TESTDIR" $FUNCTIONAL_SCIFAB_RES_LINES_COUNT "Passed:$FUNCTIONAL_SCIFAB_RES_PASS_COUNT Failed:$FUNCTIONAL_SCIFAB_RES_FAIL_COUNT" "p"
-}
-
-
diff --git a/engine/tests/Functional.scrashme/fuego_test.sh b/engine/tests/Functional.scrashme/fuego_test.sh
new file mode 100755
index 0000000..5c6981d
--- /dev/null
+++ b/engine/tests/Functional.scrashme/fuego_test.sh
@@ -0,0 +1,21 @@
+tarball=scrashme.tar.bz2
+
+function test_pre_check {
+ assert_define FUNCTIONAL_SCRASHME_NUM
+ assert_define FUNCTIONAL_SCRASHME_MODE
+}
+
+function test_build {
+ patch -p1 -N -s < $TEST_HOME/scrashme-testfix.patch
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --mode=$FUNCTIONAL_SCRASHME_MODE -N$FUNCTIONAL_SCRASHME_NUM"
+}
+
+. $FUEGO_CORE/engine/scripts/stress.sh
diff --git a/engine/tests/Functional.scrashme/scrashme.sh b/engine/tests/Functional.scrashme/scrashme.sh
deleted file mode 100755
index 5c6981d..0000000
--- a/engine/tests/Functional.scrashme/scrashme.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-tarball=scrashme.tar.bz2
-
-function test_pre_check {
- assert_define FUNCTIONAL_SCRASHME_NUM
- assert_define FUNCTIONAL_SCRASHME_MODE
-}
-
-function test_build {
- patch -p1 -N -s < $TEST_HOME/scrashme-testfix.patch
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --mode=$FUNCTIONAL_SCRASHME_MODE -N$FUNCTIONAL_SCRASHME_NUM"
-}
-
-. $FUEGO_CORE/engine/scripts/stress.sh
diff --git a/engine/tests/Functional.sdhi_0/fuego_test.sh b/engine/tests/Functional.sdhi_0/fuego_test.sh
new file mode 100755
index 0000000..b290808
--- /dev/null
+++ b/engine/tests/Functional.sdhi_0/fuego_test.sh
@@ -0,0 +1,25 @@
+tarball=dung-3.4.25-m2.tar.gz
+
+function test_build {
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put ./* $OSV_HOME/osv.$TESTDIR/
+}
+
+function test_run {
+ report "cd $OSV_HOME/osv.$TESTDIR/sdhi.0; ./unbind-bind-write.sh; ./write-10M.sh; ./write-1k.sh"
+}
+
+function test_processing {
+ assert_define FUNCTIONAL_SDHI_0_RES_LINES_COUNT
+
+ check_capability "RENESAS"
+
+ log_compare "$TESTDIR" ""FUNCTIONAL_SDHI_0_RES_LINES_COUNT "Test passed" "p"
+
+}
+
+
+
diff --git a/engine/tests/Functional.sdhi_0/sdhi_0.sh b/engine/tests/Functional.sdhi_0/sdhi_0.sh
deleted file mode 100755
index b290808..0000000
--- a/engine/tests/Functional.sdhi_0/sdhi_0.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-tarball=dung-3.4.25-m2.tar.gz
-
-function test_build {
- touch test_suite_ready
-}
-
-function test_deploy {
- put ./* $OSV_HOME/osv.$TESTDIR/
-}
-
-function test_run {
- report "cd $OSV_HOME/osv.$TESTDIR/sdhi.0; ./unbind-bind-write.sh; ./write-10M.sh; ./write-1k.sh"
-}
-
-function test_processing {
- assert_define FUNCTIONAL_SDHI_0_RES_LINES_COUNT
-
- check_capability "RENESAS"
-
- log_compare "$TESTDIR" ""FUNCTIONAL_SDHI_0_RES_LINES_COUNT "Test passed" "p"
-
-}
-
-
-
diff --git a/engine/tests/Functional.stress/fuego_test.sh b/engine/tests/Functional.stress/fuego_test.sh
new file mode 100755
index 0000000..e9c467f
--- /dev/null
+++ b/engine/tests/Functional.stress/fuego_test.sh
@@ -0,0 +1,29 @@
+tarball=stress-1.0.4.tar.gz
+
+function test_build {
+ ./configure --host=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS";
+ make && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put src/stress $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_STRESS_SYNC
+ assert_define FUNCTIONAL_STRESS_SQRT
+ assert_define FUNCTIONAL_STRESS_HDD
+ assert_define FUNCTIONAL_STRESS_HDD_BYTES
+ assert_define FUNCTIONAL_STRESS_VM
+ assert_define FUNCTIONAL_STRESS_VM_BYTES
+ assert_define FUNCTIONAL_STRESS_TIMEOUT
+
+ report "cd $BOARD_TESTDIR/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"
+}
+
+
+
diff --git a/engine/tests/Functional.stress/stress.sh b/engine/tests/Functional.stress/stress.sh
deleted file mode 100755
index e9c467f..0000000
--- a/engine/tests/Functional.stress/stress.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-tarball=stress-1.0.4.tar.gz
-
-function test_build {
- ./configure --host=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS";
- make && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put src/stress $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_STRESS_SYNC
- assert_define FUNCTIONAL_STRESS_SQRT
- assert_define FUNCTIONAL_STRESS_HDD
- assert_define FUNCTIONAL_STRESS_HDD_BYTES
- assert_define FUNCTIONAL_STRESS_VM
- assert_define FUNCTIONAL_STRESS_VM_BYTES
- assert_define FUNCTIONAL_STRESS_TIMEOUT
-
- report "cd $BOARD_TESTDIR/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"
-}
-
-
-
diff --git a/engine/tests/Functional.synctest/fuego_test.sh b/engine/tests/Functional.synctest/fuego_test.sh
new file mode 100755
index 0000000..aff0820
--- /dev/null
+++ b/engine/tests/Functional.synctest/fuego_test.sh
@@ -0,0 +1,28 @@
+tarball=synctest.tar.gz
+
+function test_build {
+ make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put synctest $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ assert_define FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV
+ assert_define FUNCTIONAL_SYNCTEST_MOUNT_POINT
+ assert_define FUNCTIONAL_SYNCTEST_LEN
+ assert_define FUNCTIONAL_SYNCTEST_LOOP
+
+ hd_test_mount_prepare $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT
+ report "cd $FUNCTIONAL_SYNCTEST_MOUNT_POINT/fuego.$TESTDIR; $BOARD_TESTDIR/fuego.$TESTDIR/synctest $FUNCTIONAL_SYNCTEST_LEN $FUNCTIONAL_SYNCTEST_LOOP"
+
+ hd_test_clean_umount $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "1" "PASS : sync interrupted" "p"
+}
+
+
+
diff --git a/engine/tests/Functional.synctest/synctest.sh b/engine/tests/Functional.synctest/synctest.sh
deleted file mode 100755
index aff0820..0000000
--- a/engine/tests/Functional.synctest/synctest.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-tarball=synctest.tar.gz
-
-function test_build {
- make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put synctest $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- assert_define FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV
- assert_define FUNCTIONAL_SYNCTEST_MOUNT_POINT
- assert_define FUNCTIONAL_SYNCTEST_LEN
- assert_define FUNCTIONAL_SYNCTEST_LOOP
-
- hd_test_mount_prepare $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT
- report "cd $FUNCTIONAL_SYNCTEST_MOUNT_POINT/fuego.$TESTDIR; $BOARD_TESTDIR/fuego.$TESTDIR/synctest $FUNCTIONAL_SYNCTEST_LEN $FUNCTIONAL_SYNCTEST_LOOP"
-
- hd_test_clean_umount $FUNCTIONAL_SYNCTEST_MOUNT_BLOCKDEV $FUNCTIONAL_SYNCTEST_MOUNT_POINT
-}
-
-function test_processing {
- log_compare "$TESTDIR" "1" "PASS : sync interrupted" "p"
-}
-
-
-
diff --git a/engine/tests/Functional.thrift/fuego_test.sh b/engine/tests/Functional.thrift/fuego_test.sh
new file mode 100755
index 0000000..8310e4e
--- /dev/null
+++ b/engine/tests/Functional.thrift/fuego_test.sh
@@ -0,0 +1,146 @@
+tarball=thrift-0.9.3.tar.gz
+
+function test_build {
+ echo "#!/bin/bash
+ tar zxf git.tar.gz
+ cd git/tutorial
+ thrift -r --gen py tutorial.thrift
+ thrift -r --gen cpp tutorial.thrift
+ ls
+ echo \"#### build-test.sh\"
+ tar zcf gen-cpp.tar.gz gen-cpp
+ " > build-tests.sh
+
+ echo "#!/bin/bash
+ cd git/tutorial
+ if [ -e gen-py/__init__.py ] ; then
+ echo 'TEST-1 OK'
+ else
+ echo 'TEST-1 FAILED'
+ fi
+
+ if [ -e gen-py/tutorial/__init__.py ] ; then
+ echo 'TEST-2 OK'
+ else
+ echo 'TEST-2 FAILED'
+ fi
+
+ if [ -e gen-py/tutorial/ttypes.py ] ; then
+ echo 'TEST-3 OK'
+ else
+ echo 'TEST-3 FAILED'
+ fi
+
+ if [ -e gen-py/tutorial/Calculator.py ] ; then
+ echo 'TEST-4 OK'
+ else
+ echo 'TEST-4 FAILED'
+ fi
+
+ if [ -e gen-py/tutorial/constants.py ] ; then
+ echo 'TEST-5 OK'
+ else
+ echo 'TEST-5 FAILED'
+ fi
+
+ if [ -e gen-py/tutorial/Calculator-remote ] ; then
+ echo 'TEST-6 OK'
+ else
+ echo 'TEST-6 FAILED'
+ fi
+
+ if [ -e gen-py/shared ] ; then
+ echo 'TEST-7 OK'
+ else
+ echo 'TEST-7 FAILED'
+ fi
+
+ if [ -e gen-py/shared/__init__.py ] ; then
+ echo 'TEST-8 OK'
+ else
+ echo 'TEST-8 FAILED'
+ fi
+
+ if [ -e gen-py/shared/ttypes.py ] ; then
+ echo 'TEST-9 OK'
+ else
+ echo 'TEST-9 FAILED'
+ fi
+
+ if [ -e gen-py/shared/SharedService.py ] ; then
+ echo 'TEST-10 OK'
+ else
+ echo 'TEST-10 FAILED'
+ fi
+
+ if [ -e gen-py/shared/constants.py ] ; then
+ echo 'TEST-11 OK'
+ else
+ echo 'TEST-11 FAILED'
+ fi
+
+ if [ -e gen-py/shared/SharedService-remote ] ; then
+ echo 'TEST-12 OK'
+ else
+ echo 'TEST-12 FAILED'
+ fi
+
+ cp py/PythonClient.py py/PythonServer.py gen-py/
+ cd gen-py
+ ./PythonServer.py &
+ sleep 1
+ ./PythonClient.py
+
+ if [ \$? -eq 0 ] ; then
+ echo 'TEST-13 OK'
+ else
+ echo 'TEST-13 FAILED'
+ fi
+
+ killall python
+
+ cd $BOARD_TESTDIR/fuego.$TESTDIR/; \
+ ./CppServer &
+ sleep 1
+ ./CppClient
+ if [ \$? -eq 0 ] ; then
+ echo 'TEST-14 OK'
+ else
+ echo 'TEST-14 FAILED'
+ fi
+
+ killall CppServer
+ " > run-tests.sh
+ touch test_suite_ready
+}
+
+function test_deploy {
+ tar zcf git.tar.gz git
+ put -r git.tar.gz build-tests.sh run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR \
+ tar zxf git.tar.gz;
+ sh -v build-tests.sh 2>&1"
+ cd $WORKSPACE/$TRIPLET
+ pwd
+ ls
+ get $BOARD_TESTDIR/fuego.$TESTDIR/git/tutorial/gen-cpp.tar.gz .; pwd
+ tar zxf gen-cpp.tar.gz -C git/tutorial/;
+ cd git/tutorial/cpp
+ CPPFILES="../gen-cpp/shared_types.cpp ../gen-cpp/tutorial_types.cpp ../gen-cpp/tutorial_constants.cpp ../gen-cpp/Calculator.cpp ../gen-cpp/SharedService.cpp"
+ ${CXX} CppServer.cpp ${CPPFILES} -o CppServer -I../../lib/cpp/src/ -lthrift
+ ${CXX} CppClient.cpp ${CPPFILES} -o CppClient -I../../lib/cpp/src/ -lthrift
+ put CppServer CppClient $BOARD_TESTDIR/fuego.$TESTDIR/
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
+ sh -v run-tests.sh 2>&1"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "14" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
+
diff --git a/engine/tests/Functional.thrift/thrift.sh b/engine/tests/Functional.thrift/thrift.sh
deleted file mode 100755
index 8310e4e..0000000
--- a/engine/tests/Functional.thrift/thrift.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-tarball=thrift-0.9.3.tar.gz
-
-function test_build {
- echo "#!/bin/bash
- tar zxf git.tar.gz
- cd git/tutorial
- thrift -r --gen py tutorial.thrift
- thrift -r --gen cpp tutorial.thrift
- ls
- echo \"#### build-test.sh\"
- tar zcf gen-cpp.tar.gz gen-cpp
- " > build-tests.sh
-
- echo "#!/bin/bash
- cd git/tutorial
- if [ -e gen-py/__init__.py ] ; then
- echo 'TEST-1 OK'
- else
- echo 'TEST-1 FAILED'
- fi
-
- if [ -e gen-py/tutorial/__init__.py ] ; then
- echo 'TEST-2 OK'
- else
- echo 'TEST-2 FAILED'
- fi
-
- if [ -e gen-py/tutorial/ttypes.py ] ; then
- echo 'TEST-3 OK'
- else
- echo 'TEST-3 FAILED'
- fi
-
- if [ -e gen-py/tutorial/Calculator.py ] ; then
- echo 'TEST-4 OK'
- else
- echo 'TEST-4 FAILED'
- fi
-
- if [ -e gen-py/tutorial/constants.py ] ; then
- echo 'TEST-5 OK'
- else
- echo 'TEST-5 FAILED'
- fi
-
- if [ -e gen-py/tutorial/Calculator-remote ] ; then
- echo 'TEST-6 OK'
- else
- echo 'TEST-6 FAILED'
- fi
-
- if [ -e gen-py/shared ] ; then
- echo 'TEST-7 OK'
- else
- echo 'TEST-7 FAILED'
- fi
-
- if [ -e gen-py/shared/__init__.py ] ; then
- echo 'TEST-8 OK'
- else
- echo 'TEST-8 FAILED'
- fi
-
- if [ -e gen-py/shared/ttypes.py ] ; then
- echo 'TEST-9 OK'
- else
- echo 'TEST-9 FAILED'
- fi
-
- if [ -e gen-py/shared/SharedService.py ] ; then
- echo 'TEST-10 OK'
- else
- echo 'TEST-10 FAILED'
- fi
-
- if [ -e gen-py/shared/constants.py ] ; then
- echo 'TEST-11 OK'
- else
- echo 'TEST-11 FAILED'
- fi
-
- if [ -e gen-py/shared/SharedService-remote ] ; then
- echo 'TEST-12 OK'
- else
- echo 'TEST-12 FAILED'
- fi
-
- cp py/PythonClient.py py/PythonServer.py gen-py/
- cd gen-py
- ./PythonServer.py &
- sleep 1
- ./PythonClient.py
-
- if [ \$? -eq 0 ] ; then
- echo 'TEST-13 OK'
- else
- echo 'TEST-13 FAILED'
- fi
-
- killall python
-
- cd $BOARD_TESTDIR/fuego.$TESTDIR/; \
- ./CppServer &
- sleep 1
- ./CppClient
- if [ \$? -eq 0 ] ; then
- echo 'TEST-14 OK'
- else
- echo 'TEST-14 FAILED'
- fi
-
- killall CppServer
- " > run-tests.sh
- touch test_suite_ready
-}
-
-function test_deploy {
- tar zcf git.tar.gz git
- put -r git.tar.gz build-tests.sh run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR \
- tar zxf git.tar.gz;
- sh -v build-tests.sh 2>&1"
- cd $WORKSPACE/$TRIPLET
- pwd
- ls
- get $BOARD_TESTDIR/fuego.$TESTDIR/git/tutorial/gen-cpp.tar.gz .; pwd
- tar zxf gen-cpp.tar.gz -C git/tutorial/;
- cd git/tutorial/cpp
- CPPFILES="../gen-cpp/shared_types.cpp ../gen-cpp/tutorial_types.cpp ../gen-cpp/tutorial_constants.cpp ../gen-cpp/Calculator.cpp ../gen-cpp/SharedService.cpp"
- ${CXX} CppServer.cpp ${CPPFILES} -o CppServer -I../../lib/cpp/src/ -lthrift
- ${CXX} CppClient.cpp ${CPPFILES} -o CppClient -I../../lib/cpp/src/ -lthrift
- put CppServer CppClient $BOARD_TESTDIR/fuego.$TESTDIR/
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; \
- sh -v run-tests.sh 2>&1"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "14" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
-
diff --git a/engine/tests/Functional.tiff/fuego_test.sh b/engine/tests/Functional.tiff/fuego_test.sh
new file mode 100755
index 0000000..35703fb
--- /dev/null
+++ b/engine/tests/Functional.tiff/fuego_test.sh
@@ -0,0 +1,45 @@
+tarball=tiff-4.0.6.tar.gz
+
+function test_build {
+ echo " test_build tif.sh "
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2bw tools/tiff2bw.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2pdf tools/tiff2pdf.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2ps tools/tiff2ps.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2rgba tools/tiff2rgba.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcmp tools/tiffcmp.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffdither tools/tiffdither.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffdump tools/tiffdump.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffinfo tools/tiffinfo.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffset tools/tiffset.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffsplit tools/tiffsplit.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcp tools/tiffcp.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+ $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcrop tools/tiffcrop.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
+}
+
+function test_deploy {
+put tools/1.tif tools/111.tif tools/11.tif tools/jello.tif $BOARD_TESTDIR/fuego.$TESTDIR/
+put tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
+if tiff2bw 1.tif 2.tif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
+if tiff2pdf -o output.pdf 1.tif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
+if tiff2ps -1 jello.tif; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
+if tiff2rgba -b jello.tif jello; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
+if tiffcmp jello.tif 111.tif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
+if tiffdither -c lzw:2 111.tif 666.tif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
+if tiffdump 111.tif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
+if tiffinfo 111.tif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
+if tiffset jello.tif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;\
+if tiffsplit 11.tif -l; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;\
+if tiffcp 11.tif 000.tif;then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;\
+if tiffcrop 11.tif 0000.tif;then echo 'TEST-12 OK'; else echo 'TEST-12 FAILED';fi"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "12" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+}
+
+
diff --git a/engine/tests/Functional.tiff/tiff.sh b/engine/tests/Functional.tiff/tiff.sh
deleted file mode 100755
index 35703fb..0000000
--- a/engine/tests/Functional.tiff/tiff.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-tarball=tiff-4.0.6.tar.gz
-
-function test_build {
- echo " test_build tif.sh "
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2bw tools/tiff2bw.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2pdf tools/tiff2pdf.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2ps tools/tiff2ps.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiff2rgba tools/tiff2rgba.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcmp tools/tiffcmp.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffdither tools/tiffdither.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffdump tools/tiffdump.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffinfo tools/tiffinfo.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffset tools/tiffset.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffsplit tools/tiffsplit.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcp tools/tiffcp.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
- $CC -O2 -pipe -g -I./libtiff -Wall -W -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o tools/.libs/tiffcrop tools/tiffcrop.c $SDKROOT/usr/lib/libtiff.so $SDKROOT/usr/lib/liblzma.so $SDKROOT/usr/lib/libjpeg.so -lz -lm -pthread
-}
-
-function test_deploy {
-put tools/1.tif tools/111.tif tools/11.tif tools/jello.tif $BOARD_TESTDIR/fuego.$TESTDIR/
-put tools/.libs/* $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
-report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod 777 *;
-if tiff2bw 1.tif 2.tif; then echo 'TEST-1 OK'; else echo 'TEST-1 FAILED'; fi;\
-if tiff2pdf -o output.pdf 1.tif; then echo 'TEST-2 OK'; else echo 'TEST-2 FAILED'; fi;\
-if tiff2ps -1 jello.tif; then echo 'TEST-3 OK'; else echo 'TEST-3 FAILED'; fi;\
-if tiff2rgba -b jello.tif jello; then echo 'TEST-4 OK'; else echo 'TEST-4 FAILED'; fi;\
-if tiffcmp jello.tif 111.tif; then echo 'TEST-5 OK'; else echo 'TEST-5 FAILED'; fi;\
-if tiffdither -c lzw:2 111.tif 666.tif; then echo 'TEST-6 OK'; else echo 'TEST-6 FAILED'; fi;\
-if tiffdump 111.tif; then echo 'TEST-7 OK'; else echo 'TEST-7 FAILED'; fi;\
-if tiffinfo 111.tif; then echo 'TEST-8 OK'; else echo 'TEST-8 FAILED'; fi;\
-if tiffset jello.tif; then echo 'TEST-9 OK'; else echo 'TEST-9 FAILED'; fi;\
-if tiffsplit 11.tif -l; then echo 'TEST-10 OK'; else echo 'TEST-10 FAILED'; fi;\
-if tiffcp 11.tif 000.tif;then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;\
-if tiffcrop 11.tif 0000.tif;then echo 'TEST-12 OK'; else echo 'TEST-12 FAILED';fi"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "12" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
-}
-
-
diff --git a/engine/tests/Functional.vsomeip/fuego_test.sh b/engine/tests/Functional.vsomeip/fuego_test.sh
new file mode 100755
index 0000000..37dcd50
--- /dev/null
+++ b/engine/tests/Functional.vsomeip/fuego_test.sh
@@ -0,0 +1,199 @@
+#!/bin/bash
+
+tarball=vSomeIP.tar.bz2
+
+function test_build {
+ cd ./run_test
+ sed -i "s/192.168.160.212/${IPADDR}/g" `grep -rl "192.168.160.212" .`
+# sed -i "s/192.168.160.99/${IPADDR}/g" `grep -rl "192.168.160.99" .`
+
+ cd ../examples
+ $CXX -std=gnu++11 notify-sample.cpp -rdynamic -lpthread -lvsomeip -o notify-sample
+ $CXX -std=gnu++11 request-sample.cpp -rdynamic -lpthread -lvsomeip -o request-sample
+ $CXX -std=gnu++11 response-sample.cpp -rdynamic -lpthread -lvsomeip -o response-sample
+ $CXX -std=gnu++11 subscribe-sample.cpp -rdynamic -lpthread -lvsomeip -o subscribe-sample
+
+ cd ../test/application_tests
+ $CXX -std=gnu++11 application_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o application_test
+ cp application_test ../../run_test
+ cd ../configuration_tests
+ $CXX -std=gnu++11 configuration-test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o configuration-test
+ cp configuration-test ../../run_test
+ cd ../magic_cookies_tests
+ $CXX -std=gnu++11 magic_cookies_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_client
+ $CXX -std=gnu++11 magic_cookies_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_service
+ cp magic_cookies_test_client ../../run_test
+ cp magic_cookies_test_service ../../run_test
+ cd ../header_factory_tests
+ $CXX -std=gnu++11 header_factory_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test
+ $CXX -std=gnu++11 header_factory_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_client
+ $CXX -std=gnu++11 header_factory_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_service
+ cp header_factory_test ../../run_test
+ cp header_factory_test_client ../../run_test
+ cp header_factory_test_service ../../run_test
+ cd ../routing_tests
+ $CXX -std=gnu++11 external_local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o external_local_routing_test_service
+ $CXX -std=gnu++11 local_routing_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_client
+ $CXX -std=gnu++11 local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_service
+ cp external_local_routing_test_service ../../run_test
+ cp local_routing_test_client ../../run_test
+ cp local_routing_test_service ../../run_test
+ cd ../payload_tests
+ $CXX -std=gnu++11 payload_test_client.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_client
+ $CXX -std=gnu++11 payload_test_service.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_service
+ cp payload_test_client ../../run_test
+ cp payload_test_service ../../run_test
+ cd ../big_payload_tests
+ $CXX -std=gnu++11 big_payload_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_client
+ $CXX -std=gnu++11 big_payload_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_service
+ cp big_payload_test_client ../../run_test
+ cp big_payload_test_service ../../run_test
+ cd ../client_id_tests
+ $CXX -std=gnu++11 client_id_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o client_id_test_service
+ cp client_id_test_service ../../run_test
+
+ cd ../../examples/hello_world
+ $CXX -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
+ $CXX -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
+
+# g++ -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
+# g++ -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
+
+}
+
+function test_deploy {
+ pwd
+ put -r ./examples $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./run_test $BOARD_TESTDIR/fuego.$TESTDIR/
+ put -r ./config $BOARD_TESTDIR/fuego.$TESTDIR/
+
+# put -r ./examples /home/bi/vsomeip/
+# put -r ./run_test /home/bi/vsomeip/
+# put -r ./config /home/bi/vsomeip/
+
+# mkdir build
+# cd build
+# export GTEST_ROOT=./gtest-1.7.0/
+# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.7.2 ..
+# make check
+# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.160.237 ..
+
+# export LD_LIBRARY_PATH=../../../build:$LD_LIBRARY_PATH
+# export LD_LIBRARY_PATH=../../build:$LD_LIBRARY_PATH
+
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
+ cd run_test; \
+
+ if ./configuration-test -someip ../config/vsomeip-test.json; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
+ if ./application_test_starter.sh; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
+ (./magic_cookies_test_service_start.sh &); \
+ if ./magic_cookies_test_client_start.sh; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
+ killall magic_cookies_test_service;\
+
+ if ./header_factory_test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
+ if ./header_factory_test_send_receive_starter.sh; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
+ if ./local_routing_test_starter.sh; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
+
+ (./external_local_routing_test_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case7.txt ] ; then
+ if cat case7.txt | grep 'Please now run:external_local_routing_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_routing_test_client_external_start.sh; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
+killall external_local_routing_test_service;\
+killall local_routing_test_client:\
+
+ if ./local_payload_test_starter.sh; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
+ (./external_local_payload_test_service_start.sh &); \
+ sleep 2; \
+ if ./external_local_payload_test_client_local_start.sh; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
+killall payload_test_service;\
+
+ (./external_local_payload_test_client_external_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case10.txt ] ; then
+ if cat case10.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
+killall payload_test_service;\
+
+ (./external_local_payload_test_client_local_and_external_starter.sh &); \
+ for (( ; ; ))
+ do
+ if [ -f case11.txt ] ; then
+ if cat case11.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
+killall payload_test_service;\
+killall payload_test_client;\
+
+ (./big_payload_test_service_local_start.sh &); \
+ if ./big_payload_test_client_local_start.sh; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
+killall big_payload_test_service;\
+
+ cd ../examples/
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./request-sample &); \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./response-sample &); \
+ for (( ; ; ))
+ do
+ if [ -f log_request_sample.txt ] ; then
+ if cat log_request_sample.txt | grep 'Received a response from Service'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ pkill request-sample; \
+ pkill response-sample; \
+ if cat log_request_sample.txt | grep 'Received a response from Service'; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
+ if cat log_response_sample.txt | grep 'Received a message with Client/Session'; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./subscribe-sample &); \
+ (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./notify-sample &); \
+ for (( ; ; ))
+ do
+ if [ -f log_subscribe_sample.txt ] ; then
+ if cat log_subscribe_sample.txt | grep 'Received a notification for Event'
+ then echo 'log is found'
+ break
+ fi
+ fi
+ done
+ pkill subscribe-sampl; \
+ pkill notify-sample; \
+ if cat log_subscribe_sample.txt | grep 'Received a notification for Event'; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
+ if cat log_notify_sample.txt | grep 'Setting event (Length'; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
+
+ cd ../examples/hello_world
+ (VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_service ./hello_world_service &); \
+ if VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_client ./hello_world_client; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi
+ killall hello_world_service"
+}
+
+function test_processing {
+ P_CRIT="TEST.*OK"
+ N_CRIT="TEST.*FAIL"
+
+ log_compare "$TESTDIR" "17" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.vsomeip/vsomeip.sh b/engine/tests/Functional.vsomeip/vsomeip.sh
deleted file mode 100755
index 37dcd50..0000000
--- a/engine/tests/Functional.vsomeip/vsomeip.sh
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/bin/bash
-
-tarball=vSomeIP.tar.bz2
-
-function test_build {
- cd ./run_test
- sed -i "s/192.168.160.212/${IPADDR}/g" `grep -rl "192.168.160.212" .`
-# sed -i "s/192.168.160.99/${IPADDR}/g" `grep -rl "192.168.160.99" .`
-
- cd ../examples
- $CXX -std=gnu++11 notify-sample.cpp -rdynamic -lpthread -lvsomeip -o notify-sample
- $CXX -std=gnu++11 request-sample.cpp -rdynamic -lpthread -lvsomeip -o request-sample
- $CXX -std=gnu++11 response-sample.cpp -rdynamic -lpthread -lvsomeip -o response-sample
- $CXX -std=gnu++11 subscribe-sample.cpp -rdynamic -lpthread -lvsomeip -o subscribe-sample
-
- cd ../test/application_tests
- $CXX -std=gnu++11 application_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o application_test
- cp application_test ../../run_test
- cd ../configuration_tests
- $CXX -std=gnu++11 configuration-test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o configuration-test
- cp configuration-test ../../run_test
- cd ../magic_cookies_tests
- $CXX -std=gnu++11 magic_cookies_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_client
- $CXX -std=gnu++11 magic_cookies_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o magic_cookies_test_service
- cp magic_cookies_test_client ../../run_test
- cp magic_cookies_test_service ../../run_test
- cd ../header_factory_tests
- $CXX -std=gnu++11 header_factory_test.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test
- $CXX -std=gnu++11 header_factory_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_client
- $CXX -std=gnu++11 header_factory_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o header_factory_test_service
- cp header_factory_test ../../run_test
- cp header_factory_test_client ../../run_test
- cp header_factory_test_service ../../run_test
- cd ../routing_tests
- $CXX -std=gnu++11 external_local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o external_local_routing_test_service
- $CXX -std=gnu++11 local_routing_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_client
- $CXX -std=gnu++11 local_routing_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o local_routing_test_service
- cp external_local_routing_test_service ../../run_test
- cp local_routing_test_client ../../run_test
- cp local_routing_test_service ../../run_test
- cd ../payload_tests
- $CXX -std=gnu++11 payload_test_client.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_client
- $CXX -std=gnu++11 payload_test_service.cpp stopwatch.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o payload_test_service
- cp payload_test_client ../../run_test
- cp payload_test_service ../../run_test
- cd ../big_payload_tests
- $CXX -std=gnu++11 big_payload_test_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_client
- $CXX -std=gnu++11 big_payload_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o big_payload_test_service
- cp big_payload_test_client ../../run_test
- cp big_payload_test_service ../../run_test
- cd ../client_id_tests
- $CXX -std=gnu++11 client_id_test_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o client_id_test_service
- cp client_id_test_service ../../run_test
-
- cd ../../examples/hello_world
- $CXX -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
- $CXX -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../ -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
-
-# g++ -std=gnu++11 hello_world_client.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_client
-# g++ -std=gnu++11 hello_world_service.cpp -rdynamic -DBOOST_LOG_DYN_LINK=1 -I../../interface -L../../build -L../../build/gtest -lpthread -lvsomeip -lgtest -lboost_log_setup -lboost_log -lboost_system -lboost_thread -o hello_world_service
-
-}
-
-function test_deploy {
- pwd
- put -r ./examples $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./run_test $BOARD_TESTDIR/fuego.$TESTDIR/
- put -r ./config $BOARD_TESTDIR/fuego.$TESTDIR/
-
-# put -r ./examples /home/bi/vsomeip/
-# put -r ./run_test /home/bi/vsomeip/
-# put -r ./config /home/bi/vsomeip/
-
-# mkdir build
-# cd build
-# export GTEST_ROOT=./gtest-1.7.0/
-# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.7.2 ..
-# make check
-# cmake -DTEST_IP_MASTER=192.168.160.212 -DTEST_IP_SLAVE=192.168.160.237 ..
-
-# export LD_LIBRARY_PATH=../../../build:$LD_LIBRARY_PATH
-# export LD_LIBRARY_PATH=../../build:$LD_LIBRARY_PATH
-
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; export PATH=$BOARD_TESTDIR/fuego.$TESTDIR:$PATH; chmod -R 777 *; \
- cd run_test; \
-
- if ./configuration-test -someip ../config/vsomeip-test.json; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi; \
- if ./application_test_starter.sh; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi; \
- (./magic_cookies_test_service_start.sh &); \
- if ./magic_cookies_test_client_start.sh; then echo 'TEST-3 OK'; else echo 'TEST-3 FAIL'; fi; \
- killall magic_cookies_test_service;\
-
- if ./header_factory_test; then echo 'TEST-4 OK'; else echo 'TEST-4 FAIL'; fi; \
- if ./header_factory_test_send_receive_starter.sh; then echo 'TEST-5 OK'; else echo 'TEST-5 FAIL'; fi; \
- if ./local_routing_test_starter.sh; then echo 'TEST-6 OK'; else echo 'TEST-6 FAIL'; fi; \
-
- (./external_local_routing_test_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case7.txt ] ; then
- if cat case7.txt | grep 'Please now run:external_local_routing_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_routing_test_client_external_start.sh; then echo 'TEST-7 OK'; else echo 'TEST-7 FAIL'; fi; \
-killall external_local_routing_test_service;\
-killall local_routing_test_client:\
-
- if ./local_payload_test_starter.sh; then echo 'TEST-8 OK'; else echo 'TEST-8 FAIL'; fi; \
- (./external_local_payload_test_service_start.sh &); \
- sleep 2; \
- if ./external_local_payload_test_client_local_start.sh; then echo 'TEST-9 OK'; else echo 'TEST-9 FAIL'; fi; \
-killall payload_test_service;\
-
- (./external_local_payload_test_client_external_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case10.txt ] ; then
- if cat case10.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-10 OK'; else echo 'TEST-10 FAIL'; fi; \
-killall payload_test_service;\
-
- (./external_local_payload_test_client_local_and_external_starter.sh &); \
- for (( ; ; ))
- do
- if [ -f case11.txt ] ; then
- if cat case11.txt | grep 'Please now run:external_local_payload_test_client_external_start.sh'
- then echo 'log is found'
- break
- fi
- fi
- done
- if ./external_local_payload_test_client_external_start.sh; then echo 'TEST-11 OK'; else echo 'TEST-11 FAIL'; fi; \
-killall payload_test_service;\
-killall payload_test_client;\
-
- (./big_payload_test_service_local_start.sh &); \
- if ./big_payload_test_client_local_start.sh; then echo 'TEST-12 OK'; else echo 'TEST-12 FAIL'; fi; \
-killall big_payload_test_service;\
-
- cd ../examples/
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./request-sample &); \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./response-sample &); \
- for (( ; ; ))
- do
- if [ -f log_request_sample.txt ] ; then
- if cat log_request_sample.txt | grep 'Received a response from Service'
- then echo 'log is found'
- break
- fi
- fi
- done
- pkill request-sample; \
- pkill response-sample; \
- if cat log_request_sample.txt | grep 'Received a response from Service'; then echo 'TEST-13 OK'; else echo 'TEST-13 FAIL'; fi; \
- if cat log_response_sample.txt | grep 'Received a message with Client/Session'; then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi; \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=client-sample ./subscribe-sample &); \
- (env VSOMEIP_CONFIGURATION=../config/vsomeip-local.json VSOMEIP_APPLICATION_NAME=service-sample ./notify-sample &); \
- for (( ; ; ))
- do
- if [ -f log_subscribe_sample.txt ] ; then
- if cat log_subscribe_sample.txt | grep 'Received a notification for Event'
- then echo 'log is found'
- break
- fi
- fi
- done
- pkill subscribe-sampl; \
- pkill notify-sample; \
- if cat log_subscribe_sample.txt | grep 'Received a notification for Event'; then echo 'TEST-15 OK'; else echo 'TEST-15 FAIL'; fi; \
- if cat log_notify_sample.txt | grep 'Setting event (Length'; then echo 'TEST-16 OK'; else echo 'TEST-16 FAIL'; fi; \
-
- cd ../examples/hello_world
- (VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_service ./hello_world_service &); \
- if VSOMEIP_CONFIGURATION=./helloworld-local.json VSOMEIP_APPLICATION_NAME=hello_world_client ./hello_world_client; then echo 'TEST-17 OK'; else echo 'TEST-17 FAIL'; fi
- killall hello_world_service"
-}
-
-function test_processing {
- P_CRIT="TEST.*OK"
- N_CRIT="TEST.*FAIL"
-
- log_compare "$TESTDIR" "17" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
diff --git a/engine/tests/Functional.xorg-macros/fuego_test.sh b/engine/tests/Functional.xorg-macros/fuego_test.sh
new file mode 100755
index 0000000..95490be
--- /dev/null
+++ b/engine/tests/Functional.xorg-macros/fuego_test.sh
@@ -0,0 +1,25 @@
+#tarball=images.tar.gz
+
+function test_build {
+ echo "#!/bin/bash
+ if [ -f /usr/share/aclocal/xorg-macros.m4 ]; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
+ if [ -f /usr/share/pkgconfig/xorg-macros.pc ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
+ " > run-tests.sh
+
+ touch test_suite_ready
+}
+
+function test_deploy {
+ put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
+}
+
+function test_processing {
+ log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
+ log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
+}
+
+
diff --git a/engine/tests/Functional.xorg-macros/xorg-macros.sh b/engine/tests/Functional.xorg-macros/xorg-macros.sh
deleted file mode 100755
index 95490be..0000000
--- a/engine/tests/Functional.xorg-macros/xorg-macros.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#tarball=images.tar.gz
-
-function test_build {
- echo "#!/bin/bash
- if [ -f /usr/share/aclocal/xorg-macros.m4 ]; then echo 'TEST-1 OK'; else echo 'TEST-1 FAIL'; fi;
- if [ -f /usr/share/pkgconfig/xorg-macros.pc ]; then echo 'TEST-2 OK'; else echo 'TEST-2 FAIL'; fi;
- " > run-tests.sh
-
- touch test_suite_ready
-}
-
-function test_deploy {
- put run-tests.sh $BOARD_TESTDIR/fuego.$TESTDIR/;
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh"
-}
-
-function test_processing {
- log_compare "$TESTDIR" "2" "^TEST.*OK" "p"
- log_compare "$TESTDIR" "0" "^TEST.*FAIL" "n"
-}
-
-
diff --git a/engine/tests/Functional.zlib/fuego_test.sh b/engine/tests/Functional.zlib/fuego_test.sh
new file mode 100755
index 0000000..7615b5d
--- /dev/null
+++ b/engine/tests/Functional.zlib/fuego_test.sh
@@ -0,0 +1,34 @@
+tarball=zlib-1.2.3.tar.bz2
+
+function test_build {
+ AR=$PREFIX'-ar rc'
+ CPP=$PREFIX'-gcc -E'
+ CC="$CC" AR="$AR" CPP="$CPP" ./configure --includedir=$SDKROOT/usr/include --libdir=$SDKROOT/usr/lib
+ make LDSHARED="$CC" >/dev/null && touch test_suite_ready || build_error "error while building test"
+}
+
+function test_deploy {
+ put example minigzip $BOARD_TESTDIR/fuego.$TESTDIR/
+}
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; echo hello world | ./minigzip | ./minigzip -d || \
+ echo ' minigzip test FAILED '
+ if ./example; then \
+ echo ' zlib test OK '; \
+ else \
+ echo ' zlib test FAILED '; \
+ fi"
+}
+
+function test_processing {
+ P_CRIT="zlib test OK"
+ N_CRIT="zlib test FAILED"
+
+ log_compare "$TESTDIR" "1" "${P_CRIT}" "p"
+ log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
+}
+
+
+
+
diff --git a/engine/tests/Functional.zlib/zlib.sh b/engine/tests/Functional.zlib/zlib.sh
deleted file mode 100755
index 7615b5d..0000000
--- a/engine/tests/Functional.zlib/zlib.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-tarball=zlib-1.2.3.tar.bz2
-
-function test_build {
- AR=$PREFIX'-ar rc'
- CPP=$PREFIX'-gcc -E'
- CC="$CC" AR="$AR" CPP="$CPP" ./configure --includedir=$SDKROOT/usr/include --libdir=$SDKROOT/usr/lib
- make LDSHARED="$CC" >/dev/null && touch test_suite_ready || build_error "error while building test"
-}
-
-function test_deploy {
- put example minigzip $BOARD_TESTDIR/fuego.$TESTDIR/
-}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; echo hello world | ./minigzip | ./minigzip -d || \
- echo ' minigzip test FAILED '
- if ./example; then \
- echo ' zlib test OK '; \
- else \
- echo ' zlib test FAILED '; \
- fi"
-}
-
-function test_processing {
- P_CRIT="zlib test OK"
- N_CRIT="zlib test FAILED"
-
- log_compare "$TESTDIR" "1" "${P_CRIT}" "p"
- log_compare "$TESTDIR" "0" "${N_CRIT}" "n"
-}
-
-
-
-
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 07/23] stress: remove stress.sh and references
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (4 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 06/23] fuego_test: rename all test shell scripts to fuego_test.sh Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 08/23] scrashme: just fix indentation Daniel Sangorrin
` (15 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
These tests work fine with main.sh
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/stress.sh | 55 --------------------------
engine/tests/Functional.pi_tests/fuego_test.sh | 1 -
engine/tests/Functional.scrashme/fuego_test.sh | 2 -
3 files changed, 58 deletions(-)
delete mode 100644 engine/scripts/stress.sh
diff --git a/engine/scripts/stress.sh b/engine/scripts/stress.sh
deleted file mode 100644
index c1ed42f..0000000
--- a/engine/scripts/stress.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (c) 2014 Cogent Embedded, Inc.
-
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# DESCRIPTION
-# This script contains a sequence of calls that are needed for running stress test
-
-if [ -n "$FUEGO_DEBUG" ] ; then
- set -x
-fi
-set -e
-
-source $FUEGO_CORE/engine/scripts/overlays.sh
-set_overlay_vars
-
-source $FUEGO_CORE/engine/scripts/reports.sh
-source $FUEGO_CORE/engine/scripts/functions.sh
-
-echo "##### doing fuego phase: pre_test ########"
-pre_test $TESTDIR
-
-echo "##### doing fuego phase: build ########"
-if $Rebuild; then
- build
-fi
-
-echo "##### doing fuego phase: deploy ########"
-deploy
-
-echo "##### doing fuego phase: run ########"
-test_run
-FUEGO_RESULT=$?
-
-echo "##### doing fuego phase: get_testlog ########"
-get_testlog $TESTDIR
-
-post_test $TESTDIR
-echo "Fuego: all test phases complete!"
-return $FUEGO_RESULT
diff --git a/engine/tests/Functional.pi_tests/fuego_test.sh b/engine/tests/Functional.pi_tests/fuego_test.sh
index b8d3f87..c3c7e21 100755
--- a/engine/tests/Functional.pi_tests/fuego_test.sh
+++ b/engine/tests/Functional.pi_tests/fuego_test.sh
@@ -17,4 +17,3 @@ function test_run {
report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true"
}
-. $FUEGO_CORE/engine/scripts/stress.sh
diff --git a/engine/tests/Functional.scrashme/fuego_test.sh b/engine/tests/Functional.scrashme/fuego_test.sh
index 5c6981d..d173e47 100755
--- a/engine/tests/Functional.scrashme/fuego_test.sh
+++ b/engine/tests/Functional.scrashme/fuego_test.sh
@@ -17,5 +17,3 @@ function test_deploy {
function test_run {
report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --mode=$FUNCTIONAL_SCRASHME_MODE -N$FUNCTIONAL_SCRASHME_NUM"
}
-
-. $FUEGO_CORE/engine/scripts/stress.sh
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 08/23] scrashme: just fix indentation
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (5 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 07/23] stress: remove stress.sh and references Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 09/23] git: introduce a generic git mechanism and use pi_tests as a poc Daniel Sangorrin
` (14 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
I fix indentation whenever I touch/review a file but
we need to fix it throughout the project
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.scrashme/fuego_test.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/engine/tests/Functional.scrashme/fuego_test.sh b/engine/tests/Functional.scrashme/fuego_test.sh
index d173e47..0e8d855 100755
--- a/engine/tests/Functional.scrashme/fuego_test.sh
+++ b/engine/tests/Functional.scrashme/fuego_test.sh
@@ -1,8 +1,8 @@
tarball=scrashme.tar.bz2
function test_pre_check {
- assert_define FUNCTIONAL_SCRASHME_NUM
- assert_define FUNCTIONAL_SCRASHME_MODE
+ assert_define FUNCTIONAL_SCRASHME_NUM
+ assert_define FUNCTIONAL_SCRASHME_MODE
}
function test_build {
@@ -11,9 +11,9 @@ function test_build {
}
function test_deploy {
- put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
+ put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
}
function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --mode=$FUNCTIONAL_SCRASHME_MODE -N$FUNCTIONAL_SCRASHME_NUM"
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --mode=$FUNCTIONAL_SCRASHME_MODE -N$FUNCTIONAL_SCRASHME_NUM"
}
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 09/23] git: introduce a generic git mechanism and use pi_tests as a poc
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (6 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 08/23] scrashme: just fix indentation Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 10/23] expat: fix the expat test Daniel Sangorrin
` (13 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Now you can define gitrepo (and gitbranch or otherwise it
defaults to master) on a test instead of a tarball.
I included a FIXTHIS for supporting log/checkout of commit IDs.
Tests that use different repos depending on the spec can
reuse the unpack function by themselves. Now the test doesn't
fail if no tarball is provided.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/functions.sh | 27 ++++++++++++++-------
engine/tests/Functional.pi_tests/fuego_test.sh | 28 +++++++++++++++-------
engine/tests/Functional.pi_tests/pi_tests.tar.bz2 | Bin 9950 -> 0 bytes
3 files changed, 37 insertions(+), 18 deletions(-)
delete mode 100644 engine/tests/Functional.pi_tests/pi_tests.tar.bz2
diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
index 99996c7..a520d7f 100755
--- a/engine/scripts/functions.sh
+++ b/engine/scripts/functions.sh
@@ -39,16 +39,25 @@ set -o errtrace
# $1 - optional flag; if set to "nostrip",
# the leading path components won't be stripped
function unpack {
- [ "$1" = "nostrip" ] && strip_opt= || strip_opt="--strip-components=1"
-
- case ${tarball/*./} in
- gz|tgz) key=z ;;
- bz2) key=j ;;
- tar) key= ;;
- *) echo "Unknown $tarball file format. Not unpacking."; return;;
- esac
+ [ "$1" = "nostrip" ] && strip_opt= || strip_opt="--strip-components=1"
+
+ if [ ! -z ${tarball+x} ]; then
+ case ${tarball/*./} in
+ gz|tgz) key=z ;;
+ bz2) key=j ;;
+ tar) key= ;;
+ *) echo "Unknown $tarball file format. Not unpacking."; return;;
+ esac
+ tar ${key}xf $TEST_HOME/$tarball $strip_opt
+ fi
- tar ${key}xf $TEST_HOME/$tarball $strip_opt
+ if [ ! -z ${gitrepo+x} ]; then
+ if [ -z ${gitbranch+x} ]; then
+ gitbranch="master"
+ fi
+ # FIXTHIS: support commit ids (log and checkout)
+ git clone --depth=1 --branch=$gitbranch $gitrepo
+ fi
}
function is_empty {
diff --git a/engine/tests/Functional.pi_tests/fuego_test.sh b/engine/tests/Functional.pi_tests/fuego_test.sh
index c3c7e21..de6057e 100755
--- a/engine/tests/Functional.pi_tests/fuego_test.sh
+++ b/engine/tests/Functional.pi_tests/fuego_test.sh
@@ -1,19 +1,29 @@
-tarball=pi_tests.tar.bz2
+gitrepo=https://github.com/clrkwllms/rt-tests.git
function test_build {
- sed -i -e "1d" ./Makefile
- make CC="$CC" LD="$LD" && touch test_suite_ready || build_error "error while building test"
+ cd rt-tests/
+ make CC="$CC" LD="$LD" NUMA=0 pi_stress && touch test_suite_ready || build_error "error while building test"
}
function test_deploy {
- put ./pi_stress $BOARD_TESTDIR/fuego.$TESTDIR/
+ put rt-tests/pi_stress $BOARD_TESTDIR/fuego.$TESTDIR/
}
function test_run {
- assert_define FUNCTIONAL_PI_TESTS_INVERSIONS
- assert_define FUNCTIONAL_PI_TESTS_GROUPS
- assert_define FUNCTIONAL_PI_TESTS_TIMEOUT
-
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./pi_stress --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS & sleep $FUNCTIONAL_PI_TESTS_TIMEOUT; killall -9 pi_stress; true"
+ assert_define FUNCTIONAL_PI_TESTS_INVERSIONS
+ assert_define FUNCTIONAL_PI_TESTS_GROUPS
+ assert_define FUNCTIONAL_PI_TESTS_DURATION
+
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./pi_stress --duration=$FUNCTIONAL_PI_TESTS_DURATION --groups=$FUNCTIONAL_PI_TESTS_GROUPS --inversions=$FUNCTIONAL_PI_TESTS_INVERSIONS"
}
+function test_processing {
+ local RETURN_VALUE=0
+
+ log_compare "$TESTDIR" "0" "^ERROR:.*" "n"
+ if [ $? -ne 0 ]; then RETURN_VALUE=1; fi
+ log_compare "$TESTDIR" "0" "is deadlocked!" "n"
+ if [ $? -ne 0 ]; then RETURN_VALUE=1; fi
+
+ return $RETURN_VALUE
+}
diff --git a/engine/tests/Functional.pi_tests/pi_tests.tar.bz2 b/engine/tests/Functional.pi_tests/pi_tests.tar.bz2
deleted file mode 100644
index 93a40e568c8c0665e6e96d11327d6b95d521f032..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 9950
zcmV<4CL!5ET4*^jL0KkKS<#0oiU4VY|J44l06>5L|NsB*|Nj5~|Nj6G00961qzGU)
zOMn4al9o5yd+zz>^dBR;vvuzGJ8CJnSg7aS?|I41ZQI~J`V8M>`@VJOy>@3@Ciiy^
zdY-d)w)5Vu!JwchXg4~}@2yz1+G34qWqLPLa|yTJ%e}X3R?()KKJ4WvQr2(2?>)Np
z>Q{}nn#*lu7Go!xK-X#;a5k5H+74}sGPDUI6F?BtM9Dmp)Y(+_B{M1dXqrzb+KmH4
zO&*{O)G;&|f<z!h5l_@6B6@8|)5svx)MV2LHi!TK(<Xob2~R0hD9{1=plHZs00000
z0000000>e<B=ixZRXyrxr>BA^l-Vij9;N`AGBGp&$N)V?fuM;Z0RTd2gem1s>Y5Gd
zBh=og+J>4QQ`BNHGywG(0iXzyAb<jBCaC>W+G#YxPePxnJfqae)6{9|dXG>54FT#j
z2h4rH9gKXQ&HV`DInp+OhqaOjSO6^^5}r-riVGKtx)R9@1>cDAV`pjD?(8d}bKsED
zV*o}f<^XF90~u9diVBPs4xvCQYKBjiM!|A{X##>IXd#h+l%@%(f`ynuAR0!3Vum7s
zq9sO>P=%@*5Sa)e2!;JPW{VvdnIkk($iCR%{oFQ?f@p#w0wjnABGdSP75F~Mz<5V1
z04V}90l=WBqLQkbiHSgDD5!}Dnvoz$8YWdeQW#AY6jMc2LsV5!K%@~NRUlHqK@Bnh
z%RtZt0uUsH1VXV1LQOF-F(i{B5Cj82u#f{D4_Ewane$CQ@<?_X!;EDPk@puq8j&W^
zsU(>!5hSGna@YKoxq*xtZDt7!w2{gx^BgT&%#Fu{isM#U`SHNiDe26+8+S0}-lkkk
z5!w8rs0<0DgxH3!@wrJ9y%4>cVC4{T3C9ZJ4)ZHogry}O^w_`kZw(;p1iAk7pI-Ei
z5M(fH6~BK%!ES2)Du`oocV<o^Zv<EOo~KFtR#(L#0VT`LG6tc~3t8R6Wu;8a5Z#ou
zua-$@gn&o{AI;XgqBqk?VcVS_o*3fNbT@@9HLm1K4Ugd%WZp{!4R<CH!IWv>7|xKX
ztDJ4t=(kkK(br?X^a15_M@e08g)#$HgP{XRZ37tSChU(WNV$;1krqHUfQ2Pe6s=QB
z6#*m@1u<<HOw^R5RaHSlJrLnX555@an1U*zsif%4eY_p6cFxQngtU65F(`*F9ld`(
z-iB_Oj`YIRLu4I_XMaZugVWA}#vxFVGmjVrjau?I{GAR3xhB7@h$fWh6m>(AhYMZQ
zSePqS1GH7#Q<qgT;h+c@6A=uRUIWe9d(CqX)7_5hqb!S@b4cUJsdaE5Tk)52DK&iM
zBuI(M){9cm*hR{X9Y=%!Zw@9WiI*&=72YgbhT6@X4T;Q+tTiNMqNXC9q^r<cCt2H{
zi_PlXb%wG1$@1K$<vvu`Uz-fwTwXp%8L>zM)(5H&<i@YNrKa2LUUK~-zRmx~?a5=h
z?5A3T)@a*_5bxcF*xP&|XD}OG_N3g&35#q=C1FaY9<#5e<7OiaW?*DM&XJWfFu`o1
za*I!KEX^e;LohQfr<}+_Nl?6}nn)KBNCWCCB5*SOoP&rFDvQ{}AGtUPtUp#B*ifZH
zSHp|<;9WvYBGS^7zZsbX3Q<J}{>jBWYvO&*>i-$O5}QLXhmuV<Au%!oAV9%6W&~5A
zAuy3L0Kp-RU|~1V^d3N0(E0z%mstYeb4&?d<SDcBSq#HMeaU~LFI~NNPn`M_@P3WH
zvnk?ya%<@(24QUxH?>&64`fOpsee<awbFy!uZmNf2z9kpR76EH1fR>#hfY!wL@<!a
z6-5O?NkLBCF<nDt3D*h!=^o#o1B=1(c0l21H`v0Ue%ZHKCsDk66`i){hTR*WB_XZk
z{tP8ACVx>*r7=V(nR@lXB1~Eg2`>U*5N3xg8nECzICAPpG2+Fv=I@P=+z;utv$)}q
z?YSnF3qsZQ9tDFFLE|-|?%14Gmalbk^-Bq?dBg;nLKtlRmQu3vTt$S@N+=wG2hA1M
zRc1ai^+PY2FusUpyHKe*Yr|}=Y|=;B-_kFGW4I5lL;1dh?tjhp{ll%OEQbu{MW&?P
z1PJUxM0YAzv3n6jmsj9@qeKFVFXFj~ss^P!juht}m^!DhOoPwW7$#{@Mkc;~OVUB;
zTe7<hnJwU69NODkB^3iI4DKUUj2JMaz?GBa)O=>FOw6cFHZW`exui$k3z1*sF19qK
zd6EkQv3pZooorgp9|&ZZ&w#V7L_&mp^EMC+{U>;u(vXo--mpAmsu(?E7cvwEGUiAU
zhuY>e;X%b84^PJ7i=mg^4_Q!dRt;&WQ$rg(4?Z`v#}!Qw2Z*Jhp?@hvk~+r7g6mn1
zd6lFJYjTFgwz13(lOz<*pp7rUvRY13iP@Gk^0mJR!OtuvNkSbOS}$~Yq6er<jFXO4
zDE3tY{H;r=R23;{D~DsAWc;edIXYPkK9g7U$j@rjxB{r|&~t@?C|DE>nO9%jA&E0F
zL7QpZMA9+XR$8|#w1|RGOpC|{RqZ%5b*Fhvok4$53M)fy1+n2ck-pLh$>*e+YZI9V
zafYRGTmGeGgBW6nU4biAMQ;k|k4+GdHN+w}6_U9zw(}UEw+fo63iAL|s|ss0mp9qi
zw>=HEe49T}XNIrLam4!Y+oz=OX}#D}F-16uzSbx>T<4PvxG-`;Hz@)cn>OrMHG~vi
zlQdkxsYux00Iz{+L(TK8u&ir;5NW%Iz8yQau(tz*cW$lwZ`+MX@j02oDQfJ-8=czj
z&pOeyFtQsqEYr%a_Nj_RGtR~XCmE2TiCI39I`obAbIb<m<Oc_}#UTf+6w%4l(RNKp
z&Lbfdu3GQa=VUk>92=&GZpQE->dU;$hPBvR7jb>?HyApPbEVw++_hoRm;tt`c}uCA
zi5>ZeOepWURXK9y%c}_WS#jzEs;9HX-0Z_?q=|P)%W;%@TuNaH++;kP7yBr?sUQ}r
z2-tHr>m}$mr%D&8$hPX|9-Q5xaXtF(Sd;BAeOVa7(9G(lf_ld&3KPh|9wpbZYO-#_
zy*cX9X5!Fa@l03LGNx|u_c^)F57{ir)!rR&CVDt5OlMHK6|NPp&N|3AXE@y8oq4$O
zbLy!%Mw%pP4y{pjH8c#4Cvmwr8<vP+%h+i0SA-A_<pwHIgz&N>uVfIiZn!8mH@TfF
zYPH*wqz3~C34xDe;pZW-yWSej{tpm0i5a$P2<FFmammZ|lG3#0i@=qHAT+{g(13xY
zh72EdUyKNfS&FPO*)o|AOBTI3D+qDPIPR47cy1=M)-4N>8gp=Wp*ft3kB>U4s;bn}
zDuxD-n;5Wfa`wCF_$WIn@>LI<m@35VI}UyqRNtyfq^!E-K{E}C39i&+VZT%fPcf2&
zFMD&3Y{(C)VT=b`q(RhHCW<4ifUYsSJKDl>v4q9M)(R|(x3Pn!IY!4r84W_eYf99g
zLve&H`IKnCQOO3D%Q6?i0)e9p2pS3wvdM^{Y5nt?VBM^F@l6OO!HG;xj4tlv?mc^<
zPO&7e`j|jshtwJ-lP~FG9;Y>7>zQckJ-l}3)yl4xv0f>QYo%?@s2Ec*Ck1&>K+$r9
zmGkUv94WVo8&OYb<0K^8LY;Nz%WqW1{0~V(nQuXk^Sq7AG0zv9<k7gw&QF(G4zehw
zo5uH=)%`=oAKPjGBy5|D`w<zpdSN5Ac~ermWwfgs%<h>ehruSC$}p%9(R`3Y&|pwH
zmGbv{I?ngv_+5RYkUhLQO)*VG#UOORV3P$x^uOcw^dr`7@b<1SlQTqtNKlnQLaac5
zO$ky`0Rj1c_5n|wG^KhY*j{-bxi2MQ55~Z0fnLFYgkX`sY!!uF)M^G)p$e)9qE;rH
z70*z}!ptTrDiHop=;!;qv#aenoZsKU><*0F+kz7Co&jAF8ryCW$B!;kqe{;mkje1N
zB^n&!9Bm-ZE#p*PG{M=0U7BfPs;Jck6m{9PMNn0AU8<I<scEV;Ohi$gn1ysnnU$6$
zRAyyW7insxrZq(c8QXOMRA#|Jd1{7lE7TG~L06+NikYbFqB|o+dO}R1KDqK{mtdX}
z8f%TvQBAc|4Tkl{EZnmhdm&T76pbFt8wasczEK%~w6OUUap^0M98+j^y!Aw<A{3NP
zT}w7DCAoH0)?Pb~XKAe%Xu@|3##2<u(1zidIxy_2^7Lr~>@`Kz+F{Wh40$<!H@1tL
zFizvB)FA=}fgYhWj;$G(-CLm%0L4R#NyMri%yzbhg$d}>px7s6Q6pofvlEsm8kO}I
zi9M(D*linr#ao&6{WvYz@%cJ98Sk>%Z+)Df*F*`9Qy?GnXr4Wfuf@TCHDTyko~LX4
z9Q!^cyLMoe{r$s|Td2@We3VMnZ&Ot|W}!TfPK2`>5y@zjfNPO6a_>!%Iw@9zG#9|I
zzme$Hg^)MZjpTQhpon?m(2<3o>7v49+uZ@YmvfroR5}d$&fSJ&!OofqmW;%;t=W#s
zqR3w7JzCHn6xm?M)OGc;ZP^v$J;u)Kn%jGFBSmH#w}|j3pP$3%J?DPd8XtA8yV!#b
z938Y;^g}TYeNf5E6*b0YlB#AwBNV9`m~KYfDr%yeh=CF#y0%=F{cc+_&j=>l9gp3w
zE8{Ix8R>C&@+2fAdobmzzn=bG17bOLBw*em1l*~2tSg|2e61#3ish!9pDS1v_<?sO
z4lNz)Xr54XE@;_Zd_1mc_xCew9A6=X=a-7CGmA9E4Sb$8%a1N$b1x`6gsae5u-jEd
zQ3$|`6SdEW3-RxxI(zv^B%OEZ*{t(<q{oppl`Ab`aW80Z-f(Pf@KdFj-$q!F=C8;<
ziT0rcLo-M;OaelmBqBCQA2daCJqY&+x!vLMZhFj(8%~<3rj$MuE)}h1(OhW^g-{g)
zjpq|*6tsgYQ#&_B-><=b^8*3Lc2zAIz$!~>UqRUvFJ}c=Gu$6r9w297)7U}S+?(Q_
z3;{=dIUqL4!QKVI^st&iwTwbWK+XO)QcjL~)hT<(Gp`vlslpf(5l+^we4QmHQ-J6!
z>>sqTU`;FroGZwc(2yaWg;RMHkeMY1J%{GuqyyN5ZVrP`of<ZTlbQ2j+9$tKEmKsd
z)zE1qfgF~odqSF){i;08#GU*z^*1v<f1~AdJ4}lYyg68vsgM*b1gGSVp4~_4>wTEJ
z;{p(NcFk?Dd)~@AG<Q6h{+8{WHB;^r;|{Sf-Qr-TL_79SPou&>kLr8>c6PrTnMD>3
z8pjN^RLPN9QIVQl9Ai_dsHiCjilgbwA}We`Z+1Thd)8e>>Gs3CL*ddmO5^s-p!@Op
zEe^%@u{a75`hR2ozH{lr`H+za9`)W>bONvT?Y*&C6_tnuEiB`e7@$Z4oE1KDJ$dGQ
z8^1=TKYH#5Ws=Fe^%{Z^2Yg}6eV-v<j9z(_c!+2*4V?HaaQ|w<&p>gHIrvGL1EeY-
zW`zdnPTJ9H*Trz-B|7bvxeTa_k0E=j+4yl~nYKe3m#3Q|!zHJfsLk~n&1Tt2ymhF|
zZ50>{UaU;tCaDh`KAqeDdID#CyH6dxpS!h+5|sy{#pODcOY+e~Xlwh7#GenlKTt^?
zN%$VOEVFZBnQ}}(Skzpc5WVsySn5Ndk@wOxif<wn@pq$S+YAFH?a1kk4g^CAXjT?!
zvKAx4$XFf4(8lPPhf-AQ&7e38KsCV1DJAPYBg_*d@wiFjp6l#DJKMqoxd$Y8a^<Xz
zrl3oZ)kR`N1ncRYV&cjpfW4U4M)p3NflG7qTZC5Hm~>#EoFvaBZLkViVMQ!X<%9*Q
z9JD+D>vIm0C>DqD!KpOT(tO%{a52MNvzZJuzXv<#8`XP~@NPEw+LWQL*^fMRv+2u+
zCs51g5v4k+zsS72UwF@lmA=lPr%c|Xm2x#au)xH?<o8ajaKgoz0n);mN{FYXCvNLm
z0O`*5!rd$yq1^)(J83Ii0|-0}2O`Sv4lBmTje_#`qN*|kD88l#DdNE@&vrCatL`=b
zbJ6)z&I$99KwS_%;tTo`QI5nqK|e0oDYdeLfrQZpsyz@mL=Yhm{=ciH+Met|zvFoj
z7RXc#FM0NbTZ!;FE-&yMq`~xC?!L4~^ASNj$MFCTXns$X?NEOZeWyL{kI%X9e*%MM
zzB(cDbluHC;(ivaJUBdm9g8o031s>l9De<i>O{ZGiYMT~F825U8aW4e@5(4ZpED!R
z7S8};et7efx#pnE7<0hFi-Dh*$U5MNT~nl5LJntUy+@-3K<^@gTC4-3s1Z^uAIi{U
zjoUaVG>7O8FZMoZ)j`WqcLz2Icc#F48bh(eR3*JfN4$zDitu0ug`UH3@e#9x1n}F(
z1Ur}mf;iGW;{wQXFQa540mab^AADlj1PoEz)E+zbC_SsDIkr%I;yn=VRxaovZjV3#
z$sy^`_-2PC!EiP}HO?57WGExrF@XqAYq{C&d%)0oq1p*{&SKX5^Hd2H2s*bPMAzu;
z@J;Q^T!luC%=mt90j1#P06w;q8z^}5HYd|}j00jCj9o%AyMf#$qB|I$k`?OAo)D^|
z9y+)KcSknMfaHypS7KVxx*8Wq`*~eG3Q<VNtt(yO#^b-nx_9yGtE=KKr4A3P%hDdF
zn!8Zmy~Z5f$pRtyovjU`iP})3{Acl71E>ZJ2HsZYL6Kd&LCMAOci1B=z~~xXju90)
z3IW+>>JBOmgi1ppdbAe1ld;G*u+UM+W4e_B{XKW#;zkkftKkB$OHvpJLuXfI)6+zd
zfYjvNz~)(#nH98IX+h;o;l>IW%m)bYavE>pgTV*9B4CNQh|YUp;8x|eMnc0I!L(u6
zM@<fz>>8nM&W+UrQAP}Rx#k_WzAjlV_Ri;yMVbvcKpBEK09_NW;|FtqsOAI&@teDV
z2S;an2J7U7z{Usbot+M-Z*w$x$6;)bs>{?KL$T}~xH*LPKVbnVf_Z$!k9U6Wf9F1*
zf%$Yv0G03kuW^Op-Ho<CW)<!p)vGbo-?!z7d;>aWRTjFUfsA`zb#@bO92&WHH*0K~
zm9ubUqQ=NSd5#cs-w3t`a7RFzKdi&E!@kd`bm6K6@J9T84t=}*Q_Ji9Z%$@r-ean$
zh@y(BimMOfKMjwWLHX?p5%Hcj^&zzR!|L@RcjNXXLl@lp`0?58C9S%u)m3uz*|B#5
zu7+@Ne^Av09swsn%|WrAH5#QpBf)cW7ckd{xI^H3=#r8E^(=%)vk3Z6S%;jBG}A=e
zcHP}~Rd+>8S9dhiP1dw)TGjx8h<Sn`_|23)I<3Uer{n^G#48|u$)r+3M9lWNE-QfC
zttj11AER1q%QR-A4Nj9zH`Y4B2}9Hlg1<?3^4Jvn3}D5C0sJ6y27%|TQzjEtRMk~g
zQbl7`RO60KRI0`#LeMI<L`6}KEmcuU36@!8608kXM5Nq2L!zmsE5T5YK_Li7o&~rT
zUMOyK3=$Ga4)YxjIing3FkcC~M-^DFL>GSys#Qv<QdWyV=qNuw$Lal%>_Ff=mJwkV
zjbXZIe>t<a87D;%8gRv5?=|`Tm}bHVeBH!stYApbSoHsDEt&&a=aL9LKp<#Pt0x1)
zDwIwLQBgR**=q(BOkp3S!BN%nZxqk7kQ~IgQZxZW^@ti_PRYGMAQ1uBeHSu$$-qL$
zb7C;TOpMNy<O7I1!VpNgj!KgC3VhH;WYi=B(1~Zw_>OLY6SP7&q<U<6CYJp|0_ruy
z0Nl3&h&<6bCPaCFhGwE-226Odc1JBX8e$SMR`;FOUY5vGj8=j?9b9(dWHAKxx&$MA
zH=MyZ5Re$eBOymH)`ArJlt4@j!LX+4fWA=bd_!}hiLXbs_FD}^L5w36h2VxF{bTEi
zz#E<2)Q*LE(9pKQ0%O>8L@XF0#rcq_&KE2NMnbEPu?o~S8pICm7jlMW?B~NoV;5BR
zID?W0aYkvX1hBJ_h@faOavFeV0E7{7L+IsOA<9qOb1e&I=5r&g0Oa^xI}yT16g<?h
zVemJKD5i+q@M_Hqt=S24T6`50NJvOdiiXp}dRtQB@K8S{Sjzz=6w~1|14v4RisSJZ
z>DYr7Hq$I%$q)5j6-Df+7F47LJNJ_$v>3D(u%rh}hWUZ1qwo`nJ0T%9>f#&8tY3Y{
zcV}TW8Ab%y6hl$Ch7$$=B&;BWga*Vbf<Orhv11g8gW_Fon?MbSbL_5Ud0iHca<7^e
z52#dw<zU=40=J~7_&e34!NI|R*-JM8>)EKt^P@J$2zH8Q1xHj36jRV%%H?%OyU)72
z&NnFD(FosSZF^k;?I8>xlsLv7tP5nTOOu0&M<mh)0}`8CSP`i?tOne7Hb1E|a#~hc
zJU)u>Y|R_084DOtw53WV;)oHlYD8T1aIKKaz$#!HiHl0@+;+Id09e#bnsH&d$=cbv
z>{&dWjKeb^H#-EZmOfg%I5)$2gQ=Uq#eF-;e{&1ngkZrkA%S+r4h2AjZ-JYQ%S1MU
zR9r7g@KQohIEbk80EmKQh(J=23ml~!Ro3RpaJs>DsV?<%Y8y}ojwA%k4fI-4iMq)H
zOk81bx~%O72a2nTl2}MCiD4#0CQZ$U0nh=9xj%Kx4<8JI7BmYm5xx#V=uU}{{IfFe
ztq*tIk`ag?sVw!I_$%yQesX17Y9hwO!x_~FLRKr0>Op`zHf9}S6eh${k2%_|#?IBm
z1l#8AI5{3+;4Q}+@M!ds%x?_QDTq`Ch{CBA4<sv+xE;EM(Mu{sIO;wD{*R#Uk5d4F
zJ@INVi#kT&0dgwPb5w(mvzg*(keFDcU>^to!Q1Zc^dWRpbIqd*E3`>P%Q`VUN@(v4
z2153fBXI-M1HuM}X$NZ&*g-qUr9le}h*U}5<ebnQJPm^af+UEdBe)buSXZdo@Dor&
zI0~10;PeQEmOp>LW9)ssme|0$K+J+Dav<%_oy7atVN(Mdeq)G-Al(d0r1v!eMHEnX
z2R(z_B5&8bz&o%J#eOC|e##)D2TUIE*dk$t?3d2F<rT82#sGw_wUB^@o}i`Z66qb#
zF*pg6tvr*%$2e4@64I!4z=lHPcNmLAEwGkCDN)=pv%dC1$YBP-qFoI&$Y(Cn?*uk^
z7A(gTQxQ{6Z5N6M8g8Uc5DbHbdz;&}zUoRq<XT~1>tw8HHM5pgGPRyth31P7k@G!=
zfeI;*=#3#vdx+qxY6QB7d@ZlPvV*8<17L6m(EINJ-5r27B_b51iDCpWHDMT_6d84+
z0x5~usgP_~AK^VmcedrNYjN+VdqL?fWfLc@wE*OC;}!+ja0nuRSmc%uPj(_jBxpJX
zm9p<;T^J1U{t+k#!(kWNC%lX-i%4v4f_PvL>6i){p_{b`og$B0s$OS{uz<FF&d<N%
zgN%g@6csSoga!f_QiTeV5+7xtKDqQ5ynxq;KYA#IC6OO-lXYa9(1nzK2gAt-pB9`j
zdB-J>1{0x01QST2eU&+Y9XxT*QBy-Fg}FtXVbweoQDl)-T*WF?4t2DELJ0^d2!(=^
zhgqw*gYCg7>U}Lfec;m&kI4s<1hW;e?b1k+7#WzMix`kh+R2HDVA?o0Ljm5UJkd{B
zjA;kOUZu>8B9a{lniIJ;GslcIjg;k?77jK<rj0t3Bswst+-+)(MUZKPSJdMgeQie~
z$)S@$xP&LKk{(78@pUjzP%%?bP)w0Z5hVyjr72>92eddIVI0%KGDIN`<EWwB#fV2?
z`5!gZ6jMaamk`hg)pi{LpxQzrm|_T9L5P@0CrF2w*G`;{8$NP+(s12T-Qw~?9}0As
zo1}nD0SPFPAqfBxAh8NFD-g$UIwgy$7%KoZ+?KmVMnR$>l%n(t6D3#^D4Pa4HauzH
z@o__AnaJa@$l-KRD*^JEg%V7XhKwnuP;zvp!~!6;58~|13;ov;76WHQGYv0X0P+t#
zeNj$xLN72jSx3-uaWxDBUFK?rV|TLd2yS>N5%(8+jZ+qv+;yHcMvkmpBZd#~Lg*zH
zp_bpR?|B^^i)%zh+GxjODY{wox(z;Wo|-TV1cn6xt<X?DvM6)+)8x>5%UJ=`_+i$^
zR7QjO2;y@LbQmLAh()#pJqIuWxYUj}E@&i@(hdM{q=HEiBN9Zd#CD&UqI>?d@7VZr
zyw)H@1vXX;MhO8SAV4C95GXbmQP|zKc#h2nd20wAuYHl!6E|4NW{@8MHXFT%G{k7L
zU?_1cU=$umn4`G}taUx?gJP(mNeR#_2YU1#4_(y9<{-mTR%c404m@B%1&a!rsG>wm
zDh7x~8D!G7iIXD}D|2I7f4~4r5l`ANBGdZApdL(+ieR;LcNGz!4S+3+<R^$=s8%5J
zhf?fHYye@4u`3vum;tGc0cAC8h{6O(Aq6=+&A?s74$<uk97qLe7GVLUSf(Nh6z#V7
z6%xU@V!}RX#8Z0_S9wS|q(>d$yT$ZbwZ+Jfyyobsp#&a4+Q4g=n`yBCp=MQaz+O3s
zrm_GpEK9lA+d(b^yfIfOpwSf0>*Km_Pn7RfAml|yd=K3SzQ~x$T#SVS6v$vejWU{{
zX;R0KXh47olj81pBte2s57fHd2<M?sqvRC}oc<?cbUsA`pyZo@0oaFB6-reV5Kj5W
zsjr~fq%OpeDaC$D6wu&}(*zK=+LssJj<DQ1WAJLc0*xdop*`NME~i0(`FR#WH6B$o
znsOmJCvsDE9i+rn=61H;fPv{64FS*)r@6r5yiF7bn52Hz2a9K@`l1_$tf#g6ok6rd
z3$YHsG%6=(8L{Tr%{)qkfeVLr@qc^V^DLm51|=SoOnHn9XSoQ8aE0*qmH@sbFR6hk
zOYJgmqugQ5^SOv)R9l)hH_Zh$i<I$7E^W>cI)mCIFeiXz7l}`n22Y;gbPSJc6X{t{
z8~S1Esy=Ba#oe17-7uOqjhbUSNoL6&JkSjuR&~WTiR}Gt!V!*v)pUSjyuc+wLQ+5=
zARrvd3*}32g4#Rr;plGb5H>@BL^3d-r03l3uOaX`^@(1j)KNtk0JegBOQp(aEHcIm
zWU@mrbRTGlS==0l97oJMd7SAkNcazTg^3VNST6W(4w466Lrw(y2~5$31{eia3yxsU
zHi*>FOvFfS=;rKzJXd1?-$9BPYcLagVX&0J4H6iPI%PI=xX?2+#Ve^Yp(2$bW?+Q}
zt&rF~YY4<65(Dosee2ncu%&m6JK`HVj0(AT-iUx}1oJ2wlsbTYu|nyifc@>A>(=Qx
zoXi%EoRp%)x>r}CgSy?aNo!&h{6wg_RUrr3CEx%Wz9ZrkoKVP3AviWN<QX(oHPZC>
z!@Wc~BK8Oid~YLgL(3tv$rp(Y3Oy*oBJ3gVW66va0I`EZjNEsZEMkPvK~2kS!F!Sc
z$o&QgqF8;3iAl$<W7BYKq!1TKDD;p}v;w_eosFOhX<870WGlkPF@Pu3Q@{lY-p5Zs
zVPOq3vo_by@^!@(s~Pns`NcZ1%o1NXxhr}|6yImNL7ImVvV{#WTPK(Y=^9ho)DA+H
z3a&I*$3(H7WN5KQ9Wf$(!sAZO9H$18jRoNZ@-S;_s4)h6=1dzc*03VPLB!VseJc`U
ziBWSfh*i#9Xa&$3hJ=%jIFt%h6on-UMnuM&Q)Dr6HR%e#@-LP~8}&yzZ>VV!m;@kY
z3SvT&9#*ubn*u@vP6jc^EWu36AiTlcdpv`??gs-hOFKVdqpSeLNZn6lC_}Sx(593-
z7iGHkmMmSRy9)#1YTjnkb@FUozD2Mihdp`{=Yrr7<?Xc)HbVeR2@udaie@&A>^ya1
zY_5*qm&5?>H^+&<fNO%rT#JDY$K@%&=m&M8#}aLZmyy~4HUzSuPYT1Kb6`a8Hz^_g
zKbQZ%SJV2qf^?G!0CRqSd31Rs+B{Z69l3{s(qcp|Jq`j9IHBA7U6M!=7y<>*lo>&u
z`Y57`D1uT$&W0cu$Yz|>QK-Ubp)`V+g8k@PLZN^TZ^GlVgN6`v^{ycFgh{}7I(R&y
ze7P7p3p6@(>dr`C2KbjTD9|%`_?<>T*66<mU`^wT)unQ@eIc2FZnB)RNaVODi=CVj
z?li~LU9*q`Th~a9T%~pfYk3qZ2wRwiA;mQpYesOZ25ykmEzTtdv?2>G3o?;SSeCSc
z!laUlb*xHuiVO)#x{;~2xbKCsu!_OQa_MfFSX8r;^iVKJk+jg1qR;?Ix-OavAn~d<
zfwuIyRHW31D1|9#n;!5AK#}gY-R)Wmf(jkgsIZ);3kvOD5eOlJMa@Fck`cOzbO;WB
z<RO6Z@_J})BA{Spts4mIZ(vChh7e#h#0o+QP(ZnR*pAfmgq?hh%s2)N3t1Gw(Tx;<
zz|F>AoIsvl`%S3tCv5phnK`Nfr3c<@170dCMMjn+4~i7y1~54x0C)i<a5SnInqcr0
zd6NN}Z3RJ4oZpwGH#rVWTR8}3tszhbkX;ZrFi@w^LM2R2(`o5L7q2^&*}?7-2SH{f
z+!b^?oF2n*7}61tGyqQbM;#dm9B_S{DD=ZO7l3dPU%F}_Qy8y0Xfmhm#S@Mk4Ctoh
zH7Mc`z<Sfj*FKK~ZQ~!Gp92IK0EQ{0kPgTqCQKuOpf6I#fSCY>&l(U{PEPyK&hW?B
zSp+*%;DtH$0GI$DkMH#v#6p<^yK{hS2&Hii;O!5pLIL6luoJc7^mPJ9)c7b+@K?*l
zqmK|blc6kL+$_L?bgaZ72(6WD_BI4Fg5Jj}5L4CSB?2pv6cN*_<+^bpatzqeS|9!P
z4#ezzl%8m$X|gY^Pz$Bk*d1tS+<bMkN~tM2g1q9m8;8K}ZiYrIIXs(tV0%2u)C@4Q
zh0p^t>Ar7Eo#5t)1UHZZkb#6Dz8H#Z5+EjT;1GZiSBw;Vs=(~z@)FOafy>uUx$s~n
z*<vwwQXVgfNN*mph(?YtG6~EWG>`%TKU6^YBAN|52u2GHEI>s<8z8bK1d86Tkn<iv
zJy5$1GmH}J05t$~Fzalm;(Qu$Ll+>jiJJ@vtq=kY#Um^W0GY>d(a`J|MIeD2w~d6)
zh|p;B3cKL>ia5XxC{cdrp-*^MQ92YbT><pVwW~kvod$p?MczO$BNV{{6u=z7%8ML5
cA+basqrV+)UoV@Ium6j=BAh5lXv3970Ah#)B>(^b
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 10/23] expat: fix the expat test
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (7 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 09/23] git: introduce a generic git mechanism and use pi_tests as a poc Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 11/23] crashme: fix indentation Daniel Sangorrin
` (12 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.expat/fuego_test.sh | 8 ++++----
engine/tests/Functional.expat/spec | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/engine/tests/Functional.expat/fuego_test.sh b/engine/tests/Functional.expat/fuego_test.sh
index 7b41cbf..5a0f4f5 100755
--- a/engine/tests/Functional.expat/fuego_test.sh
+++ b/engine/tests/Functional.expat/fuego_test.sh
@@ -34,11 +34,11 @@ function test_run {
}
function test_processing {
- assert_define EXPAT_SUBTEST_COUNT_POS
- assert_define EXPAT_SUBTEST_COUNT_NEG
+ assert_define FUNCTIONAL_EXPAT_SUBTEST_COUNT_POS
+ assert_define FUNCTIONAL_EXPAT_SUBTEST_COUNT_NEG
- log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_POS "100%: Checks: 48|passed" "p"
- log_compare "$TESTDIR" $EXPAT_SUBTEST_COUNT_NEG "failed" "n"
+ log_compare "$TESTDIR" $FUNCTIONAL_EXPAT_SUBTEST_COUNT_POS "^.*\.xml passed\.$" "p"
+ log_compare "$TESTDIR" $FUNCTIONAL_EXPAT_SUBTEST_COUNT_NEG "^.*\.xml failed\.$" "n"
}
diff --git a/engine/tests/Functional.expat/spec b/engine/tests/Functional.expat/spec
index 2edd1b6..09a7090 100644
--- a/engine/tests/Functional.expat/spec
+++ b/engine/tests/Functional.expat/spec
@@ -3,7 +3,9 @@
"specs":
[
{
- "name":"default"
+ "name":"default",
+ "subtest_count_pos" : "1768",
+ "subtest_count_neg" : "41"
}
]
}
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 11/23] crashme: fix indentation
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (8 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 10/23] expat: fix the expat test Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 12/23] bzip2: fix trailing spaces and indentation Daniel Sangorrin
` (11 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.crashme/fuego_test.sh | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/engine/tests/Functional.crashme/fuego_test.sh b/engine/tests/Functional.crashme/fuego_test.sh
index 58eac9f..f0aea34 100755
--- a/engine/tests/Functional.crashme/fuego_test.sh
+++ b/engine/tests/Functional.crashme/fuego_test.sh
@@ -6,21 +6,19 @@ function test_build {
}
function test_deploy {
- put crashme $BOARD_TESTDIR/fuego.$TESTDIR/
+ put crashme $BOARD_TESTDIR/fuego.$TESTDIR/
}
-function test_run {
- assert_define FUNCTIONAL_CRASHME_NBYTES
- assert_define FUNCTIONAL_CRASHME_INC
- assert_define FUNCTIONAL_CRASHME_SRAND
- assert_define FUNCTIONAL_CRASHME_NTRYS
- assert_define FUNCTIONAL_CRASHME_NSUB
+function test_run {
+ assert_define FUNCTIONAL_CRASHME_NBYTES
+ assert_define FUNCTIONAL_CRASHME_INC
+ assert_define FUNCTIONAL_CRASHME_SRAND
+ assert_define FUNCTIONAL_CRASHME_NTRYS
+ assert_define FUNCTIONAL_CRASHME_NSUB
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./crashme $FUNCTIONAL_CRASHME_NBYTES.$FUNCTIONAL_CRASHME_INC $FUNCTIONAL_CRASHME_SRAND $FUNCTIONAL_CRASHME_NTRYS $FUNCTIONAL_CRASHME_NSUB 2"
+ report "cd $BOARD_TESTDIR/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"
+function test_processing {
+ log_compare "$TESTDIR" "1" "0 ... 3000" "p"
}
-
-
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 12/23] bzip2: fix trailing spaces and indentation
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (9 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 11/23] crashme: fix indentation Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 13/23] bzip2: when using log_compare two times record the return value Daniel Sangorrin
` (10 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Thank god I use the Kate editor ;)
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.bzip2/fuego_test.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/engine/tests/Functional.bzip2/fuego_test.sh b/engine/tests/Functional.bzip2/fuego_test.sh
index f7b5ccc..5ca613a 100755
--- a/engine/tests/Functional.bzip2/fuego_test.sh
+++ b/engine/tests/Functional.bzip2/fuego_test.sh
@@ -24,13 +24,13 @@ function test_build {
if cmp sample2.tst sample2.ref; then echo 'TEST-11 OK'; else echo 'TEST-11 FAILED'; fi;" > run-tests.sh
touch test_suite_ready
}
-
+
function test_deploy {
put {sample*,run-tests.sh} $BOARD_TESTDIR/fuego.$TESTDIR/
}
-
-function test_run {
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
+
+function test_run {
+ report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
}
function test_processing {
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 13/23] bzip2: when using log_compare two times record the return value
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (10 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 12/23] bzip2: fix trailing spaces and indentation Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 14/23] IOzone: remove unneeded definition of bytes Daniel Sangorrin
` (9 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
TODO: check if other places are using log_compare multiple times
and only returning the last value.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.bzip2/fuego_test.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/engine/tests/Functional.bzip2/fuego_test.sh b/engine/tests/Functional.bzip2/fuego_test.sh
index 5ca613a..f5c75c5 100755
--- a/engine/tests/Functional.bzip2/fuego_test.sh
+++ b/engine/tests/Functional.bzip2/fuego_test.sh
@@ -33,9 +33,15 @@ function test_run {
report "cd $BOARD_TESTDIR/fuego.$TESTDIR; sh -v run-tests.sh 2>&1"
}
-function test_processing {
+function test_processing {
+ local RETURN_VALUE=0
+
log_compare "$TESTDIR" "11" "^TEST.*OK" "p"
+ if [ $? -ne 0 ]; then RETURN_VALUE=1; fi
log_compare "$TESTDIR" "0" "^TEST.*FAILED" "n"
+ if [ $? -ne 0 ]; then RETURN_VALUE=1; fi
+
+ return $RETURN_VALUE
}
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 14/23] IOzone: remove unneeded definition of bytes
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (11 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 13/23] bzip2: when using log_compare two times record the return value Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 15/23] bonnie: fix indentation and add fixthis for sleep Daniel Sangorrin
` (8 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Benchmark.IOzone/parser.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/engine/tests/Benchmark.IOzone/parser.py b/engine/tests/Benchmark.IOzone/parser.py
index cb44490..a4452b5 100755
--- a/engine/tests/Benchmark.IOzone/parser.py
+++ b/engine/tests/Benchmark.IOzone/parser.py
@@ -15,7 +15,6 @@ lines = cur_file.readlines()
cur_file.close()
tests = ["Writer report", "Re-writer report", "Reader report", "Re-Reader report", "Random read report", "Random write report", "Fwrite report","Re-Fwrite report", "Fread report", "Re-Fread report"]
-bytes = ["64","128","256","512","1024","2048","4096","8192","16384","32768","65536"]
for line in lines:
string = line.lstrip('\"').rstrip('\" \n')
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 15/23] bonnie: fix indentation and add fixthis for sleep
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (12 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 14/23] IOzone: remove unneeded definition of bytes Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 16/23] phases: rework the order of phases Daniel Sangorrin
` (7 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Benchmark.bonnie/fuego_test.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
index a7f7c0d..562088a 100755
--- a/engine/tests/Benchmark.bonnie/fuego_test.sh
+++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
@@ -6,7 +6,7 @@ function test_build {
}
function test_deploy {
- put bonnie++ $BOARD_TESTDIR/fuego.$TESTDIR/
+ put bonnie++ $BOARD_TESTDIR/fuego.$TESTDIR/
}
function test_run {
@@ -24,9 +24,8 @@ function test_run {
report "cd $BOARD_TESTDIR/fuego.$TESTDIR; pwd; ls; ./bonnie\+\+ -d $BENCHMARK_BONNIE_MOUNT_POINT/fuego.$TESTDIR -s $BENCHMARK_BONNIE_SIZE -r $BENCHMARK_BONNIE_RAM"
fi
+ # FIXTHIS: what is this sleep for? a replacement for sync?
sleep 60
hd_test_clean_umount $BENCHMARK_BONNIE_MOUNT_BLOCKDEV $BENCHMARK_BONNIE_MOUNT_POINT
}
-
-
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 16/23] phases: rework the order of phases
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (13 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 15/23] bonnie: fix indentation and add fixthis for sleep Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 17/23] log_compare: add fixthis about a non-used parameter Daniel Sangorrin
` (6 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
post_test now is splitted in two calls:
- fetch_results: taken from processing
- cleanup
processing is moved to the end and should not require
connection to the board (because all result data should
have already fetched during the post_test phase)
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/functions.sh | 50 +++++++++++++++++++++------------------------
engine/scripts/main.sh | 9 ++++----
2 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
index a520d7f..87c7d08 100755
--- a/engine/scripts/functions.sh
+++ b/engine/scripts/functions.sh
@@ -27,7 +27,8 @@
function signal_handler {
# if we got here, something went wrong. Let's clean up and leave
echo "in signal_handler"
- post_test $TESTDIR
+ post_test
+ processing
exit 130
}
@@ -312,13 +313,9 @@ function pre_test {
ov_rootfs_drop_caches
}
-function processing {
- # PWD: /fuego-rw/buildzone/board.spec.testtype.testcase-platform
- local fuego_test_dir=${BOARD_TESTDIR}/fuego.$TESTDIR
+function fetch_results {
local fuego_test_tmp=${FUEGO_TARGET_TMP:-/tmp}/fuego.$TESTDIR
- local RETURN_VALUE=0
- # fetch data for processing
firmware
get $BOARD_TESTDIR/fuego.$TESTDIR/$TESTDIR.log ${LOGDIR}/testlog.txt
@@ -331,6 +328,12 @@ function processing {
fi
get ${fuego_test_tmp}/${NODE_NAME}.${BUILD_ID}.${BUILD_NUMBER}.after ${LOGDIR}/syslog.after.txt
+ call_if_present test_fetch_results
+}
+
+function processing {
+ local RETURN_VALUE=0
+
# process the fetched data
call_if_present test_processing
if [ $? -ne 0 ]; then
@@ -381,6 +384,9 @@ function processing {
ln -s "/var/lib/jenkins/jobs/${JOB_NAME}/builds/${BUILD_NUMBER}/log" $LOGDIR/consolelog.txt
fi
+ # create run.json file
+ make_run_file $RETURN_VALUE
+
return $RETURN_VALUE
}
@@ -448,6 +454,7 @@ function call_if_present {
# create the run.json file
# this routine uses a whole lot of variables...
+# $1: result of the test
function make_run_file {
# calculate duration
end_arr=( $(date +"%s %N") )
@@ -455,7 +462,7 @@ function make_run_file {
FUEGO_END_TIME="${end_arr[0]}${end_arr[1]:0:3}"
DURATION=$(( $FUEGO_END_TIME - $FUEGO_START_TIME ))
- if [ "$FUEGO_RESULT" = "0" ] ; then
+ if [ "$1" = "0" ] ; then
FUEGO_RESULT_STR="SUCCESS"
else
FUEGO_RESULT_STR="FAILURE"
@@ -501,37 +508,26 @@ function post_term_handler {
echo "Received SIGTERM during post_test - ignoring it"
}
-# $1 - $TESTDIR
function post_test {
- # reset the signal handler to avoid an infinite loop
- trap post_term_handler SIGTERM
- trap - SIGHUP SIGALRM SIGINT ERR EXIT
-
- export LOGDIR="$FUEGO_RW/logs/$TESTDIR/${NODE_NAME}.${TESTSPEC}.${BUILD_NUMBER}.${BUILD_ID}"
+ # reset the signal handler to avoid an infinite loop
+ trap post_term_handler SIGTERM
+ trap - SIGHUP SIGALRM SIGINT ERR EXIT
- # source generated prolog.sh file since post_test is called separately
- source $LOGDIR/prolog.sh
- export SSHPASS=$PASSWORD
-
- is_empty $1
+ fetch_results
+ cleanup
+}
+function cleanup {
# call test_cleanup if defined
# this is for killing runaway processes, and clearing out
# anything outside the test directories
call_if_present test_cleanup
# Remove work and log dirs
- [ "$Target_PostCleanup" = "true" ] && target_cleanup $1 || true
-
- # log test completion message.
- echo "Test $1 is finished"
+ [ "$Target_PostCleanup" = "true" ] && target_cleanup $TESTDIR || true
- # Teardown communication link to target if board specifies
- # a function to do so
+ echo "Teardown board link"
[ -n "$TARGET_TEARDOWN_LINK" ] && $TARGET_TEARDOWN_LINK
-
- # create run.json file
- make_run_file
}
function target_cleanup {
diff --git a/engine/scripts/main.sh b/engine/scripts/main.sh
index 41e795e..597049a 100644
--- a/engine/scripts/main.sh
+++ b/engine/scripts/main.sh
@@ -31,6 +31,7 @@ source $FUEGO_CORE/engine/scripts/functions.sh
source $FUEGO_CORE/engine/tests/$TESTDIR/fuego_test.sh
echo "##### doing fuego phase: pre_test ########"
+# FIXTHIS: do not require board connection too early
pre_test
echo "##### doing fuego phase: build ########"
@@ -44,12 +45,12 @@ deploy
echo "##### doing fuego phase: run ########"
call_if_present test_run
+echo "##### doing fuego phase: post_test ########"
+post_test
+
echo "##### doing fuego phase: processing ########"
processing
-export FUEGO_RESULT=$?
-
-echo "##### doing fuego phase: post_test ########"
-post_test $TESTDIR
+FUEGO_RESULT=$?
echo "Fuego: all test phases complete!"
exit $FUEGO_RESULT
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 17/23] log_compare: add fixthis about a non-used parameter
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (14 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 16/23] phases: rework the order of phases Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 18/23] LTP: add separated build and run phases Daniel Sangorrin
` (5 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/functions.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
index 87c7d08..3bc6a1c 100755
--- a/engine/scripts/functions.sh
+++ b/engine/scripts/functions.sh
@@ -568,6 +568,7 @@ function build_cleanup {
rm -rf ${1}-${PLATFORM}
}
+# FIXTHIS: log_compare is not using $1
function log_compare {
# 1 - $TESTDIR, 2 - number of results, 3 - Regex, 4 - n, p (i.e. negative or positive)
local RETURN_VALUE=0
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 18/23] LTP: add separated build and run phases
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (15 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 17/23] log_compare: add fixthis about a non-used parameter Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 19/23] kernel_build: set linux mainstream as default spec Daniel Sangorrin
` (4 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
TODO: provide a more generic way so that other tests can
do the same.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.LTP/fuego_test.sh | 182 +++++++++++++++++++-----------
engine/tests/Functional.LTP/spec | 14 +++
2 files changed, 132 insertions(+), 64 deletions(-)
diff --git a/engine/tests/Functional.LTP/fuego_test.sh b/engine/tests/Functional.LTP/fuego_test.sh
index e9abd0b..db5c4d8 100755
--- a/engine/tests/Functional.LTP/fuego_test.sh
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -42,6 +42,24 @@ func/sched_jitter
"
function test_pre_check {
+ if [ -z ${FUNCTIONAL_LTP_RUNONLY+x} ]; then
+ FUNCTIONAL_LTP_RUNONLY="false"
+ fi
+
+ if [ -z ${FUNCTIONAL_LTP_BUILDONLY+x} ]; then
+ FUNCTIONAL_LTP_BUILDONLY="false"
+ else
+ # buildonly and runonly are mutually exclusive
+ FUNCTIONAL_LTP_RUNONLY="false"
+
+ # we build in docker but use the board's toolchain
+ assert_define FUNCTIONAL_LTP_PLATFORM
+ OLD_PLATFORM=$PLATFORM
+ PLATFORM=$FUNCTIONAL_LTP_PLATFORM
+ source $FUEGO_RO/toolchains/tools.sh
+ PLATFORM=$OLD_PLATFORM
+ fi
+
assert_define SDKROOT
assert_define CC
assert_define AR
@@ -51,84 +69,120 @@ function test_pre_check {
}
function test_build {
- echo "Building LTP"
-
- # patch the Posix test suite script for easier log processing
- patch -p1 -N -s < $TEST_HOME/0001-pts-merge-all-logfile-files-into-a-pts.log-for-proce.patch
-
- # Build the LTP tests
- make autotools
- ./configure CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" LDFLAGS="$LDFLAGS" SYSROOT="${SDKROOT}" \
- --with-open-posix-testsuite --with-realtime-testsuite --without-perl --without-python --target=$PREFIX --host=$PREFIX \
- --prefix=`pwd`/target_bin --build=`uname -m`-unknown-linux-gnu
- make CC="${CC}"
- make install
-
- cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
- cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
-
- touch test_suite_ready
+ if [ "$FUNCTIONAL_LTP_RUNONLY" = "false" ]; then
+ echo "Building LTP"
+ # patch the Posix test suite script for easier log processing
+ patch -p1 -N -s < $TEST_HOME/0001-pts-merge-all-logfile-files-into-a-pts.log-for-proce.patch
+
+ # Build the LTP tests
+ make autotools
+ ./configure CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" LDFLAGS="$LDFLAGS" SYSROOT="${SDKROOT}" \
+ --with-open-posix-testsuite --with-realtime-testsuite --without-perl --without-python --target=$PREFIX --host=$PREFIX \
+ --prefix=`pwd`/target_bin --build=`uname -m`-unknown-linux-gnu
+ make CC="${CC}" > build.log 2>&1 || true
+
+ if [ "$FUNCTIONAL_LTP_BUILDONLY" = "true" ]; then
+ report "cat build.log"
+ fi
+
+ make install
+
+ cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
+ cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
+
+ touch test_suite_ready
+ else
+ echo "Skipping LTP build"
+ fi
}
function test_deploy {
- echo "Deploying LTP"
-
- # the syscalls group occupies by far the largest space so remove it if unneeded
- cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print match($0,"syscalls")}')
- if [ $cp_syscalls -eq 0 ]; then
- echo "Removing syscalls binaries"
- awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
+ if [ "$FUNCTIONAL_LTP_RUNONLY" = "false" ]; then
+ echo "Deploying LTP"
+
+ # the syscalls group occupies by far the largest space so remove it if unneeded
+ cp_syscalls=$(echo $FUNCTIONAL_LTP_TESTS | awk '{print match($0,"syscalls")}')
+ if [ $cp_syscalls -eq 0 ]; then
+ echo "Removing syscalls binaries"
+ awk '/^[^#]/ { print "rm -f target_bin/testcases/bin/" $2 }' target_bin/runtest/syscalls | sh
+ fi
+
+ if [ "$FUNCTIONAL_LTP_BUILDONLY" = "true" ]; then
+ echo "Creating LTP binary tarball"
+ mv target_bin ltp
+ tar zcvpf ltp.tar.gz ltp/
+ mv ltp.tar.gz ${LOGDIR}/
+ else
+ put target_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/
+ fi
+ else
+ echo "Skipping LTP deploy"
fi
-
- put target_bin/* $BOARD_TESTDIR/fuego.$TESTDIR/
}
function test_run {
- echo "Running LTP"
-
- TESTS=""
- PTSTESTS=""
- RTTESTS=""
-
- for a in $FUNCTIONAL_LTP_TESTS; do
- for b in $ALLTESTS; do
- if [ "$a" == "$b" ]; then
- TESTS+="$a "
- fi
+ if [ "$FUNCTIONAL_LTP_BUILDONLY" = "false" ]; then
+ echo "Running LTP"
+
+ TESTS=""
+ PTSTESTS=""
+ RTTESTS=""
+
+ for a in $FUNCTIONAL_LTP_TESTS; do
+ for b in $ALLTESTS; do
+ if [ "$a" == "$b" ]; then
+ TESTS+="$a "
+ fi
+ done
+
+ for b in $ALLPTSTESTS; do
+ if [ "$a" == "$b" ]; then
+ PTSTESTS+="$a "
+ fi
+ done
+
+ for b in $ALLRTTESTS; do
+ if [ "$a" == "$b" ]; then
+ RTTESTS+="$a "
+ fi
+ done
done
- for b in $ALLPTSTESTS; do
- if [ "$a" == "$b" ]; then
- PTSTESTS+="$a "
- fi
- done
+ if [ -z ${FUNCTIONAL_LTP_RUNFOLDER+x} ]; then
+ FUNCTIONAL_LTP_RUNFOLDER="$BOARD_TESTDIR/fuego.$TESTDIR"
+ fi
- for b in $ALLRTTESTS; do
- if [ "$a" == "$b" ]; then
- RTTESTS+="$a "
- fi
- done
- done
+ # FIXTHIS: add blacklist of tests (kill10 etc)
+ # Let some of the tests fail, the information will be in the result xlsx file
+ report "cd $FUNCTIONAL_LTP_RUNFOLDER; TESTS=\"$TESTS\"; PTSTESTS=\"$PTSTESTS\"; RTTESTS=\"$RTTESTS\"; . ./ltp_target_run.sh"
+ else
+ echo "Skipping LTP run"
+ fi
+}
- # Let some of the tests fail, the information will be in the result xlsx file
- set +e
- report "cd $BOARD_TESTDIR/fuego.$TESTDIR; TESTS=\"$TESTS\"; PTSTESTS=\"$PTSTESTS\"; RTTESTS=\"$RTTESTS\"; . ./ltp_target_run.sh"
- set -e
+function test_fetch_results {
+ echo "Fetching LTP results"
+ echo "PWD: $PWD"
+ echo "Triplet: $WORKSPACE/$TRIPLET"
+ get $FUNCTIONAL_LTP_RUNFOLDER/result .
}
function test_processing {
- echo "Processing LTP"
-
- get $BOARD_TESTDIR/fuego.$TESTDIR/result .
- cd result/
- # Restore the path so that python works properly
- export PATH=$ORIG_PATH
- cp $TEST_HOME/ltp_process.py .
- python ltp_process.py
- [ -e results.xlsx ] && cp results.xlsx ${LOGDIR}/results.xlsx
- [ -e rt.log ] && cp rt.log $FUEGO_RW/logs/$JOB_NAME/
- cd ..
- rm -rf result/
+ if [ "$FUNCTIONAL_LTP_BUILDONLY" = "false" ]; then
+ echo "Processing LTP results"
+ cd result/
+ # Restore the path so that python works properly
+ export PATH=$ORIG_PATH
+ cp $TEST_HOME/ltp_process.py .
+ python ltp_process.py
+ [ -e results.xlsx ] && cp results.xlsx ${LOGDIR}/results.xlsx
+ [ -e rt.log ] && cp rt.log $FUEGO_RW/logs/$JOB_NAME/
+ cd ..
+ rm -rf result/
+ else
+ echo "Processing LTP build log"
+ log_compare "$TESTDIR" "1836" "compile PASSED$" "p"
+ fi
}
diff --git a/engine/tests/Functional.LTP/spec b/engine/tests/Functional.LTP/spec
index 1c1a090..dc5b8e9 100644
--- a/engine/tests/Functional.LTP/spec
+++ b/engine/tests/Functional.LTP/spec
@@ -11,6 +11,20 @@
"tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS"
},
{
+ "name": "buildonly",
+ "tests": "ltplite",
+ "buildonly": "true",
+ "platform": "qemu-armv7hf",
+ "extra_success_links": {"tar.gz": "ltp.tar.gz"}
+ },
+ {
+ "name": "runonly",
+ "tests": "ltplite",
+ "runonly": "true",
+ "runfolder": "/opt/ltp",
+ "extra_success_links": {"xlsx": "results.xlsx"}
+ },
+ {
"name": "selectionwithrt",
"tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
},
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 19/23] kernel_build: set linux mainstream as default spec
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (16 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 18/23] LTP: add separated build and run phases Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 20/23] spec format: modify so that the spec name is the key Daniel Sangorrin
` (3 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
This kernel build test is supposed to be generic, so we can
add any git repository, branch, config etc.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/tests/Functional.kernel_build/spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/engine/tests/Functional.kernel_build/spec b/engine/tests/Functional.kernel_build/spec
index 39914a8..6ff8f2e 100644
--- a/engine/tests/Functional.kernel_build/spec
+++ b/engine/tests/Functional.kernel_build/spec
@@ -3,6 +3,10 @@
"specs":
[
{
+ "name": "default",
+ "repo": "https://github.com/torvalds/linux.git"
+ },
+ {
"name": "cip-x86",
"repo": "https://github.com/cip-project/linux-cip.git"
},
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 20/23] spec format: modify so that the spec name is the key
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (17 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 19/23] kernel_build: set linux mainstream as default spec Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 21/23] generic_parser: rewrite the label Daniel Sangorrin
` (2 subsequent siblings)
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
This is more efficient and produces cleaner code than having
to traverse the whole array of specs
TODO: tests that just have a default spec with no parameters
should not require a spec file.
TODO: the "testName" entry is or shoudn't be required
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/ftc | 7 ++--
engine/scripts/ovgen.py | 20 ++++-----
engine/tests/Benchmark.Dhrystone/spec | 21 ++++------
engine/tests/Benchmark.GLMark/spec | 13 +++---
engine/tests/Benchmark.IOzone/spec | 25 ++++-------
engine/tests/Benchmark.Interbench/spec | 25 ++++-------
engine/tests/Benchmark.Java/spec | 13 +++---
engine/tests/Benchmark.OpenSSL/spec | 12 ++----
engine/tests/Benchmark.Stream/spec | 12 ++----
engine/tests/Benchmark.Whetstone/spec | 14 +++----
engine/tests/Benchmark.aim7/spec | 8 ++--
engine/tests/Benchmark.blobsallad/spec | 15 +++----
engine/tests/Benchmark.bonnie/spec | 20 ++++-----
engine/tests/Benchmark.cyclictest/spec | 9 ++--
engine/tests/Benchmark.dbench/spec | 21 ++++------
engine/tests/Benchmark.ebizzy/spec | 10 ++---
engine/tests/Benchmark.ffsb/spec | 21 +++-------
engine/tests/Benchmark.fio/spec | 21 +++-------
engine/tests/Benchmark.fs_mark/spec | 8 ++--
engine/tests/Benchmark.fuego_check_plots/spec | 13 ++----
engine/tests/Benchmark.gtkperf/spec | 15 +++----
engine/tests/Benchmark.hackbench/spec | 10 ++---
engine/tests/Benchmark.himeno/spec | 13 +++---
engine/tests/Benchmark.iperf/spec | 10 ++---
engine/tests/Benchmark.linpack/spec | 13 +++---
engine/tests/Benchmark.lmbench2/spec | 13 +++---
engine/tests/Benchmark.nbench-byte/spec | 8 ++--
engine/tests/Benchmark.nbench_byte/spec | 13 +++---
engine/tests/Benchmark.netperf/spec | 15 +++----
engine/tests/Benchmark.netpipe/spec | 10 ++---
engine/tests/Benchmark.reboot/spec | 13 +++---
engine/tests/Benchmark.signaltest/spec | 12 +++---
engine/tests/Benchmark.sysbench/spec | 8 ++--
engine/tests/Benchmark.tiobench/spec | 17 +++-----
engine/tests/Benchmark.x11perf/spec | 10 ++---
engine/tests/Functional.LTP/spec | 58 +++++++++++++-------------
engine/tests/Functional.OpenSSL/spec | 8 ++--
engine/tests/Functional.aiostress/spec | 18 +++-----
engine/tests/Functional.arch_timer/spec | 8 ++--
engine/tests/Functional.bc/spec | 16 +++----
engine/tests/Functional.boost/spec | 9 ++--
engine/tests/Functional.bsdiff/spec | 8 ++--
engine/tests/Functional.bzip2/spec | 9 ++--
engine/tests/Functional.cmt/spec | 8 ++--
engine/tests/Functional.commonAPI_C++/spec | 8 ++--
engine/tests/Functional.commonAPI_Dbus/spec | 8 ++--
engine/tests/Functional.commonAPI_SomeIp/spec | 8 ++--
engine/tests/Functional.crashme/spec | 8 ++--
engine/tests/Functional.croco/spec | 8 ++--
engine/tests/Functional.curl/spec | 9 ++--
engine/tests/Functional.expat/spec | 8 ++--
engine/tests/Functional.fixesproto/spec | 8 ++--
engine/tests/Functional.fontconfig/spec | 9 ++--
engine/tests/Functional.fsfuzz/spec | 8 ++--
engine/tests/Functional.ft2demos/spec | 9 ++--
engine/tests/Functional.fuego_abort/spec | 9 ++--
engine/tests/Functional.fuego_board_check/spec | 9 ++--
engine/tests/Functional.fuego_test_phases/spec | 9 ++--
engine/tests/Functional.fuego_transport/spec | 9 ++--
engine/tests/Functional.fuse/spec | 8 ++--
engine/tests/Functional.giflib/spec | 8 ++--
engine/tests/Functional.glib/spec | 9 ++--
engine/tests/Functional.glib2/spec | 8 ++--
engine/tests/Functional.glibc/spec | 8 ++--
engine/tests/Functional.hciattach/spec | 8 ++--
engine/tests/Functional.hello_world/spec | 14 +++----
engine/tests/Functional.imagemagick/spec | 8 ++--
engine/tests/Functional.iptables/spec | 8 ++--
engine/tests/Functional.iputils/spec | 8 ++--
engine/tests/Functional.ipv6connect/spec | 9 ++--
engine/tests/Functional.jpeg/spec | 9 ++--
engine/tests/Functional.kernel_build/spec | 14 +++----
engine/tests/Functional.kmod/spec | 8 ++--
engine/tests/Functional.libogg/spec | 8 ++--
engine/tests/Functional.libpcap/spec | 8 ++--
engine/tests/Functional.librsvg/spec | 8 ++--
engine/tests/Functional.libspeex/spec | 8 ++--
engine/tests/Functional.libtar/spec | 8 ++--
engine/tests/Functional.libwebsocket/spec | 8 ++--
engine/tests/Functional.linus_stress/spec | 8 ++--
engine/tests/Functional.lwip/spec | 8 ++--
engine/tests/Functional.mesa-demos/spec | 8 ++--
engine/tests/Functional.neon/spec | 8 ++--
engine/tests/Functional.net-tools/spec | 8 ++--
engine/tests/Functional.netperf/spec | 11 ++---
engine/tests/Functional.pi_tests/spec | 14 +++----
engine/tests/Functional.pixman/spec | 8 ++--
engine/tests/Functional.pppd/spec | 8 ++--
engine/tests/Functional.protobuf/spec | 8 ++--
engine/tests/Functional.rmaptest/spec | 8 ++--
engine/tests/Functional.scifab/spec | 8 ++--
engine/tests/Functional.scrashme/spec | 20 ++++-----
engine/tests/Functional.sdhi_0/spec | 8 ++--
engine/tests/Functional.stress/spec | 8 ++--
engine/tests/Functional.synctest/spec | 23 ++++------
engine/tests/Functional.thrift/spec | 8 ++--
engine/tests/Functional.tiff/spec | 8 ++--
engine/tests/Functional.vsomeip/spec | 8 ++--
engine/tests/Functional.xorg-macros/spec | 8 ++--
engine/tests/Functional.zlib/spec | 9 ++--
100 files changed, 419 insertions(+), 718 deletions(-)
diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index c162e90..51f90c5 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -976,7 +976,7 @@ def do_add_jobs(conf, options):
spec = options[options.index('-s') + 1]
except IndexError:
error_out('Testspec not provided after -s.')
- specnames = [s['name'] for s in get_specs(conf, test_name)]
+ specnames = get_specs(conf, test_name)
if spec not in specnames:
error_out('Unknown spec %s' % spec)
options.remove('-s')
@@ -1256,8 +1256,7 @@ def do_list_specs(conf, options):
else:
error_out('No testcase name supplied.')
- specs = get_specs(conf, testcase)
- specnames = [spec['name'] for spec in specs]
+ specnames = get_specs(conf, testcase).keys()
specnames.sort()
indent = show_list_title("Testspecs for %s:" % testcase)
@@ -1267,7 +1266,7 @@ def do_list_specs(conf, options):
# returns an array of specs where each spec is a dictionary including the name key
def get_specs(conf, testcase):
- specpath = '%s/engine/tests/%s/%s.spec' % (conf.FUEGO_CORE, testcase, testcase)
+ specpath = '%s/engine/tests/%s/spec' % (conf.FUEGO_CORE, testcase)
specs = []
with open(specpath) as f:
try:
diff --git a/engine/scripts/ovgen.py b/engine/scripts/ovgen.py
index 222f54f..2cf23f1 100755
--- a/engine/scripts/ovgen.py
+++ b/engine/scripts/ovgen.py
@@ -404,11 +404,9 @@ def generateProlog(outFilePath, ofcls, classes, testdir, testspec):
# testspec: String - name of test spec (e.g. 'default')
# outFilePath - file output descriptor opened -> prolog.sh
def generateSpec(ts, fout):
- debug_print("generating spec '%s' for '%s'" % (ts.variables['name'], ts.name))
+ debug_print("generating spec %s" % (ts.name))
for var in ts.variables:
- if var == 'name':
- continue
varname = "%s_%s" % (ts.name, var)
varname = string.replace(varname, ".", "_").upper()
value = "%s" % (ts.variables[var])
@@ -446,17 +444,15 @@ def parseSpec(testdir, testspec):
except:
raise Exception("Error parsing spec file %s" % specpath)
- ts.name = jd["testName"]
+ ts.name = jd["testName"]
- if "fail_case" in jd:
- ts.fail_case = jd["fail_case"]
- debug_print ("Found fail_case msgs in '%s'" % specpath)
+ if "fail_case" in jd:
+ ts.fail_case = jd["fail_case"]
+ debug_print ("Found fail_case msgs in '%s'" % specpath)
- for spec in jd["specs"]:
- if spec["name"] == testspec:
- ts.variables = spec
-
- if not ts.variables:
+ if testspec in jd["specs"]:
+ ts.variables = jd["specs"][testspec]
+ else:
raise Exception("Could not find %s in %s" % (testspec, specpath))
return ts
diff --git a/engine/tests/Benchmark.Dhrystone/spec b/engine/tests/Benchmark.Dhrystone/spec
index 794ca68..b8604a6 100644
--- a/engine/tests/Benchmark.Dhrystone/spec
+++ b/engine/tests/Benchmark.Dhrystone/spec
@@ -1,25 +1,20 @@
- {
+{
"testName": "Benchmark.Dhrystone",
"fail_case": [
{
"fail_regexp": "Measured time too small to obtain meaningful results",
"fail_message": "Measured time too small to obtain meaningful results. Please increase LOOPS parameter in Dhrystone test spec."
- }
- ],
- "specs":
- [
- {
- "name":"default",
+ }
+ ],
+ "specs": {
+ "default": {
"LOOPS":"10000000"
},
- {
- "name":"100M",
+ "100M": {
"LOOPS":"100000000"
},
- {
- "name":"500M",
+ "500M": {
"LOOPS":"500000000"
}
- ]
+ }
}
-
diff --git a/engine/tests/Benchmark.GLMark/spec b/engine/tests/Benchmark.GLMark/spec
index d94129d..9d5f397 100644
--- a/engine/tests/Benchmark.GLMark/spec
+++ b/engine/tests/Benchmark.GLMark/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.GLMark",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.IOzone/spec b/engine/tests/Benchmark.IOzone/spec
index 13ba89b..05af9b8 100644
--- a/engine/tests/Benchmark.IOzone/spec
+++ b/engine/tests/Benchmark.IOzone/spec
@@ -1,45 +1,36 @@
{
"testName": "Benchmark.IOzone",
- "specs":
- [
- {
- "name":"sata",
+ "success_links": {"log": "testlog.txt", "plot": "plot.png", "xlsx": "results.xlsx"},
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"FILE_SIZE":"2M",
"TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"FILE_SIZE":"2M",
"TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"FILE_SIZE":"2M",
"TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
},
- {
- "name":"nopread",
+ "nopread": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"FILE_SIZE":"2M",
"TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"FILE_SIZE":"2M",
"TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
}
- ]
+ }
}
-
-
-
-
diff --git a/engine/tests/Benchmark.Interbench/spec b/engine/tests/Benchmark.Interbench/spec
index e3627bb..67518ff 100644
--- a/engine/tests/Benchmark.Interbench/spec
+++ b/engine/tests/Benchmark.Interbench/spec
@@ -1,20 +1,9 @@
- {
+{
"testName": "Benchmark.Interbench",
- "specs":
- [
- {
- "name":"default"
- },
- {
- "name":"sata"
- },
- {
- "name":"usb"
- },
- {
- "name":"mmc"
- }
-
- ]
+ "specs": {
+ "default": {},
+ "sata": {},
+ "usb": {},
+ "mmc": {}
+ }
}
-
diff --git a/engine/tests/Benchmark.Java/spec b/engine/tests/Benchmark.Java/spec
index fdad1c9..00d0e11 100644
--- a/engine/tests/Benchmark.Java/spec
+++ b/engine/tests/Benchmark.Java/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.Java",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.OpenSSL/spec b/engine/tests/Benchmark.OpenSSL/spec
index 7c00496..6811e4c 100644
--- a/engine/tests/Benchmark.OpenSSL/spec
+++ b/engine/tests/Benchmark.OpenSSL/spec
@@ -1,10 +1,6 @@
- {
+{
"testName": "Benchmark.OpenSSL",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
diff --git a/engine/tests/Benchmark.Stream/spec b/engine/tests/Benchmark.Stream/spec
index 2b88075..8cbe2bd 100644
--- a/engine/tests/Benchmark.Stream/spec
+++ b/engine/tests/Benchmark.Stream/spec
@@ -1,10 +1,6 @@
- {
+{
"testName": "Benchmark.Stream",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
diff --git a/engine/tests/Benchmark.Whetstone/spec b/engine/tests/Benchmark.Whetstone/spec
index b755e31..1cd11be 100644
--- a/engine/tests/Benchmark.Whetstone/spec
+++ b/engine/tests/Benchmark.Whetstone/spec
@@ -1,11 +1,9 @@
- {
+{
"testName": "Benchmark.Whetstone",
- "specs":
- [
- {
- "name":"default",
- "LOOPS":"100000"
+ "specs": {
+ "default": {
+ "LOOPS": "100000"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.aim7/spec b/engine/tests/Benchmark.aim7/spec
index 4ed9154..ae54f20 100644
--- a/engine/tests/Benchmark.aim7/spec
+++ b/engine/tests/Benchmark.aim7/spec
@@ -1,8 +1,6 @@
{
"testName": "Benchmark.aim7",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Benchmark.blobsallad/spec b/engine/tests/Benchmark.blobsallad/spec
index a12b7e8..4e6abed 100644
--- a/engine/tests/Benchmark.blobsallad/spec
+++ b/engine/tests/Benchmark.blobsallad/spec
@@ -1,16 +1,13 @@
- {
+{
"testName": "Benchmark.blobsallad",
"fail_case": [
{
"fail_regexp": "xrandr: command not found",
"fail_message": "target system does not have xrandr"
}
- ],
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ ],
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.bonnie/spec b/engine/tests/Benchmark.bonnie/spec
index 426f94b..b02bebc 100644
--- a/engine/tests/Benchmark.bonnie/spec
+++ b/engine/tests/Benchmark.bonnie/spec
@@ -1,47 +1,41 @@
{
"testName": "Benchmark.bonnie",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"SIZE":"32",
"RAM":"0",
"ROOT":"true"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"SIZE":"32",
"RAM":"0",
"ROOT":"true"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"SIZE":"32",
"RAM":"0",
"ROOT":"true"
},
- {
- "name":"noroot",
+ "noroot": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"SIZE":"32",
"RAM":"0",
"ROOT":"false"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"SIZE":"32",
"RAM":"0",
"ROOT":"true"
}
- ]
+ }
}
diff --git a/engine/tests/Benchmark.cyclictest/spec b/engine/tests/Benchmark.cyclictest/spec
index 617c1ac..774c742 100644
--- a/engine/tests/Benchmark.cyclictest/spec
+++ b/engine/tests/Benchmark.cyclictest/spec
@@ -1,11 +1,8 @@
{
"testName": "Benchmark.cyclictest",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"LOOPS":"10000"
}
- ]
+ }
}
-
diff --git a/engine/tests/Benchmark.dbench/spec b/engine/tests/Benchmark.dbench/spec
index f7700ab..61dbfda 100644
--- a/engine/tests/Benchmark.dbench/spec
+++ b/engine/tests/Benchmark.dbench/spec
@@ -1,42 +1,35 @@
{
"testName": "Benchmark.dbench",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"TIMELIMIT":"10",
"NPROCS":"2"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"TIMELIMIT":"10",
"NPROCS":"2"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"TIMELIMIT":"10",
"NPROCS":"2"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"/a",
"TIMELIMIT":"10",
"NPROCS":"2"
},
- {
- "name":"testdir",
+ "testdir": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"TIMELIMIT":"10",
"NPROCS":"2"
}
- ]
+ }
}
-
diff --git a/engine/tests/Benchmark.ebizzy/spec b/engine/tests/Benchmark.ebizzy/spec
index 062fc1f..fe5b4cf 100644
--- a/engine/tests/Benchmark.ebizzy/spec
+++ b/engine/tests/Benchmark.ebizzy/spec
@@ -1,14 +1,12 @@
{
"testName": "Benchmark.ebizzy",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"CHUNKS":"1000",
"CHUNK_SIZE":"51200",
"TIME":"100",
"THREADS":"100"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.ffsb/spec b/engine/tests/Benchmark.ffsb/spec
index acff523..cbae3c7 100644
--- a/engine/tests/Benchmark.ffsb/spec
+++ b/engine/tests/Benchmark.ffsb/spec
@@ -1,30 +1,21 @@
{
"testName": "Benchmark.ffsb",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work"
}
- ]
+ }
}
-
-
-
-
diff --git a/engine/tests/Benchmark.fio/spec b/engine/tests/Benchmark.fio/spec
index 947015d..b82bc0b 100644
--- a/engine/tests/Benchmark.fio/spec
+++ b/engine/tests/Benchmark.fio/spec
@@ -1,35 +1,26 @@
{
"testName": "Benchmark.fio",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"TIMEOUT":"10"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"TIMEOUT":"10"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"TIMEOUT":"10"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"TIMEOUT":"10"
}
- ]
+ }
}
-
-
-
-
diff --git a/engine/tests/Benchmark.fs_mark/spec b/engine/tests/Benchmark.fs_mark/spec
index 7a6623b..d6d5189 100644
--- a/engine/tests/Benchmark.fs_mark/spec
+++ b/engine/tests/Benchmark.fs_mark/spec
@@ -1,8 +1,6 @@
{
"testName": "Benchmark.fs_mark",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Benchmark.fuego_check_plots/spec b/engine/tests/Benchmark.fuego_check_plots/spec
index 5ae2190..97fc61c 100644
--- a/engine/tests/Benchmark.fuego_check_plots/spec
+++ b/engine/tests/Benchmark.fuego_check_plots/spec
@@ -1,13 +1,6 @@
{
"testName": "Benchmark.fuego_check_plots",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
-
-
-
diff --git a/engine/tests/Benchmark.gtkperf/spec b/engine/tests/Benchmark.gtkperf/spec
index 9ec9d5f..3e0707e 100644
--- a/engine/tests/Benchmark.gtkperf/spec
+++ b/engine/tests/Benchmark.gtkperf/spec
@@ -1,16 +1,13 @@
- {
+{
"testName": "Benchmark.gtkperf",
"fail_case": [
{
"fail_regexp": "xrandr: command not found",
"fail_message": "target system does not have xrandr"
}
- ],
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ ],
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.hackbench/spec b/engine/tests/Benchmark.hackbench/spec
index f915796..4fd1a07 100644
--- a/engine/tests/Benchmark.hackbench/spec
+++ b/engine/tests/Benchmark.hackbench/spec
@@ -1,11 +1,9 @@
{
"testName": "Benchmark.hackbench",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"GPOUPS":"20"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.himeno/spec b/engine/tests/Benchmark.himeno/spec
index 4cb58d6..3b48688 100644
--- a/engine/tests/Benchmark.himeno/spec
+++ b/engine/tests/Benchmark.himeno/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.himeno",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.iperf/spec b/engine/tests/Benchmark.iperf/spec
index e4429f4..eeca5ba 100644
--- a/engine/tests/Benchmark.iperf/spec
+++ b/engine/tests/Benchmark.iperf/spec
@@ -1,11 +1,9 @@
{
"testName": "Benchmark.iperf",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"SRV":"default"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.linpack/spec b/engine/tests/Benchmark.linpack/spec
index 9e1ca86..660ca24 100644
--- a/engine/tests/Benchmark.linpack/spec
+++ b/engine/tests/Benchmark.linpack/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.linpack",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.lmbench2/spec b/engine/tests/Benchmark.lmbench2/spec
index f1055c4..7342479 100644
--- a/engine/tests/Benchmark.lmbench2/spec
+++ b/engine/tests/Benchmark.lmbench2/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.lmbench2",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.nbench-byte/spec b/engine/tests/Benchmark.nbench-byte/spec
index 319b42d..53a3f4a 100644
--- a/engine/tests/Benchmark.nbench-byte/spec
+++ b/engine/tests/Benchmark.nbench-byte/spec
@@ -1,8 +1,6 @@
{
"testName": "Benchmark.nbench-byte",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Benchmark.nbench_byte/spec b/engine/tests/Benchmark.nbench_byte/spec
index 2dab856..084de4b 100644
--- a/engine/tests/Benchmark.nbench_byte/spec
+++ b/engine/tests/Benchmark.nbench_byte/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.nbench_byte",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.netperf/spec b/engine/tests/Benchmark.netperf/spec
index eac8fcd..53d85ad 100644
--- a/engine/tests/Benchmark.netperf/spec
+++ b/engine/tests/Benchmark.netperf/spec
@@ -1,14 +1,11 @@
{
"testName": "Benchmark.netperf",
- "specs":
- [
- {
- "name":"default",
- "SRV":"default"
+ "specs": {
+ "default": {
+ "SRV": "default"
},
- {
- "name":"docker",
- "SRV":"docker"
+ "docker": {
+ "SRV": "docker"
}
- ]
+ }
}
diff --git a/engine/tests/Benchmark.netpipe/spec b/engine/tests/Benchmark.netpipe/spec
index 0ed6717..e1c343b 100644
--- a/engine/tests/Benchmark.netpipe/spec
+++ b/engine/tests/Benchmark.netpipe/spec
@@ -1,12 +1,10 @@
{
"testName": "Benchmark.netpipe",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"SRV":"default",
"PERT":"2"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.reboot/spec b/engine/tests/Benchmark.reboot/spec
index c67f4a5..19509c7 100644
--- a/engine/tests/Benchmark.reboot/spec
+++ b/engine/tests/Benchmark.reboot/spec
@@ -1,10 +1,7 @@
- {
+{
"testName": "Benchmark.reboot",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
-
+
diff --git a/engine/tests/Benchmark.signaltest/spec b/engine/tests/Benchmark.signaltest/spec
index 0b2f09d..4cddb88 100644
--- a/engine/tests/Benchmark.signaltest/spec
+++ b/engine/tests/Benchmark.signaltest/spec
@@ -1,11 +1,9 @@
- {
+{
"testName": "Benchmark.signaltest",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"LOOPS":"10000"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Benchmark.sysbench/spec b/engine/tests/Benchmark.sysbench/spec
index ffe4534..23cb6dc 100644
--- a/engine/tests/Benchmark.sysbench/spec
+++ b/engine/tests/Benchmark.sysbench/spec
@@ -1,8 +1,6 @@
{
"testName": "Benchmark.sysbench",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Benchmark.tiobench/spec b/engine/tests/Benchmark.tiobench/spec
index e38a7d7..ac60ab7 100644
--- a/engine/tests/Benchmark.tiobench/spec
+++ b/engine/tests/Benchmark.tiobench/spec
@@ -1,36 +1,31 @@
{
"testName": "Benchmark.tiobench",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"THREADS":"4",
"SIZE":"10"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"THREADS":"4",
"SIZE":"10"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"THREADS":"4",
"SIZE":"10"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"THREADS":"4",
"SIZE":"10"
}
- ]
+ }
}
diff --git a/engine/tests/Benchmark.x11perf/spec b/engine/tests/Benchmark.x11perf/spec
index 602bc2d..4ae8d0b 100644
--- a/engine/tests/Benchmark.x11perf/spec
+++ b/engine/tests/Benchmark.x11perf/spec
@@ -1,11 +1,9 @@
{
"testName": "Benchmark.x11perf",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"TIME":"1"
}
- ]
+ }
}
-
+
diff --git a/engine/tests/Functional.LTP/spec b/engine/tests/Functional.LTP/spec
index dc5b8e9..cdbb0f4 100644
--- a/engine/tests/Functional.LTP/spec
+++ b/engine/tests/Functional.LTP/spec
@@ -1,48 +1,46 @@
{
"testName": "Functional.LTP",
- "specs":
- [
- {
- "name": "default",
- "tests": "syscalls SEM"
- },
- {
- "name": "selection",
- "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS"
- },
- {
- "name": "buildonly",
+ "success_links": {"log": "testlog.txt"},
+ "specs": {
+ "default": {
+ "tests": "syscalls SEM",
+ "extra_success_links": {"xlsx": "results.xlsx"}
+ },
+ "selection": {
+ "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS",
+ "extra_success_links": {"xlsx": "results.xlsx"}
+ },
+ "buildonly": {
"tests": "ltplite",
"buildonly": "true",
"platform": "qemu-armv7hf",
"extra_success_links": {"tar.gz": "ltp.tar.gz"}
},
- {
- "name": "runonly",
+ "runonly": {
"tests": "ltplite",
"runonly": "true",
"runfolder": "/opt/ltp",
"extra_success_links": {"xlsx": "results.xlsx"}
},
- {
- "name": "selectionwithrt",
- "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
+ "selectionwithrt": {
+ "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter",
+ "extra_success_links": {"xlsx": "results.xlsx"}
},
- {
- "name": "ltplite",
- "tests": "ltplite"
+ "ltplite": {
+ "tests": "ltplite",
+ "extra_success_links": {"xlsx": "results.xlsx"}
},
- {
- "name": "ptsonly",
- "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
+ "ptsonly": {
+ "tests": "AIO MEM MSG SEM SIG THR TMR TPS",
+ "extra_success_links": {"xlsx": "results.xlsx"}
},
- {
- "name": "smoketest",
- "tests": "fs_bind"
+ "smoketest": {
+ "tests": "fs_bind",
+ "extra_success_links": {"xlsx": "results.xlsx"}
},
- {
- "name": "rtonly",
- "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter"
+ "rtonly": {
+ "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate func/sched_latency func/sched_jitter",
+ "extra_success_links": {"xlsx": "results.xlsx"}
}
- ]
+ }
}
diff --git a/engine/tests/Functional.OpenSSL/spec b/engine/tests/Functional.OpenSSL/spec
index d3e4df0..077df0f 100644
--- a/engine/tests/Functional.OpenSSL/spec
+++ b/engine/tests/Functional.OpenSSL/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.OpenSSL",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.aiostress/spec b/engine/tests/Functional.aiostress/spec
index d41f4a0..cfd087b 100644
--- a/engine/tests/Functional.aiostress/spec
+++ b/engine/tests/Functional.aiostress/spec
@@ -1,31 +1,25 @@
{
"testName": "Functional.aiostress",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"SIZE":"20M"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"SIZE":"20M"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"SIZE":"20M"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
"SIZE":"20M"
}
- ]
+ }
}
-
diff --git a/engine/tests/Functional.arch_timer/spec b/engine/tests/Functional.arch_timer/spec
index 3d28603..0176b39 100644
--- a/engine/tests/Functional.arch_timer/spec
+++ b/engine/tests/Functional.arch_timer/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.arch_timer",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.bc/spec b/engine/tests/Functional.bc/spec
index 9b22ea6..f62eae5 100644
--- a/engine/tests/Functional.bc/spec
+++ b/engine/tests/Functional.bc/spec
@@ -10,24 +10,20 @@
"fail_message": "Bug or Oops detected in system log",
"use_syslog": "1"
}
- ],
- "specs":
- [
- {
- "name":"bc-mult",
+ ],
+ "specs": {
+ "bc-mult": {
"EXPR":"2*2",
"RESULT": "4"
},
- {
- "name":"bc-add",
+ "bc-add": {
"EXPR":"3+3",
"RESULT":"6"
},
- {
- "name":"default",
+ "default": {
"EXPR":"3+3",
"RESULT":"6"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.boost/spec b/engine/tests/Functional.boost/spec
index b25b352..9303943 100644
--- a/engine/tests/Functional.boost/spec
+++ b/engine/tests/Functional.boost/spec
@@ -1,10 +1,7 @@
{
"testName": "Functional.boost",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.bsdiff/spec b/engine/tests/Functional.bsdiff/spec
index 538beee..eea05f2 100644
--- a/engine/tests/Functional.bsdiff/spec
+++ b/engine/tests/Functional.bsdiff/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.bsdiff",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.bzip2/spec b/engine/tests/Functional.bzip2/spec
index 9350805..1d70294 100644
--- a/engine/tests/Functional.bzip2/spec
+++ b/engine/tests/Functional.bzip2/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.bzip2",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.cmt/spec b/engine/tests/Functional.cmt/spec
index d88d487..002c08c 100644
--- a/engine/tests/Functional.cmt/spec
+++ b/engine/tests/Functional.cmt/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.cmt",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.commonAPI_C++/spec b/engine/tests/Functional.commonAPI_C++/spec
index 401ce13..59a23a6 100644
--- a/engine/tests/Functional.commonAPI_C++/spec
+++ b/engine/tests/Functional.commonAPI_C++/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.commonAPI_C++",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.commonAPI_Dbus/spec b/engine/tests/Functional.commonAPI_Dbus/spec
index 699e591..71beea7 100644
--- a/engine/tests/Functional.commonAPI_Dbus/spec
+++ b/engine/tests/Functional.commonAPI_Dbus/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.commonAPI_Dbus",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.commonAPI_SomeIp/spec b/engine/tests/Functional.commonAPI_SomeIp/spec
index 4ca9398..4193223 100644
--- a/engine/tests/Functional.commonAPI_SomeIp/spec
+++ b/engine/tests/Functional.commonAPI_SomeIp/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.commonAPI_SomeIp",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.crashme/spec b/engine/tests/Functional.crashme/spec
index 1793be3..a778424 100644
--- a/engine/tests/Functional.crashme/spec
+++ b/engine/tests/Functional.crashme/spec
@@ -1,14 +1,12 @@
{
"testName": "Functional.crashme",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"NBYTES":"1000",
"INC":"1000",
"SRAND":"2",
"NTRYS":"100",
"NSUB":"3000"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.croco/spec b/engine/tests/Functional.croco/spec
index bd36f60..2890914 100644
--- a/engine/tests/Functional.croco/spec
+++ b/engine/tests/Functional.croco/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.croco",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.curl/spec b/engine/tests/Functional.curl/spec
index ee8160a..67cce6a 100644
--- a/engine/tests/Functional.curl/spec
+++ b/engine/tests/Functional.curl/spec
@@ -1,10 +1,7 @@
{
"testName": "Functional.curl",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.expat/spec b/engine/tests/Functional.expat/spec
index 09a7090..88f76ae 100644
--- a/engine/tests/Functional.expat/spec
+++ b/engine/tests/Functional.expat/spec
@@ -1,11 +1,9 @@
{
"testName": "Functional.expat",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"subtest_count_pos" : "1768",
"subtest_count_neg" : "41"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.fixesproto/spec b/engine/tests/Functional.fixesproto/spec
index 2f9ea91..4b2c291 100644
--- a/engine/tests/Functional.fixesproto/spec
+++ b/engine/tests/Functional.fixesproto/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.fixesproto",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fontconfig/spec b/engine/tests/Functional.fontconfig/spec
index 1237d46..ec13bc8 100644
--- a/engine/tests/Functional.fontconfig/spec
+++ b/engine/tests/Functional.fontconfig/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.fontconfig",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fsfuzz/spec b/engine/tests/Functional.fsfuzz/spec
index 1fb7446..1ee1039 100644
--- a/engine/tests/Functional.fsfuzz/spec
+++ b/engine/tests/Functional.fsfuzz/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.fsfuzz",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.ft2demos/spec b/engine/tests/Functional.ft2demos/spec
index edce877..22c4bf4 100644
--- a/engine/tests/Functional.ft2demos/spec
+++ b/engine/tests/Functional.ft2demos/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.ft2demos",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fuego_abort/spec b/engine/tests/Functional.fuego_abort/spec
index 47c6eda..e3240ff 100644
--- a/engine/tests/Functional.fuego_abort/spec
+++ b/engine/tests/Functional.fuego_abort/spec
@@ -1,10 +1,7 @@
{
"testName": "Functional.fuego_test_phases",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fuego_board_check/spec b/engine/tests/Functional.fuego_board_check/spec
index 05ff8e6..6c500ea 100644
--- a/engine/tests/Functional.fuego_board_check/spec
+++ b/engine/tests/Functional.fuego_board_check/spec
@@ -1,11 +1,8 @@
{
"testName": "Functional.fuego_board_check",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fuego_test_phases/spec b/engine/tests/Functional.fuego_test_phases/spec
index 47c6eda..e3240ff 100644
--- a/engine/tests/Functional.fuego_test_phases/spec
+++ b/engine/tests/Functional.fuego_test_phases/spec
@@ -1,10 +1,7 @@
{
"testName": "Functional.fuego_test_phases",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fuego_transport/spec b/engine/tests/Functional.fuego_transport/spec
index a4fae24..a6ad8c1 100644
--- a/engine/tests/Functional.fuego_transport/spec
+++ b/engine/tests/Functional.fuego_transport/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.fuego_transport",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.fuse/spec b/engine/tests/Functional.fuse/spec
index 11a0ffc..4fa868d 100644
--- a/engine/tests/Functional.fuse/spec
+++ b/engine/tests/Functional.fuse/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.fuse",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.giflib/spec b/engine/tests/Functional.giflib/spec
index 8143cf4..3a01899 100644
--- a/engine/tests/Functional.giflib/spec
+++ b/engine/tests/Functional.giflib/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.giflib",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.glib/spec b/engine/tests/Functional.glib/spec
index 1266660..8bc2da5 100644
--- a/engine/tests/Functional.glib/spec
+++ b/engine/tests/Functional.glib/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.glib",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.glib2/spec b/engine/tests/Functional.glib2/spec
index 15bd79f..57bb1d7 100644
--- a/engine/tests/Functional.glib2/spec
+++ b/engine/tests/Functional.glib2/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.glib2",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.glibc/spec b/engine/tests/Functional.glibc/spec
index f687253..38f9930 100644
--- a/engine/tests/Functional.glibc/spec
+++ b/engine/tests/Functional.glibc/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.glibc",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.hciattach/spec b/engine/tests/Functional.hciattach/spec
index 536da9b..17d6194 100644
--- a/engine/tests/Functional.hciattach/spec
+++ b/engine/tests/Functional.hciattach/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.hciattach",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.hello_world/spec b/engine/tests/Functional.hello_world/spec
index 4e1bea5..c4bc5e6 100644
--- a/engine/tests/Functional.hello_world/spec
+++ b/engine/tests/Functional.hello_world/spec
@@ -1,19 +1,15 @@
{
"testName": "Functional.hello_world",
- "specs":
- [
- {
- "name":"hello-fail",
+ "specs": {
+ "hello-fail": {
"ARG":"-f"
},
- {
- "name":"hello-random",
+ "hello-random": {
"ARG":"-r"
},
- {
- "name":"default",
+ "default": {
"ARG":""
}
- ]
+ }
}
diff --git a/engine/tests/Functional.imagemagick/spec b/engine/tests/Functional.imagemagick/spec
index 0c9babc..44ee88c 100644
--- a/engine/tests/Functional.imagemagick/spec
+++ b/engine/tests/Functional.imagemagick/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.imagemagick",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.iptables/spec b/engine/tests/Functional.iptables/spec
index 101d26b..14766a6 100644
--- a/engine/tests/Functional.iptables/spec
+++ b/engine/tests/Functional.iptables/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.iptables",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.iputils/spec b/engine/tests/Functional.iputils/spec
index 2dc83c7..f0dd437 100644
--- a/engine/tests/Functional.iputils/spec
+++ b/engine/tests/Functional.iputils/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.iputils",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.ipv6connect/spec b/engine/tests/Functional.ipv6connect/spec
index 0c425b7..1838d80 100644
--- a/engine/tests/Functional.ipv6connect/spec
+++ b/engine/tests/Functional.ipv6connect/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.ipv6connect",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.jpeg/spec b/engine/tests/Functional.jpeg/spec
index a32bc0e..b729644 100644
--- a/engine/tests/Functional.jpeg/spec
+++ b/engine/tests/Functional.jpeg/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.jpeg",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.kernel_build/spec b/engine/tests/Functional.kernel_build/spec
index 6ff8f2e..47a6da1 100644
--- a/engine/tests/Functional.kernel_build/spec
+++ b/engine/tests/Functional.kernel_build/spec
@@ -1,22 +1,18 @@
{
"testName": "Functional.kernel_build",
- "specs":
- [
- {
- "name": "default",
+ "specs": {
+ "default": {
"repo": "https://github.com/torvalds/linux.git"
},
- {
- "name": "cip-x86",
+ "cip-x86": {
"repo": "https://github.com/cip-project/linux-cip.git"
},
- {
- "name": "cip-arm64",
+ "cip-arm64": {
"repo": "https://github.com/cip-project/linux-cip.git",
"platform": "aarch64",
"arch": "arm64",
"params": "-j8 Image dtbs modules",
"regex_p": "^ OBJCOPY arch/arm64/boot/Image"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.kmod/spec b/engine/tests/Functional.kmod/spec
index 33df4b1..b7fe3d3 100644
--- a/engine/tests/Functional.kmod/spec
+++ b/engine/tests/Functional.kmod/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.kmod",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.libogg/spec b/engine/tests/Functional.libogg/spec
index 8b5b2b8..b2e3dab 100644
--- a/engine/tests/Functional.libogg/spec
+++ b/engine/tests/Functional.libogg/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.libogg",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.libpcap/spec b/engine/tests/Functional.libpcap/spec
index 3130092..38e1e47 100644
--- a/engine/tests/Functional.libpcap/spec
+++ b/engine/tests/Functional.libpcap/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.libpcap",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.librsvg/spec b/engine/tests/Functional.librsvg/spec
index 0a15abe..87f6dcf 100644
--- a/engine/tests/Functional.librsvg/spec
+++ b/engine/tests/Functional.librsvg/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.librsvg",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.libspeex/spec b/engine/tests/Functional.libspeex/spec
index a8b066c..b0e7c41 100644
--- a/engine/tests/Functional.libspeex/spec
+++ b/engine/tests/Functional.libspeex/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.libspeex",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.libtar/spec b/engine/tests/Functional.libtar/spec
index 1af026b..d252dcf 100644
--- a/engine/tests/Functional.libtar/spec
+++ b/engine/tests/Functional.libtar/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.libtar",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.libwebsocket/spec b/engine/tests/Functional.libwebsocket/spec
index f1e6178..aa237ea 100644
--- a/engine/tests/Functional.libwebsocket/spec
+++ b/engine/tests/Functional.libwebsocket/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.libwebsocket",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.linus_stress/spec b/engine/tests/Functional.linus_stress/spec
index 8894892..b5e2618 100644
--- a/engine/tests/Functional.linus_stress/spec
+++ b/engine/tests/Functional.linus_stress/spec
@@ -1,11 +1,9 @@
{
"testName": "Functional.linus_stress",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"DIRTY_BG":"2",
"DIRTY":"4"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.lwip/spec b/engine/tests/Functional.lwip/spec
index bb9f9b3..4d46c9c 100644
--- a/engine/tests/Functional.lwip/spec
+++ b/engine/tests/Functional.lwip/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.lwip",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.mesa-demos/spec b/engine/tests/Functional.mesa-demos/spec
index 0712e09..d5e9ba1 100644
--- a/engine/tests/Functional.mesa-demos/spec
+++ b/engine/tests/Functional.mesa-demos/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.mesa-demos",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.neon/spec b/engine/tests/Functional.neon/spec
index 348b913..28ffff3 100644
--- a/engine/tests/Functional.neon/spec
+++ b/engine/tests/Functional.neon/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.neon",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.net-tools/spec b/engine/tests/Functional.net-tools/spec
index f702fa6..75e4346 100644
--- a/engine/tests/Functional.net-tools/spec
+++ b/engine/tests/Functional.net-tools/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.net-tools",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.netperf/spec b/engine/tests/Functional.netperf/spec
index 2838d34..1c45451 100644
--- a/engine/tests/Functional.netperf/spec
+++ b/engine/tests/Functional.netperf/spec
@@ -1,14 +1,11 @@
{
"testName": "Functional.netperf",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"SRV":"default"
},
- {
- "name":"docker",
+ "docker": {
"SRV":"docker"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.pi_tests/spec b/engine/tests/Functional.pi_tests/spec
index 2971959..7908634 100644
--- a/engine/tests/Functional.pi_tests/spec
+++ b/engine/tests/Functional.pi_tests/spec
@@ -1,12 +1,10 @@
{
"testName": "Functional.pi_tests",
- "specs":
- [
- {
- "name":"default",
- "INVERSIONS":"100",
- "GROUPS":"1",
- "TIMEOUT":"10"
+ "specs": {
+ "default": {
+ "inversions":"100",
+ "groups":"1",
+ "duration":"10"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.pixman/spec b/engine/tests/Functional.pixman/spec
index 1cd16f8..9351416 100644
--- a/engine/tests/Functional.pixman/spec
+++ b/engine/tests/Functional.pixman/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.pixman",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.pppd/spec b/engine/tests/Functional.pppd/spec
index d1cbc93..8559ef4 100644
--- a/engine/tests/Functional.pppd/spec
+++ b/engine/tests/Functional.pppd/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.pppd",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.protobuf/spec b/engine/tests/Functional.protobuf/spec
index a04b726..1a624bc 100644
--- a/engine/tests/Functional.protobuf/spec
+++ b/engine/tests/Functional.protobuf/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.protobuf",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.rmaptest/spec b/engine/tests/Functional.rmaptest/spec
index d19b99f..4e7f8b2 100644
--- a/engine/tests/Functional.rmaptest/spec
+++ b/engine/tests/Functional.rmaptest/spec
@@ -1,14 +1,12 @@
{
"testName": "Functional.rmaptest",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"ITERATIONS":"100",
"VMA":"100",
"VMA_SIZE":"100",
"TASKS":"100",
"VMAS_FOR_PROCESS":"10"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.scifab/spec b/engine/tests/Functional.scifab/spec
index 0ae5344..a05920c 100644
--- a/engine/tests/Functional.scifab/spec
+++ b/engine/tests/Functional.scifab/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.scifab",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.scrashme/spec b/engine/tests/Functional.scrashme/spec
index 5065506..d5858f5 100644
--- a/engine/tests/Functional.scrashme/spec
+++ b/engine/tests/Functional.scrashme/spec
@@ -1,21 +1,17 @@
{
"testName": "Functional.scrashme",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"NUM":"100",
- "MODE":"random"
+ "MODE":"random"
},
- {
- "name":"rotate",
+ "rotate": {
"NUM":"100",
- "MODE":"rotate"
+ "MODE":"rotate"
},
- {
- "name":"capcheck",
+ "capcheck": {
"NUM":"100",
- "MODE":"capcheck"
+ "MODE":"capcheck"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.sdhi_0/spec b/engine/tests/Functional.sdhi_0/spec
index c0f134e..e89b6ea 100644
--- a/engine/tests/Functional.sdhi_0/spec
+++ b/engine/tests/Functional.sdhi_0/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.sdhi_0",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.stress/spec b/engine/tests/Functional.stress/spec
index 5a40f31..9d13e2d 100644
--- a/engine/tests/Functional.stress/spec
+++ b/engine/tests/Functional.stress/spec
@@ -1,9 +1,7 @@
{
"testName": "Functional.stress",
- "specs":
- [
- {
- "name":"default",
+ "specs": {
+ "default": {
"SYNC":"2",
"SQRT":"2",
"HDD":"2",
@@ -12,5 +10,5 @@
"VM_BYTES":"128M",
"TIMEOUT":"60"
}
- ]
+ }
}
diff --git a/engine/tests/Functional.synctest/spec b/engine/tests/Functional.synctest/spec
index 4d920b9..cdc5df2 100644
--- a/engine/tests/Functional.synctest/spec
+++ b/engine/tests/Functional.synctest/spec
@@ -1,38 +1,29 @@
{
"testName": "Functional.synctest",
- "specs":
- [
- {
- "name":"sata",
+ "specs": {
+ "sata": {
"MOUNT_BLOCKDEV":"$SATA_DEV",
"MOUNT_POINT":"$SATA_MP",
"LEN":"10",
"LOOP":"10"
},
- {
- "name":"mmc",
+ "mmc": {
"MOUNT_BLOCKDEV":"$MMC_DEV",
"MOUNT_POINT":"$MMC_MP",
"LEN":"10",
"LOOP":"10"
},
- {
- "name":"usb",
+ "usb": {
"MOUNT_BLOCKDEV":"$USB_DEV",
"MOUNT_POINT":"$USB_MP",
"LEN":"10",
"LOOP":"10"
},
- {
- "name":"default",
+ "default": {
"MOUNT_BLOCKDEV":"ROOT",
"MOUNT_POINT":"$BOARD_TESTDIR/work",
- "LEN":"10",
+ "LEN":"30",
"LOOP":"10"
}
- ]
+ }
}
-
-
-
-
diff --git a/engine/tests/Functional.thrift/spec b/engine/tests/Functional.thrift/spec
index 860aea2..db01926 100644
--- a/engine/tests/Functional.thrift/spec
+++ b/engine/tests/Functional.thrift/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.thrift",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.tiff/spec b/engine/tests/Functional.tiff/spec
index e7d3736..f32b2f8 100644
--- a/engine/tests/Functional.tiff/spec
+++ b/engine/tests/Functional.tiff/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.tiff",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.vsomeip/spec b/engine/tests/Functional.vsomeip/spec
index 61022d2..5055042 100644
--- a/engine/tests/Functional.vsomeip/spec
+++ b/engine/tests/Functional.vsomeip/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.vsomeip",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.xorg-macros/spec b/engine/tests/Functional.xorg-macros/spec
index e1b83f7..a368baa 100644
--- a/engine/tests/Functional.xorg-macros/spec
+++ b/engine/tests/Functional.xorg-macros/spec
@@ -1,8 +1,6 @@
{
"testName": "Functional.xorg-macros",
- "specs": [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
diff --git a/engine/tests/Functional.zlib/spec b/engine/tests/Functional.zlib/spec
index be3ed34..5ef2d22 100644
--- a/engine/tests/Functional.zlib/spec
+++ b/engine/tests/Functional.zlib/spec
@@ -1,9 +1,6 @@
{
"testName": "Functional.zlib",
- "specs":
- [
- {
- "name":"default"
- }
- ]
+ "specs": {
+ "default": {}
+ }
}
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 21/23] generic_parser: rewrite the label
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (18 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 20/23] spec format: modify so that the spec name is the key Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 22/23] links: links can now be specified by the specs Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 23/23] testplan_docker: add synctest expat and crashme Daniel Sangorrin
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/generic_parser.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/engine/scripts/generic_parser.py b/engine/scripts/generic_parser.py
index 08e4443..b6412b8 100755
--- a/engine/scripts/generic_parser.py
+++ b/engine/scripts/generic_parser.py
@@ -7,5 +7,5 @@ import common as plib
print "Received: " + str(sys.argv[1])
cur_dict = {'fail_or_pass' : sys.argv[1]}
-sys.exit(plib.process_data(test_results=cur_dict, label='FAIL or PASS'))
+sys.exit(plib.process_data(test_results=cur_dict, label='PASS=0 FAIL=1'))
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 22/23] links: links can now be specified by the specs
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (19 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 21/23] generic_parser: rewrite the label Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 23/23] testplan_docker: add synctest expat and crashme Daniel Sangorrin
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
There are default success and fail links. A spec file can
re-define them by setting the success_links or fail_links
values. Additionally, each spec can add extra links that
depend on the parameter used.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/scripts/ftc | 45 ++++++++++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 9 deletions(-)
diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index 51f90c5..e173d5b 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -783,14 +783,41 @@ def get_includes(include_filename, conf):
def create_job(board, test):
flot_link = '<flotile.FlotPublisher plugin="flot@1.0-SNAPSHOT"/>'
- # prepare links for descriptionsetter. Put a link to testlog.txt by default
+ # prepare links for the descriptionsetter plugin
+ test_spec_path = '/fuego-core/engine/tests/%s/spec' % (test.name)
template_link = '<a href="/fuego/userContent/fuego.logs/%s/%s.%s.${BUILD_NUMBER}.${BUILD_ID}/%%s">%%s</a>' % (test.name, board, test.spec)
+ with open(test_spec_path, "r") as f:
+ test_specs_json = json.load(f)
+ test_spec_json = test_specs_json['specs'][test.spec]
+
+ success_links = ''
+ if 'success_links' in test_specs_json:
+ for key, value in test_specs_json['success_links'].iteritems():
+ success_links = success_links + ' ' + template_link % (str(value), str(key))
+ else:
+ default_success_links = {"log": "testlog.txt", "plot": "plot.png"}
+ for key, value in default_success_links.iteritems():
+ success_links = success_links + ' ' + template_link % (str(value), str(key))
+
+ if 'extra_success_links' in test_spec_json:
+ for key, value in test_spec_json['extra_success_links'].iteritems():
+ success_links = success_links + ' ' + template_link % (str(value), str(key))
+
+ fail_links = ''
+ if 'fail_links' in test_specs_json:
+ for key, value in test_specs_json['fail_links'].iteritems():
+ fail_links = fail_links + ' ' + template_link % (str(value), str(key))
+ else:
+ if test.test_type == 'Functional':
+ default_fail_links = {"log": "testlog.txt", "plot": "plot.png"}
+ else:
+ default_fail_links = {"log": "testlog.txt"}
+ for key, value in default_fail_links.iteritems():
+ fail_links = fail_links + ' ' + template_link % (str(value), str(key))
- html_links = template_link % ('testlog.txt', 'log')
- failed_links = html_links
- if test.extralinks:
- for key, value in test.extralinks.iteritems():
- html_links = html_links + ' ' + template_link % (str(value), str(key))
+ if 'extra_fail_links' in test_spec_json:
+ for key, value in test_spec_json['extra_fail_links'].iteritems():
+ fail_links = fail_links + ' ' + template_link % (str(value), str(key))
tmp = "/tmp/fuego_tmp_job"
fd = open(tmp, "w+")
@@ -828,8 +855,8 @@ timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/scripts/main.sh
<hudson.plugins.descriptionsetter.DescriptionSetterPublisher plugin="description-setter@1.10">
<regexp></regexp>
<regexpForFailed></regexpForFailed>
- <description>{html_links}</description>
- <descriptionForFailed>{failed_links}</descriptionForFailed>
+ <description>{success_links}</description>
+ <descriptionForFailed>{fail_links}</descriptionForFailed>
<setForMatrix>false</setForMatrix>
</hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
</publishers>
@@ -839,7 +866,7 @@ timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/scripts/main.sh
precleanup=test.precleanup, postcleanup=test.postcleanup,
testdir=test.name, testname=test.base_name,
testspec=test.spec, timeout=test.timeout,
- flot_link=flot_link, html_links=html_links, failed_links=failed_links))
+ flot_link=flot_link, success_links=success_links, fail_links=fail_links))
fd.close()
job_name=board+"."+test.spec+"."+test.name
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [Fuego] [PATCH 23/23] testplan_docker: add synctest expat and crashme
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
` (20 preceding siblings ...)
2017-04-27 8:26 ` [Fuego] [PATCH 22/23] links: links can now be specified by the specs Daniel Sangorrin
@ 2017-04-27 8:26 ` Daniel Sangorrin
21 siblings, 0 replies; 25+ messages in thread
From: Daniel Sangorrin @ 2017-04-27 8:26 UTC (permalink / raw)
To: fuego
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
engine/overlays/testplans/testplan_docker.json | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/engine/overlays/testplans/testplan_docker.json b/engine/overlays/testplans/testplan_docker.json
index 97cdd32..6336d36 100644
--- a/engine/overlays/testplans/testplan_docker.json
+++ b/engine/overlays/testplans/testplan_docker.json
@@ -56,12 +56,21 @@
"timeout": "100m"
},
{
+ "testName": "Functional.expat"
+ },
+ {
+ "testName": "Functional.synctest"
+ },
+ {
"testName": "Functional.aiostress"
},
{
"testName": "Functional.bzip2"
},
{
+ "testName": "Functional.crashme"
+ },
+ {
"testName": "Functional.glib",
"timeout": "20m"
},
--
2.7.4
^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [Fuego] [PATCH 03/23] specs: change the name of the specs to spec
2017-04-27 8:26 ` [Fuego] [PATCH 03/23] specs: change the name of the specs to spec Daniel Sangorrin
@ 2017-04-27 17:08 ` Bird, Timothy
0 siblings, 0 replies; 25+ messages in thread
From: Bird, Timothy @ 2017-04-27 17:08 UTC (permalink / raw)
To: Daniel Sangorrin, fuego
I agree with this. Having the test name in the spec filename is redundant.
The reason I hadn't changed this earlier is that I was still worried a bit about
whether these needed to live anywhere outside the test directory. I can't
think of a use case for that, so I approve of this change.
One small nit, however. I'm going to accept this patch, and then change
the name to spec.json (ie add the extension ".json"), for consistency
with other filenames in the system that express their format or type
via their filename extension.
-- Tim
> -----Original Message-----
> From: fuego-bounces@lists.linuxfoundation.org [mailto:fuego-
> bounces@lists.linuxfoundation.org] On Behalf Of Daniel Sangorrin
> Sent: Thursday, April 27, 2017 1:27 AM
> To: fuego@lists.linuxfoundation.org
> Subject: [Fuego] [PATCH 03/23] specs: change the name of the specs to spec
>
> This is to avoid typical misspelling errors by test writers
>
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> ---
> engine/scripts/ovgen.py | 2 +-
> .../Benchmark.Dhrystone/Benchmark.Dhrystone.spec | 25 ------------
> engine/tests/Benchmark.Dhrystone/spec | 25 ++++++++++++
> .../tests/Benchmark.GLMark/Benchmark.GLMark.spec | 10 -----
> engine/tests/Benchmark.GLMark/spec | 10 +++++
> .../tests/Benchmark.IOzone/Benchmark.IOzone.spec | 45 ---------------------
> engine/tests/Benchmark.IOzone/spec | 45
> +++++++++++++++++++++
> .../Benchmark.Interbench/Benchmark.Interbench.spec | 20 ---------
> engine/tests/Benchmark.Interbench/spec | 20 +++++++++
> engine/tests/Benchmark.Java/Benchmark.Java.spec | 10 -----
> engine/tests/Benchmark.Java/spec | 10 +++++
> .../tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec | 10 -----
> engine/tests/Benchmark.OpenSSL/spec | 10 +++++
> .../tests/Benchmark.Stream/Benchmark.Stream.spec | 10 -----
> engine/tests/Benchmark.Stream/spec | 10 +++++
> .../Benchmark.Whetstone/Benchmark.Whetstone.spec | 11 -----
> engine/tests/Benchmark.Whetstone/spec | 11 +++++
> engine/tests/Benchmark.aim7/Benchmark.aim7.spec | 8 ----
> engine/tests/Benchmark.aim7/spec | 8 ++++
> .../Benchmark.blobsallad/Benchmark.blobsallad.spec | 16 --------
> engine/tests/Benchmark.blobsallad/spec | 16 ++++++++
> .../tests/Benchmark.bonnie/Benchmark.bonnie.spec | 47 ---------------------
> -
> engine/tests/Benchmark.bonnie/spec | 47
> ++++++++++++++++++++++
> .../Benchmark.cyclictest/Benchmark.cyclictest.spec | 11 -----
> engine/tests/Benchmark.cyclictest/spec | 11 +++++
> .../tests/Benchmark.dbench/Benchmark.dbench.spec | 42 -------------------
> engine/tests/Benchmark.dbench/spec | 42 +++++++++++++++++++
> .../tests/Benchmark.ebizzy/Benchmark.ebizzy.spec | 14 -------
> engine/tests/Benchmark.ebizzy/spec | 14 +++++++
> engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec | 30 --------------
> engine/tests/Benchmark.ffsb/spec | 30 ++++++++++++++
> engine/tests/Benchmark.fio/Benchmark.fio.spec | 35 ----------------
> engine/tests/Benchmark.fio/spec | 35 ++++++++++++++++
> .../tests/Benchmark.fs_mark/Benchmark.fs_mark.spec | 8 ----
> engine/tests/Benchmark.fs_mark/spec | 8 ++++
> .../Benchmark.fuego_check_plots.spec | 13 ------
> engine/tests/Benchmark.fuego_check_plots/spec | 13 ++++++
> .../tests/Benchmark.gtkperf/Benchmark.gtkperf.spec | 16 --------
> engine/tests/Benchmark.gtkperf/spec | 16 ++++++++
> .../Benchmark.hackbench/Benchmark.hackbench.spec | 11 -----
> engine/tests/Benchmark.hackbench/spec | 11 +++++
> .../tests/Benchmark.himeno/Benchmark.himeno.spec | 10 -----
> engine/tests/Benchmark.himeno/spec | 10 +++++
> engine/tests/Benchmark.iperf/Benchmark.iperf.spec | 11 -----
> engine/tests/Benchmark.iperf/spec | 11 +++++
> .../tests/Benchmark.linpack/Benchmark.linpack.spec | 10 -----
> engine/tests/Benchmark.linpack/spec | 10 +++++
> .../Benchmark.lmbench2/Benchmark.lmbench2.spec | 10 -----
> engine/tests/Benchmark.lmbench2/spec | 10 +++++
> .../Benchmark.nbench-byte.spec | 8 ----
> engine/tests/Benchmark.nbench-byte/spec | 8 ++++
> .../Benchmark.nbench_byte.spec | 10 -----
> engine/tests/Benchmark.nbench_byte/spec | 10 +++++
> .../tests/Benchmark.netperf/Benchmark.netperf.spec | 14 -------
> engine/tests/Benchmark.netperf/spec | 14 +++++++
> .../tests/Benchmark.netpipe/Benchmark.netpipe.spec | 12 ------
> engine/tests/Benchmark.netpipe/spec | 12 ++++++
> .../tests/Benchmark.reboot/Benchmark.reboot.spec | 10 -----
> engine/tests/Benchmark.reboot/spec | 10 +++++
> .../Benchmark.signaltest/Benchmark.signaltest.spec | 11 -----
> engine/tests/Benchmark.signaltest/spec | 11 +++++
> .../Benchmark.sysbench/Benchmark.sysbench.spec | 8 ----
> engine/tests/Benchmark.sysbench/spec | 8 ++++
> .../Benchmark.tiobench/Benchmark.tiobench.spec | 38 -----------------
> engine/tests/Benchmark.tiobench/spec | 38 +++++++++++++++++
> .../tests/Benchmark.x11perf/Benchmark.x11perf.spec | 11 -----
> engine/tests/Benchmark.x11perf/spec | 11 +++++
> engine/tests/Functional.LTP/Functional.LTP.spec | 34 ----------------
> engine/tests/Functional.LTP/spec | 34 ++++++++++++++++
> .../Functional.OpenSSL/Functional.OpenSSL.spec | 8 ----
> engine/tests/Functional.OpenSSL/spec | 8 ++++
> .../Functional.aiostress/Functional.aiostress.spec | 31 --------------
> engine/tests/Functional.aiostress/spec | 31 ++++++++++++++
> .../Functional.arch_timer.spec | 8 ----
> engine/tests/Functional.arch_timer/spec | 8 ++++
> engine/tests/Functional.bc/Functional.bc.spec | 33 ---------------
> engine/tests/Functional.bc/spec | 33 +++++++++++++++
> .../tests/Functional.boost/Functional.boost.spec | 10 -----
> engine/tests/Functional.boost/spec | 10 +++++
> .../tests/Functional.bsdiff/Functional.bsdiff.spec | 8 ----
> engine/tests/Functional.bsdiff/spec | 8 ++++
> .../tests/Functional.bzip2/Functional.bzip2.spec | 9 -----
> engine/tests/Functional.bzip2/spec | 9 +++++
> engine/tests/Functional.cmt/Functional.cmt.spec | 8 ----
> engine/tests/Functional.cmt/spec | 8 ++++
> .../Functional.commonAPI_C++.spec | 8 ----
> engine/tests/Functional.commonAPI_C++/spec | 8 ++++
> .../Functional.commonAPI_Dbus.spec | 8 ----
> engine/tests/Functional.commonAPI_Dbus/spec | 8 ++++
> .../Functional.commonAPI_SomeIp.spec | 8 ----
> engine/tests/Functional.commonAPI_SomeIp/spec | 8 ++++
> .../Functional.crashme/Functional.crashme.spec | 14 -------
> engine/tests/Functional.crashme/spec | 14 +++++++
> .../tests/Functional.croco/Functional.croco.spec | 8 ----
> engine/tests/Functional.croco/spec | 8 ++++
> engine/tests/Functional.curl/Functional.curl.spec | 10 -----
> engine/tests/Functional.curl/spec | 10 +++++
> .../tests/Functional.expat/Functional.expat.spec | 9 -----
> engine/tests/Functional.expat/spec | 9 +++++
> .../Functional.fixesproto.spec | 8 ----
> engine/tests/Functional.fixesproto/spec | 8 ++++
> .../Functional.fontconfig.spec | 9 -----
> engine/tests/Functional.fontconfig/spec | 9 +++++
> .../tests/Functional.fsfuzz/Functional.fsfuzz.spec | 8 ----
> engine/tests/Functional.fsfuzz/spec | 8 ++++
> .../Functional.ft2demos/Functional.ft2demos.spec | 9 -----
> engine/tests/Functional.ft2demos/spec | 9 +++++
> .../Functional.fuego_abort.spec | 10 -----
> engine/tests/Functional.fuego_abort/spec | 10 +++++
> .../Functional.fuego_board_check.spec | 13 ------
> engine/tests/Functional.fuego_board_check/spec | 13 ++++++
> .../Functional.fuego_test_phases.spec | 10 -----
> engine/tests/Functional.fuego_test_phases/spec | 10 +++++
> .../Functional.fuego_transport.spec | 9 -----
> engine/tests/Functional.fuego_transport/spec | 9 +++++
> engine/tests/Functional.fuse/Functional.fuse.spec | 8 ----
> engine/tests/Functional.fuse/spec | 8 ++++
> .../tests/Functional.giflib/Functional.giflib.spec | 8 ----
> engine/tests/Functional.giflib/spec | 8 ++++
> engine/tests/Functional.glib/Functional.glib.spec | 9 -----
> engine/tests/Functional.glib/spec | 9 +++++
> .../tests/Functional.glib2/Functional.glib2.spec | 8 ----
> engine/tests/Functional.glib2/spec | 8 ++++
> .../tests/Functional.glibc/Functional.glibc.spec | 8 ----
> engine/tests/Functional.glibc/spec | 8 ++++
> .../Functional.hciattach/Functional.hciattach.spec | 8 ----
> engine/tests/Functional.hciattach/spec | 8 ++++
> .../Functional.hello_world.spec | 19 ---------
> engine/tests/Functional.hello_world/spec | 19 +++++++++
> .../Functional.imagemagick.spec | 8 ----
> engine/tests/Functional.imagemagick/spec | 8 ++++
> .../Functional.iptables/Functional.iptables.spec | 8 ----
> engine/tests/Functional.iptables/spec | 8 ++++
> .../Functional.iputils/Functional.iputils.spec | 8 ----
> engine/tests/Functional.iputils/spec | 8 ++++
> .../Functional.ipv6connect.spec | 9 -----
> engine/tests/Functional.ipv6connect/spec | 9 +++++
> engine/tests/Functional.jpeg/Functional.jpeg.spec | 9 -----
> engine/tests/Functional.jpeg/spec | 9 +++++
> .../Functional.kernel_build.spec | 18 ---------
> engine/tests/Functional.kernel_build/spec | 18 +++++++++
> engine/tests/Functional.kmod/Functional.kmod.spec | 8 ----
> engine/tests/Functional.kmod/spec | 8 ++++
> .../tests/Functional.libogg/Functional.libogg.spec | 8 ----
> engine/tests/Functional.libogg/spec | 8 ++++
> .../Functional.libpcap/Functional.libpcap.spec | 8 ----
> engine/tests/Functional.libpcap/spec | 8 ++++
> .../Functional.librsvg/Functional.librsvg.spec | 8 ----
> engine/tests/Functional.librsvg/spec | 8 ++++
> .../Functional.libspeex/Functional.libspeex.spec | 8 ----
> engine/tests/Functional.libspeex/spec | 8 ++++
> .../tests/Functional.libtar/Functional.libtar.spec | 8 ----
> engine/tests/Functional.libtar/spec | 8 ++++
> .../Functional.libwebsocket.spec | 8 ----
> engine/tests/Functional.libwebsocket/spec | 8 ++++
> .../Functional.linus_stress.spec | 11 -----
> engine/tests/Functional.linus_stress/spec | 11 +++++
> engine/tests/Functional.lwip/Functional.lwip.spec | 8 ----
> engine/tests/Functional.lwip/spec | 8 ++++
> .../Functional.mesa-demos.spec | 8 ----
> engine/tests/Functional.mesa-demos/spec | 8 ++++
> engine/tests/Functional.neon/Functional.neon.spec | 8 ----
> engine/tests/Functional.neon/spec | 8 ++++
> .../Functional.net-tools/Functional.net-tools.spec | 8 ----
> engine/tests/Functional.net-tools/spec | 8 ++++
> .../Functional.netperf/Functional.netperf.spec | 14 -------
> engine/tests/Functional.netperf/spec | 14 +++++++
> .../Functional.pi_tests/Functional.pi_tests.spec | 12 ------
> engine/tests/Functional.pi_tests/spec | 12 ++++++
> .../tests/Functional.pixman/Functional.pixman.spec | 8 ----
> engine/tests/Functional.pixman/spec | 8 ++++
> engine/tests/Functional.pppd/Functional.pppd.spec | 8 ----
> engine/tests/Functional.pppd/spec | 8 ++++
> .../Functional.protobuf/Functional.protobuf.spec | 8 ----
> engine/tests/Functional.protobuf/spec | 8 ++++
> .../Functional.rmaptest/Functional.rmaptest.spec | 14 -------
> engine/tests/Functional.rmaptest/spec | 14 +++++++
> .../tests/Functional.scifab/Functional.scifab.spec | 8 ----
> engine/tests/Functional.scifab/spec | 8 ++++
> .../Functional.scrashme/Functional.scrashme.spec | 21 ----------
> engine/tests/Functional.scrashme/spec | 21 ++++++++++
> .../tests/Functional.sdhi_0/Functional.sdhi_0.spec | 8 ----
> engine/tests/Functional.sdhi_0/spec | 8 ++++
> .../tests/Functional.stress/Functional.stress.spec | 16 --------
> engine/tests/Functional.stress/spec | 16 ++++++++
> .../Functional.synctest/Functional.synctest.spec | 38 -----------------
> engine/tests/Functional.synctest/spec | 38 +++++++++++++++++
> .../tests/Functional.thrift/Functional.thrift.spec | 8 ----
> engine/tests/Functional.thrift/spec | 8 ++++
> engine/tests/Functional.tiff/Functional.tiff.spec | 8 ----
> engine/tests/Functional.tiff/spec | 8 ++++
> .../Functional.vsomeip/Functional.vsomeip.spec | 8 ----
> engine/tests/Functional.vsomeip/spec | 8 ++++
> .../Functional.xorg-macros.spec | 8 ----
> engine/tests/Functional.xorg-macros/spec | 8 ++++
> engine/tests/Functional.zlib/Functional.zlib.spec | 9 -----
> engine/tests/Functional.zlib/spec | 9 +++++
> 197 files changed, 1269 insertions(+), 1269 deletions(-)
> delete mode 100644
> engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
> create mode 100644 engine/tests/Benchmark.Dhrystone/spec
> delete mode 100644
> engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
> create mode 100644 engine/tests/Benchmark.GLMark/spec
> delete mode 100644
> engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
> create mode 100644 engine/tests/Benchmark.IOzone/spec
> delete mode 100644
> engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
> create mode 100644 engine/tests/Benchmark.Interbench/spec
> delete mode 100644 engine/tests/Benchmark.Java/Benchmark.Java.spec
> create mode 100644 engine/tests/Benchmark.Java/spec
> delete mode 100644
> engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
> create mode 100644 engine/tests/Benchmark.OpenSSL/spec
> delete mode 100644
> engine/tests/Benchmark.Stream/Benchmark.Stream.spec
> create mode 100644 engine/tests/Benchmark.Stream/spec
> delete mode 100644
> engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
> create mode 100644 engine/tests/Benchmark.Whetstone/spec
> delete mode 100644 engine/tests/Benchmark.aim7/Benchmark.aim7.spec
> create mode 100644 engine/tests/Benchmark.aim7/spec
> delete mode 100644
> engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
> create mode 100644 engine/tests/Benchmark.blobsallad/spec
> delete mode 100644
> engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
> create mode 100644 engine/tests/Benchmark.bonnie/spec
> delete mode 100644
> engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
> create mode 100644 engine/tests/Benchmark.cyclictest/spec
> delete mode 100644
> engine/tests/Benchmark.dbench/Benchmark.dbench.spec
> create mode 100644 engine/tests/Benchmark.dbench/spec
> delete mode 100644
> engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
> create mode 100644 engine/tests/Benchmark.ebizzy/spec
> delete mode 100644 engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
> create mode 100644 engine/tests/Benchmark.ffsb/spec
> delete mode 100644 engine/tests/Benchmark.fio/Benchmark.fio.spec
> create mode 100644 engine/tests/Benchmark.fio/spec
> delete mode 100644
> engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
> create mode 100644 engine/tests/Benchmark.fs_mark/spec
> delete mode 100644
> engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots
> .spec
> create mode 100644 engine/tests/Benchmark.fuego_check_plots/spec
> delete mode 100644
> engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
> create mode 100644 engine/tests/Benchmark.gtkperf/spec
> delete mode 100644
> engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
> create mode 100644 engine/tests/Benchmark.hackbench/spec
> delete mode 100644
> engine/tests/Benchmark.himeno/Benchmark.himeno.spec
> create mode 100644 engine/tests/Benchmark.himeno/spec
> delete mode 100644 engine/tests/Benchmark.iperf/Benchmark.iperf.spec
> create mode 100644 engine/tests/Benchmark.iperf/spec
> delete mode 100644
> engine/tests/Benchmark.linpack/Benchmark.linpack.spec
> create mode 100644 engine/tests/Benchmark.linpack/spec
> delete mode 100644
> engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
> create mode 100644 engine/tests/Benchmark.lmbench2/spec
> delete mode 100644 engine/tests/Benchmark.nbench-
> byte/Benchmark.nbench-byte.spec
> create mode 100644 engine/tests/Benchmark.nbench-byte/spec
> delete mode 100644
> engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
> create mode 100644 engine/tests/Benchmark.nbench_byte/spec
> delete mode 100644
> engine/tests/Benchmark.netperf/Benchmark.netperf.spec
> create mode 100644 engine/tests/Benchmark.netperf/spec
> delete mode 100644
> engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
> create mode 100644 engine/tests/Benchmark.netpipe/spec
> delete mode 100644
> engine/tests/Benchmark.reboot/Benchmark.reboot.spec
> create mode 100644 engine/tests/Benchmark.reboot/spec
> delete mode 100644
> engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
> create mode 100644 engine/tests/Benchmark.signaltest/spec
> delete mode 100644
> engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
> create mode 100644 engine/tests/Benchmark.sysbench/spec
> delete mode 100644
> engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
> create mode 100644 engine/tests/Benchmark.tiobench/spec
> delete mode 100644
> engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
> create mode 100644 engine/tests/Benchmark.x11perf/spec
> delete mode 100644 engine/tests/Functional.LTP/Functional.LTP.spec
> create mode 100644 engine/tests/Functional.LTP/spec
> delete mode 100644
> engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
> create mode 100644 engine/tests/Functional.OpenSSL/spec
> delete mode 100644
> engine/tests/Functional.aiostress/Functional.aiostress.spec
> create mode 100644 engine/tests/Functional.aiostress/spec
> delete mode 100644
> engine/tests/Functional.arch_timer/Functional.arch_timer.spec
> create mode 100644 engine/tests/Functional.arch_timer/spec
> delete mode 100644 engine/tests/Functional.bc/Functional.bc.spec
> create mode 100644 engine/tests/Functional.bc/spec
> delete mode 100644 engine/tests/Functional.boost/Functional.boost.spec
> create mode 100644 engine/tests/Functional.boost/spec
> delete mode 100644 engine/tests/Functional.bsdiff/Functional.bsdiff.spec
> create mode 100644 engine/tests/Functional.bsdiff/spec
> delete mode 100644 engine/tests/Functional.bzip2/Functional.bzip2.spec
> create mode 100644 engine/tests/Functional.bzip2/spec
> delete mode 100644 engine/tests/Functional.cmt/Functional.cmt.spec
> create mode 100644 engine/tests/Functional.cmt/spec
> delete mode 100644
> engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
> create mode 100644 engine/tests/Functional.commonAPI_C++/spec
> delete mode 100644
> engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.sp
> ec
> create mode 100644 engine/tests/Functional.commonAPI_Dbus/spec
> delete mode 100644
> engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_Som
> eIp.spec
> create mode 100644 engine/tests/Functional.commonAPI_SomeIp/spec
> delete mode 100644
> engine/tests/Functional.crashme/Functional.crashme.spec
> create mode 100644 engine/tests/Functional.crashme/spec
> delete mode 100644 engine/tests/Functional.croco/Functional.croco.spec
> create mode 100644 engine/tests/Functional.croco/spec
> delete mode 100644 engine/tests/Functional.curl/Functional.curl.spec
> create mode 100644 engine/tests/Functional.curl/spec
> delete mode 100644 engine/tests/Functional.expat/Functional.expat.spec
> create mode 100644 engine/tests/Functional.expat/spec
> delete mode 100644
> engine/tests/Functional.fixesproto/Functional.fixesproto.spec
> create mode 100644 engine/tests/Functional.fixesproto/spec
> delete mode 100644
> engine/tests/Functional.fontconfig/Functional.fontconfig.spec
> create mode 100644 engine/tests/Functional.fontconfig/spec
> delete mode 100644 engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
> create mode 100644 engine/tests/Functional.fsfuzz/spec
> delete mode 100644
> engine/tests/Functional.ft2demos/Functional.ft2demos.spec
> create mode 100644 engine/tests/Functional.ft2demos/spec
> delete mode 100644
> engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
> create mode 100644 engine/tests/Functional.fuego_abort/spec
> delete mode 100644
> engine/tests/Functional.fuego_board_check/Functional.fuego_board_check
> .spec
> create mode 100644 engine/tests/Functional.fuego_board_check/spec
> delete mode 100644
> engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.
> spec
> create mode 100644 engine/tests/Functional.fuego_test_phases/spec
> delete mode 100644
> engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
> create mode 100644 engine/tests/Functional.fuego_transport/spec
> delete mode 100644 engine/tests/Functional.fuse/Functional.fuse.spec
> create mode 100644 engine/tests/Functional.fuse/spec
> delete mode 100644 engine/tests/Functional.giflib/Functional.giflib.spec
> create mode 100644 engine/tests/Functional.giflib/spec
> delete mode 100644 engine/tests/Functional.glib/Functional.glib.spec
> create mode 100644 engine/tests/Functional.glib/spec
> delete mode 100644 engine/tests/Functional.glib2/Functional.glib2.spec
> create mode 100644 engine/tests/Functional.glib2/spec
> delete mode 100644 engine/tests/Functional.glibc/Functional.glibc.spec
> create mode 100644 engine/tests/Functional.glibc/spec
> delete mode 100644
> engine/tests/Functional.hciattach/Functional.hciattach.spec
> create mode 100644 engine/tests/Functional.hciattach/spec
> delete mode 100644
> engine/tests/Functional.hello_world/Functional.hello_world.spec
> create mode 100644 engine/tests/Functional.hello_world/spec
> delete mode 100644
> engine/tests/Functional.imagemagick/Functional.imagemagick.spec
> create mode 100644 engine/tests/Functional.imagemagick/spec
> delete mode 100644
> engine/tests/Functional.iptables/Functional.iptables.spec
> create mode 100644 engine/tests/Functional.iptables/spec
> delete mode 100644 engine/tests/Functional.iputils/Functional.iputils.spec
> create mode 100644 engine/tests/Functional.iputils/spec
> delete mode 100644
> engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
> create mode 100644 engine/tests/Functional.ipv6connect/spec
> delete mode 100644 engine/tests/Functional.jpeg/Functional.jpeg.spec
> create mode 100644 engine/tests/Functional.jpeg/spec
> delete mode 100644
> engine/tests/Functional.kernel_build/Functional.kernel_build.spec
> create mode 100644 engine/tests/Functional.kernel_build/spec
> delete mode 100644 engine/tests/Functional.kmod/Functional.kmod.spec
> create mode 100644 engine/tests/Functional.kmod/spec
> delete mode 100644 engine/tests/Functional.libogg/Functional.libogg.spec
> create mode 100644 engine/tests/Functional.libogg/spec
> delete mode 100644
> engine/tests/Functional.libpcap/Functional.libpcap.spec
> create mode 100644 engine/tests/Functional.libpcap/spec
> delete mode 100644 engine/tests/Functional.librsvg/Functional.librsvg.spec
> create mode 100644 engine/tests/Functional.librsvg/spec
> delete mode 100644
> engine/tests/Functional.libspeex/Functional.libspeex.spec
> create mode 100644 engine/tests/Functional.libspeex/spec
> delete mode 100644 engine/tests/Functional.libtar/Functional.libtar.spec
> create mode 100644 engine/tests/Functional.libtar/spec
> delete mode 100644
> engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
> create mode 100644 engine/tests/Functional.libwebsocket/spec
> delete mode 100644
> engine/tests/Functional.linus_stress/Functional.linus_stress.spec
> create mode 100644 engine/tests/Functional.linus_stress/spec
> delete mode 100644 engine/tests/Functional.lwip/Functional.lwip.spec
> create mode 100644 engine/tests/Functional.lwip/spec
> delete mode 100644 engine/tests/Functional.mesa-
> demos/Functional.mesa-demos.spec
> create mode 100644 engine/tests/Functional.mesa-demos/spec
> delete mode 100644 engine/tests/Functional.neon/Functional.neon.spec
> create mode 100644 engine/tests/Functional.neon/spec
> delete mode 100644 engine/tests/Functional.net-tools/Functional.net-
> tools.spec
> create mode 100644 engine/tests/Functional.net-tools/spec
> delete mode 100644
> engine/tests/Functional.netperf/Functional.netperf.spec
> create mode 100644 engine/tests/Functional.netperf/spec
> delete mode 100644
> engine/tests/Functional.pi_tests/Functional.pi_tests.spec
> create mode 100644 engine/tests/Functional.pi_tests/spec
> delete mode 100644
> engine/tests/Functional.pixman/Functional.pixman.spec
> create mode 100644 engine/tests/Functional.pixman/spec
> delete mode 100644 engine/tests/Functional.pppd/Functional.pppd.spec
> create mode 100644 engine/tests/Functional.pppd/spec
> delete mode 100644
> engine/tests/Functional.protobuf/Functional.protobuf.spec
> create mode 100644 engine/tests/Functional.protobuf/spec
> delete mode 100644
> engine/tests/Functional.rmaptest/Functional.rmaptest.spec
> create mode 100644 engine/tests/Functional.rmaptest/spec
> delete mode 100644 engine/tests/Functional.scifab/Functional.scifab.spec
> create mode 100644 engine/tests/Functional.scifab/spec
> delete mode 100644
> engine/tests/Functional.scrashme/Functional.scrashme.spec
> create mode 100644 engine/tests/Functional.scrashme/spec
> delete mode 100644 engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
> create mode 100644 engine/tests/Functional.sdhi_0/spec
> delete mode 100644 engine/tests/Functional.stress/Functional.stress.spec
> create mode 100644 engine/tests/Functional.stress/spec
> delete mode 100644
> engine/tests/Functional.synctest/Functional.synctest.spec
> create mode 100644 engine/tests/Functional.synctest/spec
> delete mode 100644 engine/tests/Functional.thrift/Functional.thrift.spec
> create mode 100644 engine/tests/Functional.thrift/spec
> delete mode 100644 engine/tests/Functional.tiff/Functional.tiff.spec
> create mode 100644 engine/tests/Functional.tiff/spec
> delete mode 100644
> engine/tests/Functional.vsomeip/Functional.vsomeip.spec
> create mode 100644 engine/tests/Functional.vsomeip/spec
> delete mode 100644 engine/tests/Functional.xorg-macros/Functional.xorg-
> macros.spec
> create mode 100644 engine/tests/Functional.xorg-macros/spec
> delete mode 100644 engine/tests/Functional.zlib/Functional.zlib.spec
> create mode 100644 engine/tests/Functional.zlib/spec
>
> diff --git a/engine/scripts/ovgen.py b/engine/scripts/ovgen.py
> index f3f77e3..222f54f 100755
> --- a/engine/scripts/ovgen.py
> +++ b/engine/scripts/ovgen.py
> @@ -435,7 +435,7 @@ def generateSpec(ts, fout):
>
> def parseSpec(testdir, testspec):
> # FIXTHIS: get fuego-core from env
> - specpath = '/fuego-core/engine/tests/%s/%s.spec' % (testdir, testdir)
> + specpath = '/fuego-core/engine/tests/%s/spec' % (testdir)
> ts = TestSpecs()
>
> debug_print("Parsing %s spec file" % (specpath))
> diff --git a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
> b/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
> deleted file mode 100644
> index 794ca68..0000000
> --- a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
> +++ /dev/null
> @@ -1,25 +0,0 @@
> - {
> - "testName": "Benchmark.Dhrystone",
> - "fail_case": [
> - {
> - "fail_regexp": "Measured time too small to obtain meaningful
> results",
> - "fail_message": "Measured time too small to obtain meaningful
> results. Please increase LOOPS parameter in Dhrystone test spec."
> - }
> - ],
> - "specs":
> - [
> - {
> - "name":"default",
> - "LOOPS":"10000000"
> - },
> - {
> - "name":"100M",
> - "LOOPS":"100000000"
> - },
> - {
> - "name":"500M",
> - "LOOPS":"500000000"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.Dhrystone/spec
> b/engine/tests/Benchmark.Dhrystone/spec
> new file mode 100644
> index 0000000..794ca68
> --- /dev/null
> +++ b/engine/tests/Benchmark.Dhrystone/spec
> @@ -0,0 +1,25 @@
> + {
> + "testName": "Benchmark.Dhrystone",
> + "fail_case": [
> + {
> + "fail_regexp": "Measured time too small to obtain meaningful
> results",
> + "fail_message": "Measured time too small to obtain meaningful
> results. Please increase LOOPS parameter in Dhrystone test spec."
> + }
> + ],
> + "specs":
> + [
> + {
> + "name":"default",
> + "LOOPS":"10000000"
> + },
> + {
> + "name":"100M",
> + "LOOPS":"100000000"
> + },
> + {
> + "name":"500M",
> + "LOOPS":"500000000"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
> b/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
> deleted file mode 100644
> index d94129d..0000000
> --- a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.GLMark",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.GLMark/spec
> b/engine/tests/Benchmark.GLMark/spec
> new file mode 100644
> index 0000000..d94129d
> --- /dev/null
> +++ b/engine/tests/Benchmark.GLMark/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.GLMark",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
> b/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
> deleted file mode 100644
> index 13ba89b..0000000
> --- a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -{
> - "testName": "Benchmark.IOzone",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "FILE_SIZE":"2M",
> - "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "FILE_SIZE":"2M",
> - "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "FILE_SIZE":"2M",
> - "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> - },
> - {
> - "name":"nopread",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "FILE_SIZE":"2M",
> - "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "FILE_SIZE":"2M",
> - "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Benchmark.IOzone/spec
> b/engine/tests/Benchmark.IOzone/spec
> new file mode 100644
> index 0000000..13ba89b
> --- /dev/null
> +++ b/engine/tests/Benchmark.IOzone/spec
> @@ -0,0 +1,45 @@
> +{
> + "testName": "Benchmark.IOzone",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "FILE_SIZE":"2M",
> + "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "FILE_SIZE":"2M",
> + "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "FILE_SIZE":"2M",
> + "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> + },
> + {
> + "name":"nopread",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "FILE_SIZE":"2M",
> + "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "FILE_SIZE":"2M",
> + "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
> b/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
> deleted file mode 100644
> index e3627bb..0000000
> --- a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
> +++ /dev/null
> @@ -1,20 +0,0 @@
> - {
> - "testName": "Benchmark.Interbench",
> - "specs":
> - [
> - {
> - "name":"default"
> - },
> - {
> - "name":"sata"
> - },
> - {
> - "name":"usb"
> - },
> - {
> - "name":"mmc"
> - }
> -
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.Interbench/spec
> b/engine/tests/Benchmark.Interbench/spec
> new file mode 100644
> index 0000000..e3627bb
> --- /dev/null
> +++ b/engine/tests/Benchmark.Interbench/spec
> @@ -0,0 +1,20 @@
> + {
> + "testName": "Benchmark.Interbench",
> + "specs":
> + [
> + {
> + "name":"default"
> + },
> + {
> + "name":"sata"
> + },
> + {
> + "name":"usb"
> + },
> + {
> + "name":"mmc"
> + }
> +
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.Java/Benchmark.Java.spec
> b/engine/tests/Benchmark.Java/Benchmark.Java.spec
> deleted file mode 100644
> index fdad1c9..0000000
> --- a/engine/tests/Benchmark.Java/Benchmark.Java.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.Java",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.Java/spec
> b/engine/tests/Benchmark.Java/spec
> new file mode 100644
> index 0000000..fdad1c9
> --- /dev/null
> +++ b/engine/tests/Benchmark.Java/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.Java",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
> b/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
> deleted file mode 100644
> index 7c00496..0000000
> --- a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.OpenSSL",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.OpenSSL/spec
> b/engine/tests/Benchmark.OpenSSL/spec
> new file mode 100644
> index 0000000..7c00496
> --- /dev/null
> +++ b/engine/tests/Benchmark.OpenSSL/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.OpenSSL",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
> b/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
> deleted file mode 100644
> index 2b88075..0000000
> --- a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.Stream",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.Stream/spec
> b/engine/tests/Benchmark.Stream/spec
> new file mode 100644
> index 0000000..2b88075
> --- /dev/null
> +++ b/engine/tests/Benchmark.Stream/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.Stream",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git
> a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
> b/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
> deleted file mode 100644
> index b755e31..0000000
> --- a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> - {
> - "testName": "Benchmark.Whetstone",
> - "specs":
> - [
> - {
> - "name":"default",
> - "LOOPS":"100000"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.Whetstone/spec
> b/engine/tests/Benchmark.Whetstone/spec
> new file mode 100644
> index 0000000..b755e31
> --- /dev/null
> +++ b/engine/tests/Benchmark.Whetstone/spec
> @@ -0,0 +1,11 @@
> + {
> + "testName": "Benchmark.Whetstone",
> + "specs":
> + [
> + {
> + "name":"default",
> + "LOOPS":"100000"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
> b/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
> deleted file mode 100644
> index 4ed9154..0000000
> --- a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Benchmark.aim7",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Benchmark.aim7/spec
> b/engine/tests/Benchmark.aim7/spec
> new file mode 100644
> index 0000000..4ed9154
> --- /dev/null
> +++ b/engine/tests/Benchmark.aim7/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Benchmark.aim7",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
> b/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
> deleted file mode 100644
> index a12b7e8..0000000
> --- a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
> +++ /dev/null
> @@ -1,16 +0,0 @@
> - {
> - "testName": "Benchmark.blobsallad",
> - "fail_case": [
> - {
> - "fail_regexp": "xrandr: command not found",
> - "fail_message": "target system does not have xrandr"
> - }
> - ],
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.blobsallad/spec
> b/engine/tests/Benchmark.blobsallad/spec
> new file mode 100644
> index 0000000..a12b7e8
> --- /dev/null
> +++ b/engine/tests/Benchmark.blobsallad/spec
> @@ -0,0 +1,16 @@
> + {
> + "testName": "Benchmark.blobsallad",
> + "fail_case": [
> + {
> + "fail_regexp": "xrandr: command not found",
> + "fail_message": "target system does not have xrandr"
> + }
> + ],
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
> b/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
> deleted file mode 100644
> index 426f94b..0000000
> --- a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -{
> - "testName": "Benchmark.bonnie",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "SIZE":"32",
> - "RAM":"0",
> - "ROOT":"true"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "SIZE":"32",
> - "RAM":"0",
> - "ROOT":"true"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "SIZE":"32",
> - "RAM":"0",
> - "ROOT":"true"
> - },
> - {
> - "name":"noroot",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "SIZE":"32",
> - "RAM":"0",
> - "ROOT":"false"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "SIZE":"32",
> - "RAM":"0",
> - "ROOT":"true"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.bonnie/spec
> b/engine/tests/Benchmark.bonnie/spec
> new file mode 100644
> index 0000000..426f94b
> --- /dev/null
> +++ b/engine/tests/Benchmark.bonnie/spec
> @@ -0,0 +1,47 @@
> +{
> + "testName": "Benchmark.bonnie",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "SIZE":"32",
> + "RAM":"0",
> + "ROOT":"true"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "SIZE":"32",
> + "RAM":"0",
> + "ROOT":"true"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "SIZE":"32",
> + "RAM":"0",
> + "ROOT":"true"
> + },
> + {
> + "name":"noroot",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "SIZE":"32",
> + "RAM":"0",
> + "ROOT":"false"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "SIZE":"32",
> + "RAM":"0",
> + "ROOT":"true"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
> b/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
> deleted file mode 100644
> index 617c1ac..0000000
> --- a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -{
> - "testName": "Benchmark.cyclictest",
> - "specs":
> - [
> - {
> - "name":"default",
> - "LOOPS":"10000"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.cyclictest/spec
> b/engine/tests/Benchmark.cyclictest/spec
> new file mode 100644
> index 0000000..617c1ac
> --- /dev/null
> +++ b/engine/tests/Benchmark.cyclictest/spec
> @@ -0,0 +1,11 @@
> +{
> + "testName": "Benchmark.cyclictest",
> + "specs":
> + [
> + {
> + "name":"default",
> + "LOOPS":"10000"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
> b/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
> deleted file mode 100644
> index f7700ab..0000000
> --- a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -{
> - "testName": "Benchmark.dbench",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "TIMELIMIT":"10",
> - "NPROCS":"2"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "TIMELIMIT":"10",
> - "NPROCS":"2"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "TIMELIMIT":"10",
> - "NPROCS":"2"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"/a",
> - "TIMELIMIT":"10",
> - "NPROCS":"2"
> - },
> - {
> - "name":"testdir",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "TIMELIMIT":"10",
> - "NPROCS":"2"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.dbench/spec
> b/engine/tests/Benchmark.dbench/spec
> new file mode 100644
> index 0000000..f7700ab
> --- /dev/null
> +++ b/engine/tests/Benchmark.dbench/spec
> @@ -0,0 +1,42 @@
> +{
> + "testName": "Benchmark.dbench",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "TIMELIMIT":"10",
> + "NPROCS":"2"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "TIMELIMIT":"10",
> + "NPROCS":"2"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "TIMELIMIT":"10",
> + "NPROCS":"2"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"/a",
> + "TIMELIMIT":"10",
> + "NPROCS":"2"
> + },
> + {
> + "name":"testdir",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "TIMELIMIT":"10",
> + "NPROCS":"2"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
> b/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
> deleted file mode 100644
> index 062fc1f..0000000
> --- a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> - "testName": "Benchmark.ebizzy",
> - "specs":
> - [
> - {
> - "name":"default",
> - "CHUNKS":"1000",
> - "CHUNK_SIZE":"51200",
> - "TIME":"100",
> - "THREADS":"100"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.ebizzy/spec
> b/engine/tests/Benchmark.ebizzy/spec
> new file mode 100644
> index 0000000..062fc1f
> --- /dev/null
> +++ b/engine/tests/Benchmark.ebizzy/spec
> @@ -0,0 +1,14 @@
> +{
> + "testName": "Benchmark.ebizzy",
> + "specs":
> + [
> + {
> + "name":"default",
> + "CHUNKS":"1000",
> + "CHUNK_SIZE":"51200",
> + "TIME":"100",
> + "THREADS":"100"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
> b/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
> deleted file mode 100644
> index acff523..0000000
> --- a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -{
> - "testName": "Benchmark.ffsb",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Benchmark.ffsb/spec
> b/engine/tests/Benchmark.ffsb/spec
> new file mode 100644
> index 0000000..acff523
> --- /dev/null
> +++ b/engine/tests/Benchmark.ffsb/spec
> @@ -0,0 +1,30 @@
> +{
> + "testName": "Benchmark.ffsb",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Benchmark.fio/Benchmark.fio.spec
> b/engine/tests/Benchmark.fio/Benchmark.fio.spec
> deleted file mode 100644
> index 947015d..0000000
> --- a/engine/tests/Benchmark.fio/Benchmark.fio.spec
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -{
> - "testName": "Benchmark.fio",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "TIMEOUT":"10"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "TIMEOUT":"10"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "TIMEOUT":"10"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "TIMEOUT":"10"
> - }
> -
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Benchmark.fio/spec
> b/engine/tests/Benchmark.fio/spec
> new file mode 100644
> index 0000000..947015d
> --- /dev/null
> +++ b/engine/tests/Benchmark.fio/spec
> @@ -0,0 +1,35 @@
> +{
> + "testName": "Benchmark.fio",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "TIMEOUT":"10"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "TIMEOUT":"10"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "TIMEOUT":"10"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "TIMEOUT":"10"
> + }
> +
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
> b/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
> deleted file mode 100644
> index 7a6623b..0000000
> --- a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Benchmark.fs_mark",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Benchmark.fs_mark/spec
> b/engine/tests/Benchmark.fs_mark/spec
> new file mode 100644
> index 0000000..7a6623b
> --- /dev/null
> +++ b/engine/tests/Benchmark.fs_mark/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Benchmark.fs_mark",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_pl
> ots.spec
> b/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_pl
> ots.spec
> deleted file mode 100644
> index 5ae2190..0000000
> ---
> a/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_pl
> ots.spec
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -{
> - "testName": "Benchmark.fuego_check_plots",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Benchmark.fuego_check_plots/spec
> b/engine/tests/Benchmark.fuego_check_plots/spec
> new file mode 100644
> index 0000000..5ae2190
> --- /dev/null
> +++ b/engine/tests/Benchmark.fuego_check_plots/spec
> @@ -0,0 +1,13 @@
> +{
> + "testName": "Benchmark.fuego_check_plots",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
> b/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
> deleted file mode 100644
> index 9ec9d5f..0000000
> --- a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
> +++ /dev/null
> @@ -1,16 +0,0 @@
> - {
> - "testName": "Benchmark.gtkperf",
> - "fail_case": [
> - {
> - "fail_regexp": "xrandr: command not found",
> - "fail_message": "target system does not have xrandr"
> - }
> - ],
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.gtkperf/spec
> b/engine/tests/Benchmark.gtkperf/spec
> new file mode 100644
> index 0000000..9ec9d5f
> --- /dev/null
> +++ b/engine/tests/Benchmark.gtkperf/spec
> @@ -0,0 +1,16 @@
> + {
> + "testName": "Benchmark.gtkperf",
> + "fail_case": [
> + {
> + "fail_regexp": "xrandr: command not found",
> + "fail_message": "target system does not have xrandr"
> + }
> + ],
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
> b/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
> deleted file mode 100644
> index f915796..0000000
> --- a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -{
> - "testName": "Benchmark.hackbench",
> - "specs":
> - [
> - {
> - "name":"default",
> - "GPOUPS":"20"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.hackbench/spec
> b/engine/tests/Benchmark.hackbench/spec
> new file mode 100644
> index 0000000..f915796
> --- /dev/null
> +++ b/engine/tests/Benchmark.hackbench/spec
> @@ -0,0 +1,11 @@
> +{
> + "testName": "Benchmark.hackbench",
> + "specs":
> + [
> + {
> + "name":"default",
> + "GPOUPS":"20"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
> b/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
> deleted file mode 100644
> index 4cb58d6..0000000
> --- a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.himeno",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.himeno/spec
> b/engine/tests/Benchmark.himeno/spec
> new file mode 100644
> index 0000000..4cb58d6
> --- /dev/null
> +++ b/engine/tests/Benchmark.himeno/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.himeno",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
> b/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
> deleted file mode 100644
> index e4429f4..0000000
> --- a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -{
> - "testName": "Benchmark.iperf",
> - "specs":
> - [
> - {
> - "name":"default",
> - "SRV":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.iperf/spec
> b/engine/tests/Benchmark.iperf/spec
> new file mode 100644
> index 0000000..e4429f4
> --- /dev/null
> +++ b/engine/tests/Benchmark.iperf/spec
> @@ -0,0 +1,11 @@
> +{
> + "testName": "Benchmark.iperf",
> + "specs":
> + [
> + {
> + "name":"default",
> + "SRV":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
> b/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
> deleted file mode 100644
> index 9e1ca86..0000000
> --- a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.linpack",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.linpack/spec
> b/engine/tests/Benchmark.linpack/spec
> new file mode 100644
> index 0000000..9e1ca86
> --- /dev/null
> +++ b/engine/tests/Benchmark.linpack/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.linpack",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
> b/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
> deleted file mode 100644
> index f1055c4..0000000
> --- a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.lmbench2",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.lmbench2/spec
> b/engine/tests/Benchmark.lmbench2/spec
> new file mode 100644
> index 0000000..f1055c4
> --- /dev/null
> +++ b/engine/tests/Benchmark.lmbench2/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.lmbench2",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-
> byte.spec b/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-
> byte.spec
> deleted file mode 100644
> index 319b42d..0000000
> --- a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Benchmark.nbench-byte",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Benchmark.nbench-byte/spec
> b/engine/tests/Benchmark.nbench-byte/spec
> new file mode 100644
> index 0000000..319b42d
> --- /dev/null
> +++ b/engine/tests/Benchmark.nbench-byte/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Benchmark.nbench-byte",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
> b/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
> deleted file mode 100644
> index 2dab856..0000000
> --- a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.nbench_byte",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.nbench_byte/spec
> b/engine/tests/Benchmark.nbench_byte/spec
> new file mode 100644
> index 0000000..2dab856
> --- /dev/null
> +++ b/engine/tests/Benchmark.nbench_byte/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.nbench_byte",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
> b/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
> deleted file mode 100644
> index eac8fcd..0000000
> --- a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> - "testName": "Benchmark.netperf",
> - "specs":
> - [
> - {
> - "name":"default",
> - "SRV":"default"
> - },
> - {
> - "name":"docker",
> - "SRV":"docker"
> - }
> - ]
> -}
> diff --git a/engine/tests/Benchmark.netperf/spec
> b/engine/tests/Benchmark.netperf/spec
> new file mode 100644
> index 0000000..eac8fcd
> --- /dev/null
> +++ b/engine/tests/Benchmark.netperf/spec
> @@ -0,0 +1,14 @@
> +{
> + "testName": "Benchmark.netperf",
> + "specs":
> + [
> + {
> + "name":"default",
> + "SRV":"default"
> + },
> + {
> + "name":"docker",
> + "SRV":"docker"
> + }
> + ]
> +}
> diff --git a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
> b/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
> deleted file mode 100644
> index 0ed6717..0000000
> --- a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -{
> - "testName": "Benchmark.netpipe",
> - "specs":
> - [
> - {
> - "name":"default",
> - "SRV":"default",
> - "PERT":"2"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.netpipe/spec
> b/engine/tests/Benchmark.netpipe/spec
> new file mode 100644
> index 0000000..0ed6717
> --- /dev/null
> +++ b/engine/tests/Benchmark.netpipe/spec
> @@ -0,0 +1,12 @@
> +{
> + "testName": "Benchmark.netpipe",
> + "specs":
> + [
> + {
> + "name":"default",
> + "SRV":"default",
> + "PERT":"2"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
> b/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
> deleted file mode 100644
> index c67f4a5..0000000
> --- a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> - {
> - "testName": "Benchmark.reboot",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.reboot/spec
> b/engine/tests/Benchmark.reboot/spec
> new file mode 100644
> index 0000000..c67f4a5
> --- /dev/null
> +++ b/engine/tests/Benchmark.reboot/spec
> @@ -0,0 +1,10 @@
> + {
> + "testName": "Benchmark.reboot",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
> b/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
> deleted file mode 100644
> index 0b2f09d..0000000
> --- a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> - {
> - "testName": "Benchmark.signaltest",
> - "specs":
> - [
> - {
> - "name":"default",
> - "LOOPS":"10000"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.signaltest/spec
> b/engine/tests/Benchmark.signaltest/spec
> new file mode 100644
> index 0000000..0b2f09d
> --- /dev/null
> +++ b/engine/tests/Benchmark.signaltest/spec
> @@ -0,0 +1,11 @@
> + {
> + "testName": "Benchmark.signaltest",
> + "specs":
> + [
> + {
> + "name":"default",
> + "LOOPS":"10000"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
> b/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
> deleted file mode 100644
> index ffe4534..0000000
> --- a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Benchmark.sysbench",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Benchmark.sysbench/spec
> b/engine/tests/Benchmark.sysbench/spec
> new file mode 100644
> index 0000000..ffe4534
> --- /dev/null
> +++ b/engine/tests/Benchmark.sysbench/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Benchmark.sysbench",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
> b/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
> deleted file mode 100644
> index e38a7d7..0000000
> --- a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -{
> - "testName": "Benchmark.tiobench",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "THREADS":"4",
> - "SIZE":"10"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "THREADS":"4",
> - "SIZE":"10"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "THREADS":"4",
> - "SIZE":"10"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "THREADS":"4",
> - "SIZE":"10"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Benchmark.tiobench/spec
> b/engine/tests/Benchmark.tiobench/spec
> new file mode 100644
> index 0000000..e38a7d7
> --- /dev/null
> +++ b/engine/tests/Benchmark.tiobench/spec
> @@ -0,0 +1,38 @@
> +{
> + "testName": "Benchmark.tiobench",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "THREADS":"4",
> + "SIZE":"10"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "THREADS":"4",
> + "SIZE":"10"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "THREADS":"4",
> + "SIZE":"10"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "THREADS":"4",
> + "SIZE":"10"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
> b/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
> deleted file mode 100644
> index 602bc2d..0000000
> --- a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -{
> - "testName": "Benchmark.x11perf",
> - "specs":
> - [
> - {
> - "name":"default",
> - "TIME":"1"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Benchmark.x11perf/spec
> b/engine/tests/Benchmark.x11perf/spec
> new file mode 100644
> index 0000000..602bc2d
> --- /dev/null
> +++ b/engine/tests/Benchmark.x11perf/spec
> @@ -0,0 +1,11 @@
> +{
> + "testName": "Benchmark.x11perf",
> + "specs":
> + [
> + {
> + "name":"default",
> + "TIME":"1"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Functional.LTP/Functional.LTP.spec
> b/engine/tests/Functional.LTP/Functional.LTP.spec
> deleted file mode 100644
> index 1c1a090..0000000
> --- a/engine/tests/Functional.LTP/Functional.LTP.spec
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -{
> - "testName": "Functional.LTP",
> - "specs":
> - [
> - {
> - "name": "default",
> - "tests": "syscalls SEM"
> - },
> - {
> - "name": "selection",
> - "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM
> SIG THR TMR TPS"
> - },
> - {
> - "name": "selectionwithrt",
> - "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM
> SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate
> func/sched_latency func/sched_jitter"
> - },
> - {
> - "name": "ltplite",
> - "tests": "ltplite"
> - },
> - {
> - "name": "ptsonly",
> - "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
> - },
> - {
> - "name": "smoketest",
> - "tests": "fs_bind"
> - },
> - {
> - "name": "rtonly",
> - "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate
> func/sched_latency func/sched_jitter"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.LTP/spec
> b/engine/tests/Functional.LTP/spec
> new file mode 100644
> index 0000000..1c1a090
> --- /dev/null
> +++ b/engine/tests/Functional.LTP/spec
> @@ -0,0 +1,34 @@
> +{
> + "testName": "Functional.LTP",
> + "specs":
> + [
> + {
> + "name": "default",
> + "tests": "syscalls SEM"
> + },
> + {
> + "name": "selection",
> + "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM
> SIG THR TMR TPS"
> + },
> + {
> + "name": "selectionwithrt",
> + "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO MSG SEM
> SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate
> func/sched_latency func/sched_jitter"
> + },
> + {
> + "name": "ltplite",
> + "tests": "ltplite"
> + },
> + {
> + "name": "ptsonly",
> + "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
> + },
> + {
> + "name": "smoketest",
> + "tests": "fs_bind"
> + },
> + {
> + "name": "rtonly",
> + "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate
> func/sched_latency func/sched_jitter"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
> b/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
> deleted file mode 100644
> index d3e4df0..0000000
> --- a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.OpenSSL",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.OpenSSL/spec
> b/engine/tests/Functional.OpenSSL/spec
> new file mode 100644
> index 0000000..d3e4df0
> --- /dev/null
> +++ b/engine/tests/Functional.OpenSSL/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.OpenSSL",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.aiostress/Functional.aiostress.spec
> b/engine/tests/Functional.aiostress/Functional.aiostress.spec
> deleted file mode 100644
> index d41f4a0..0000000
> --- a/engine/tests/Functional.aiostress/Functional.aiostress.spec
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -{
> - "testName": "Functional.aiostress",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "SIZE":"20M"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "SIZE":"20M"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "SIZE":"20M"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "SIZE":"20M"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.aiostress/spec
> b/engine/tests/Functional.aiostress/spec
> new file mode 100644
> index 0000000..d41f4a0
> --- /dev/null
> +++ b/engine/tests/Functional.aiostress/spec
> @@ -0,0 +1,31 @@
> +{
> + "testName": "Functional.aiostress",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "SIZE":"20M"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "SIZE":"20M"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "SIZE":"20M"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "SIZE":"20M"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
> b/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
> deleted file mode 100644
> index 3d28603..0000000
> --- a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.arch_timer",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.arch_timer/spec
> b/engine/tests/Functional.arch_timer/spec
> new file mode 100644
> index 0000000..3d28603
> --- /dev/null
> +++ b/engine/tests/Functional.arch_timer/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.arch_timer",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.bc/Functional.bc.spec
> b/engine/tests/Functional.bc/Functional.bc.spec
> deleted file mode 100644
> index 9b22ea6..0000000
> --- a/engine/tests/Functional.bc/Functional.bc.spec
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -{
> - "testName": "Functional.bc",
> - "fail_case": [
> - {
> - "fail_regexp": "some test regexp",
> - "fail_message": "some test message"
> - },
> - {
> - "fail_regexp": "Bug",
> - "fail_message": "Bug or Oops detected in system log",
> - "use_syslog": "1"
> - }
> - ],
> - "specs":
> - [
> - {
> - "name":"bc-mult",
> - "EXPR":"2*2",
> - "RESULT": "4"
> - },
> - {
> - "name":"bc-add",
> - "EXPR":"3+3",
> - "RESULT":"6"
> - },
> - {
> - "name":"default",
> - "EXPR":"3+3",
> - "RESULT":"6"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.bc/spec
> b/engine/tests/Functional.bc/spec
> new file mode 100644
> index 0000000..9b22ea6
> --- /dev/null
> +++ b/engine/tests/Functional.bc/spec
> @@ -0,0 +1,33 @@
> +{
> + "testName": "Functional.bc",
> + "fail_case": [
> + {
> + "fail_regexp": "some test regexp",
> + "fail_message": "some test message"
> + },
> + {
> + "fail_regexp": "Bug",
> + "fail_message": "Bug or Oops detected in system log",
> + "use_syslog": "1"
> + }
> + ],
> + "specs":
> + [
> + {
> + "name":"bc-mult",
> + "EXPR":"2*2",
> + "RESULT": "4"
> + },
> + {
> + "name":"bc-add",
> + "EXPR":"3+3",
> + "RESULT":"6"
> + },
> + {
> + "name":"default",
> + "EXPR":"3+3",
> + "RESULT":"6"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Functional.boost/Functional.boost.spec
> b/engine/tests/Functional.boost/Functional.boost.spec
> deleted file mode 100644
> index b25b352..0000000
> --- a/engine/tests/Functional.boost/Functional.boost.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -{
> - "testName": "Functional.boost",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.boost/spec
> b/engine/tests/Functional.boost/spec
> new file mode 100644
> index 0000000..b25b352
> --- /dev/null
> +++ b/engine/tests/Functional.boost/spec
> @@ -0,0 +1,10 @@
> +{
> + "testName": "Functional.boost",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
> b/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
> deleted file mode 100644
> index 538beee..0000000
> --- a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.bsdiff",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.bsdiff/spec
> b/engine/tests/Functional.bsdiff/spec
> new file mode 100644
> index 0000000..538beee
> --- /dev/null
> +++ b/engine/tests/Functional.bsdiff/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.bsdiff",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.bzip2/Functional.bzip2.spec
> b/engine/tests/Functional.bzip2/Functional.bzip2.spec
> deleted file mode 100644
> index 9350805..0000000
> --- a/engine/tests/Functional.bzip2/Functional.bzip2.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.bzip2",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.bzip2/spec
> b/engine/tests/Functional.bzip2/spec
> new file mode 100644
> index 0000000..9350805
> --- /dev/null
> +++ b/engine/tests/Functional.bzip2/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.bzip2",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.cmt/Functional.cmt.spec
> b/engine/tests/Functional.cmt/Functional.cmt.spec
> deleted file mode 100644
> index d88d487..0000000
> --- a/engine/tests/Functional.cmt/Functional.cmt.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.cmt",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.cmt/spec
> b/engine/tests/Functional.cmt/spec
> new file mode 100644
> index 0000000..d88d487
> --- /dev/null
> +++ b/engine/tests/Functional.cmt/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.cmt",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.sp
> ec
> b/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.sp
> ec
> deleted file mode 100644
> index 401ce13..0000000
> ---
> a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.sp
> ec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.commonAPI_C++",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.commonAPI_C++/spec
> b/engine/tests/Functional.commonAPI_C++/spec
> new file mode 100644
> index 0000000..401ce13
> --- /dev/null
> +++ b/engine/tests/Functional.commonAPI_C++/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.commonAPI_C++",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.
> spec
> b/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.
> spec
> deleted file mode 100644
> index 699e591..0000000
> ---
> a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.
> spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.commonAPI_Dbus",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.commonAPI_Dbus/spec
> b/engine/tests/Functional.commonAPI_Dbus/spec
> new file mode 100644
> index 0000000..699e591
> --- /dev/null
> +++ b/engine/tests/Functional.commonAPI_Dbus/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.commonAPI_Dbus",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_So
> meIp.spec
> b/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_So
> meIp.spec
> deleted file mode 100644
> index 4ca9398..0000000
> ---
> a/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_So
> meIp.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.commonAPI_SomeIp",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.commonAPI_SomeIp/spec
> b/engine/tests/Functional.commonAPI_SomeIp/spec
> new file mode 100644
> index 0000000..4ca9398
> --- /dev/null
> +++ b/engine/tests/Functional.commonAPI_SomeIp/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.commonAPI_SomeIp",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.crashme/Functional.crashme.spec
> b/engine/tests/Functional.crashme/Functional.crashme.spec
> deleted file mode 100644
> index 1793be3..0000000
> --- a/engine/tests/Functional.crashme/Functional.crashme.spec
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> - "testName": "Functional.crashme",
> - "specs":
> - [
> - {
> - "name":"default",
> - "NBYTES":"1000",
> - "INC":"1000",
> - "SRAND":"2",
> - "NTRYS":"100",
> - "NSUB":"3000"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.crashme/spec
> b/engine/tests/Functional.crashme/spec
> new file mode 100644
> index 0000000..1793be3
> --- /dev/null
> +++ b/engine/tests/Functional.crashme/spec
> @@ -0,0 +1,14 @@
> +{
> + "testName": "Functional.crashme",
> + "specs":
> + [
> + {
> + "name":"default",
> + "NBYTES":"1000",
> + "INC":"1000",
> + "SRAND":"2",
> + "NTRYS":"100",
> + "NSUB":"3000"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.croco/Functional.croco.spec
> b/engine/tests/Functional.croco/Functional.croco.spec
> deleted file mode 100644
> index bd36f60..0000000
> --- a/engine/tests/Functional.croco/Functional.croco.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.croco",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.croco/spec
> b/engine/tests/Functional.croco/spec
> new file mode 100644
> index 0000000..bd36f60
> --- /dev/null
> +++ b/engine/tests/Functional.croco/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.croco",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.curl/Functional.curl.spec
> b/engine/tests/Functional.curl/Functional.curl.spec
> deleted file mode 100644
> index ee8160a..0000000
> --- a/engine/tests/Functional.curl/Functional.curl.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -{
> - "testName": "Functional.curl",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.curl/spec
> b/engine/tests/Functional.curl/spec
> new file mode 100644
> index 0000000..ee8160a
> --- /dev/null
> +++ b/engine/tests/Functional.curl/spec
> @@ -0,0 +1,10 @@
> +{
> + "testName": "Functional.curl",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git a/engine/tests/Functional.expat/Functional.expat.spec
> b/engine/tests/Functional.expat/Functional.expat.spec
> deleted file mode 100644
> index 2edd1b6..0000000
> --- a/engine/tests/Functional.expat/Functional.expat.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.expat",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.expat/spec
> b/engine/tests/Functional.expat/spec
> new file mode 100644
> index 0000000..2edd1b6
> --- /dev/null
> +++ b/engine/tests/Functional.expat/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.expat",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
> b/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
> deleted file mode 100644
> index 2f9ea91..0000000
> --- a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.fixesproto",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.fixesproto/spec
> b/engine/tests/Functional.fixesproto/spec
> new file mode 100644
> index 0000000..2f9ea91
> --- /dev/null
> +++ b/engine/tests/Functional.fixesproto/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.fixesproto",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
> b/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
> deleted file mode 100644
> index 1237d46..0000000
> --- a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.fontconfig",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.fontconfig/spec
> b/engine/tests/Functional.fontconfig/spec
> new file mode 100644
> index 0000000..1237d46
> --- /dev/null
> +++ b/engine/tests/Functional.fontconfig/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.fontconfig",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
> b/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
> deleted file mode 100644
> index 1fb7446..0000000
> --- a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.fsfuzz",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.fsfuzz/spec
> b/engine/tests/Functional.fsfuzz/spec
> new file mode 100644
> index 0000000..1fb7446
> --- /dev/null
> +++ b/engine/tests/Functional.fsfuzz/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.fsfuzz",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
> b/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
> deleted file mode 100644
> index edce877..0000000
> --- a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.ft2demos",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.ft2demos/spec
> b/engine/tests/Functional.ft2demos/spec
> new file mode 100644
> index 0000000..edce877
> --- /dev/null
> +++ b/engine/tests/Functional.ft2demos/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.ft2demos",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
> b/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
> deleted file mode 100644
> index 47c6eda..0000000
> --- a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -{
> - "testName": "Functional.fuego_test_phases",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.fuego_abort/spec
> b/engine/tests/Functional.fuego_abort/spec
> new file mode 100644
> index 0000000..47c6eda
> --- /dev/null
> +++ b/engine/tests/Functional.fuego_abort/spec
> @@ -0,0 +1,10 @@
> +{
> + "testName": "Functional.fuego_test_phases",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git
> a/engine/tests/Functional.fuego_board_check/Functional.fuego_board_che
> ck.spec
> b/engine/tests/Functional.fuego_board_check/Functional.fuego_board_ch
> eck.spec
> deleted file mode 100644
> index 05ff8e6..0000000
> ---
> a/engine/tests/Functional.fuego_board_check/Functional.fuego_board_che
> ck.spec
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -{
> - "testName": "Functional.fuego_board_check",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Functional.fuego_board_check/spec
> b/engine/tests/Functional.fuego_board_check/spec
> new file mode 100644
> index 0000000..05ff8e6
> --- /dev/null
> +++ b/engine/tests/Functional.fuego_board_check/spec
> @@ -0,0 +1,13 @@
> +{
> + "testName": "Functional.fuego_board_check",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git
> a/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phase
> s.spec
> b/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phase
> s.spec
> deleted file mode 100644
> index 47c6eda..0000000
> ---
> a/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phase
> s.spec
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -{
> - "testName": "Functional.fuego_test_phases",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.fuego_test_phases/spec
> b/engine/tests/Functional.fuego_test_phases/spec
> new file mode 100644
> index 0000000..47c6eda
> --- /dev/null
> +++ b/engine/tests/Functional.fuego_test_phases/spec
> @@ -0,0 +1,10 @@
> +{
> + "testName": "Functional.fuego_test_phases",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> +
> diff --git
> a/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spe
> c
> b/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spe
> c
> deleted file mode 100644
> index a4fae24..0000000
> ---
> a/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spe
> c
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.fuego_transport",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.fuego_transport/spec
> b/engine/tests/Functional.fuego_transport/spec
> new file mode 100644
> index 0000000..a4fae24
> --- /dev/null
> +++ b/engine/tests/Functional.fuego_transport/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.fuego_transport",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.fuse/Functional.fuse.spec
> b/engine/tests/Functional.fuse/Functional.fuse.spec
> deleted file mode 100644
> index 11a0ffc..0000000
> --- a/engine/tests/Functional.fuse/Functional.fuse.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.fuse",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.fuse/spec
> b/engine/tests/Functional.fuse/spec
> new file mode 100644
> index 0000000..11a0ffc
> --- /dev/null
> +++ b/engine/tests/Functional.fuse/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.fuse",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.giflib/Functional.giflib.spec
> b/engine/tests/Functional.giflib/Functional.giflib.spec
> deleted file mode 100644
> index 8143cf4..0000000
> --- a/engine/tests/Functional.giflib/Functional.giflib.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.giflib",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.giflib/spec
> b/engine/tests/Functional.giflib/spec
> new file mode 100644
> index 0000000..8143cf4
> --- /dev/null
> +++ b/engine/tests/Functional.giflib/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.giflib",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.glib/Functional.glib.spec
> b/engine/tests/Functional.glib/Functional.glib.spec
> deleted file mode 100644
> index 1266660..0000000
> --- a/engine/tests/Functional.glib/Functional.glib.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.glib",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.glib/spec
> b/engine/tests/Functional.glib/spec
> new file mode 100644
> index 0000000..1266660
> --- /dev/null
> +++ b/engine/tests/Functional.glib/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.glib",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.glib2/Functional.glib2.spec
> b/engine/tests/Functional.glib2/Functional.glib2.spec
> deleted file mode 100644
> index 15bd79f..0000000
> --- a/engine/tests/Functional.glib2/Functional.glib2.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.glib2",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.glib2/spec
> b/engine/tests/Functional.glib2/spec
> new file mode 100644
> index 0000000..15bd79f
> --- /dev/null
> +++ b/engine/tests/Functional.glib2/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.glib2",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.glibc/Functional.glibc.spec
> b/engine/tests/Functional.glibc/Functional.glibc.spec
> deleted file mode 100644
> index f687253..0000000
> --- a/engine/tests/Functional.glibc/Functional.glibc.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.glibc",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.glibc/spec
> b/engine/tests/Functional.glibc/spec
> new file mode 100644
> index 0000000..f687253
> --- /dev/null
> +++ b/engine/tests/Functional.glibc/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.glibc",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.hciattach/Functional.hciattach.spec
> b/engine/tests/Functional.hciattach/Functional.hciattach.spec
> deleted file mode 100644
> index 536da9b..0000000
> --- a/engine/tests/Functional.hciattach/Functional.hciattach.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.hciattach",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.hciattach/spec
> b/engine/tests/Functional.hciattach/spec
> new file mode 100644
> index 0000000..536da9b
> --- /dev/null
> +++ b/engine/tests/Functional.hciattach/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.hciattach",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.hello_world/Functional.hello_world.spec
> b/engine/tests/Functional.hello_world/Functional.hello_world.spec
> deleted file mode 100644
> index 4e1bea5..0000000
> --- a/engine/tests/Functional.hello_world/Functional.hello_world.spec
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -{
> - "testName": "Functional.hello_world",
> - "specs":
> - [
> - {
> - "name":"hello-fail",
> - "ARG":"-f"
> - },
> - {
> - "name":"hello-random",
> - "ARG":"-r"
> - },
> - {
> - "name":"default",
> - "ARG":""
> - }
> - ]
> -}
> -
> diff --git a/engine/tests/Functional.hello_world/spec
> b/engine/tests/Functional.hello_world/spec
> new file mode 100644
> index 0000000..4e1bea5
> --- /dev/null
> +++ b/engine/tests/Functional.hello_world/spec
> @@ -0,0 +1,19 @@
> +{
> + "testName": "Functional.hello_world",
> + "specs":
> + [
> + {
> + "name":"hello-fail",
> + "ARG":"-f"
> + },
> + {
> + "name":"hello-random",
> + "ARG":"-r"
> + },
> + {
> + "name":"default",
> + "ARG":""
> + }
> + ]
> +}
> +
> diff --git
> a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
> b/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
> deleted file mode 100644
> index 0c9babc..0000000
> --- a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.imagemagick",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.imagemagick/spec
> b/engine/tests/Functional.imagemagick/spec
> new file mode 100644
> index 0000000..0c9babc
> --- /dev/null
> +++ b/engine/tests/Functional.imagemagick/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.imagemagick",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.iptables/Functional.iptables.spec
> b/engine/tests/Functional.iptables/Functional.iptables.spec
> deleted file mode 100644
> index 101d26b..0000000
> --- a/engine/tests/Functional.iptables/Functional.iptables.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.iptables",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.iptables/spec
> b/engine/tests/Functional.iptables/spec
> new file mode 100644
> index 0000000..101d26b
> --- /dev/null
> +++ b/engine/tests/Functional.iptables/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.iptables",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.iputils/Functional.iputils.spec
> b/engine/tests/Functional.iputils/Functional.iputils.spec
> deleted file mode 100644
> index 2dc83c7..0000000
> --- a/engine/tests/Functional.iputils/Functional.iputils.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.iputils",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.iputils/spec
> b/engine/tests/Functional.iputils/spec
> new file mode 100644
> index 0000000..2dc83c7
> --- /dev/null
> +++ b/engine/tests/Functional.iputils/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.iputils",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
> b/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
> deleted file mode 100644
> index 0c425b7..0000000
> --- a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.ipv6connect",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.ipv6connect/spec
> b/engine/tests/Functional.ipv6connect/spec
> new file mode 100644
> index 0000000..0c425b7
> --- /dev/null
> +++ b/engine/tests/Functional.ipv6connect/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.ipv6connect",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.jpeg/Functional.jpeg.spec
> b/engine/tests/Functional.jpeg/Functional.jpeg.spec
> deleted file mode 100644
> index a32bc0e..0000000
> --- a/engine/tests/Functional.jpeg/Functional.jpeg.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.jpeg",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.jpeg/spec
> b/engine/tests/Functional.jpeg/spec
> new file mode 100644
> index 0000000..a32bc0e
> --- /dev/null
> +++ b/engine/tests/Functional.jpeg/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.jpeg",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
> b/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
> deleted file mode 100644
> index 39914a8..0000000
> --- a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -{
> - "testName": "Functional.kernel_build",
> - "specs":
> - [
> - {
> - "name": "cip-x86",
> - "repo": "https://github.com/cip-project/linux-cip.git"
> - },
> - {
> - "name": "cip-arm64",
> - "repo": "https://github.com/cip-project/linux-cip.git",
> - "platform": "aarch64",
> - "arch": "arm64",
> - "params": "-j8 Image dtbs modules",
> - "regex_p": "^ OBJCOPY arch/arm64/boot/Image"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.kernel_build/spec
> b/engine/tests/Functional.kernel_build/spec
> new file mode 100644
> index 0000000..39914a8
> --- /dev/null
> +++ b/engine/tests/Functional.kernel_build/spec
> @@ -0,0 +1,18 @@
> +{
> + "testName": "Functional.kernel_build",
> + "specs":
> + [
> + {
> + "name": "cip-x86",
> + "repo": "https://github.com/cip-project/linux-cip.git"
> + },
> + {
> + "name": "cip-arm64",
> + "repo": "https://github.com/cip-project/linux-cip.git",
> + "platform": "aarch64",
> + "arch": "arm64",
> + "params": "-j8 Image dtbs modules",
> + "regex_p": "^ OBJCOPY arch/arm64/boot/Image"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.kmod/Functional.kmod.spec
> b/engine/tests/Functional.kmod/Functional.kmod.spec
> deleted file mode 100644
> index 33df4b1..0000000
> --- a/engine/tests/Functional.kmod/Functional.kmod.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.kmod",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.kmod/spec
> b/engine/tests/Functional.kmod/spec
> new file mode 100644
> index 0000000..33df4b1
> --- /dev/null
> +++ b/engine/tests/Functional.kmod/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.kmod",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.libogg/Functional.libogg.spec
> b/engine/tests/Functional.libogg/Functional.libogg.spec
> deleted file mode 100644
> index 8b5b2b8..0000000
> --- a/engine/tests/Functional.libogg/Functional.libogg.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.libogg",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.libogg/spec
> b/engine/tests/Functional.libogg/spec
> new file mode 100644
> index 0000000..8b5b2b8
> --- /dev/null
> +++ b/engine/tests/Functional.libogg/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.libogg",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.libpcap/Functional.libpcap.spec
> b/engine/tests/Functional.libpcap/Functional.libpcap.spec
> deleted file mode 100644
> index 3130092..0000000
> --- a/engine/tests/Functional.libpcap/Functional.libpcap.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.libpcap",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.libpcap/spec
> b/engine/tests/Functional.libpcap/spec
> new file mode 100644
> index 0000000..3130092
> --- /dev/null
> +++ b/engine/tests/Functional.libpcap/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.libpcap",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.librsvg/Functional.librsvg.spec
> b/engine/tests/Functional.librsvg/Functional.librsvg.spec
> deleted file mode 100644
> index 0a15abe..0000000
> --- a/engine/tests/Functional.librsvg/Functional.librsvg.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.librsvg",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.librsvg/spec
> b/engine/tests/Functional.librsvg/spec
> new file mode 100644
> index 0000000..0a15abe
> --- /dev/null
> +++ b/engine/tests/Functional.librsvg/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.librsvg",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.libspeex/Functional.libspeex.spec
> b/engine/tests/Functional.libspeex/Functional.libspeex.spec
> deleted file mode 100644
> index a8b066c..0000000
> --- a/engine/tests/Functional.libspeex/Functional.libspeex.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.libspeex",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.libspeex/spec
> b/engine/tests/Functional.libspeex/spec
> new file mode 100644
> index 0000000..a8b066c
> --- /dev/null
> +++ b/engine/tests/Functional.libspeex/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.libspeex",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.libtar/Functional.libtar.spec
> b/engine/tests/Functional.libtar/Functional.libtar.spec
> deleted file mode 100644
> index 1af026b..0000000
> --- a/engine/tests/Functional.libtar/Functional.libtar.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.libtar",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.libtar/spec
> b/engine/tests/Functional.libtar/spec
> new file mode 100644
> index 0000000..1af026b
> --- /dev/null
> +++ b/engine/tests/Functional.libtar/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.libtar",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git
> a/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
> b/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
> deleted file mode 100644
> index f1e6178..0000000
> --- a/engine/tests/Functional.libwebsocket/Functional.libwebsocket.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.libwebsocket",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.libwebsocket/spec
> b/engine/tests/Functional.libwebsocket/spec
> new file mode 100644
> index 0000000..f1e6178
> --- /dev/null
> +++ b/engine/tests/Functional.libwebsocket/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.libwebsocket",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.linus_stress/Functional.linus_stress.spec
> b/engine/tests/Functional.linus_stress/Functional.linus_stress.spec
> deleted file mode 100644
> index 8894892..0000000
> --- a/engine/tests/Functional.linus_stress/Functional.linus_stress.spec
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -{
> - "testName": "Functional.linus_stress",
> - "specs":
> - [
> - {
> - "name":"default",
> - "DIRTY_BG":"2",
> - "DIRTY":"4"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.linus_stress/spec
> b/engine/tests/Functional.linus_stress/spec
> new file mode 100644
> index 0000000..8894892
> --- /dev/null
> +++ b/engine/tests/Functional.linus_stress/spec
> @@ -0,0 +1,11 @@
> +{
> + "testName": "Functional.linus_stress",
> + "specs":
> + [
> + {
> + "name":"default",
> + "DIRTY_BG":"2",
> + "DIRTY":"4"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.lwip/Functional.lwip.spec
> b/engine/tests/Functional.lwip/Functional.lwip.spec
> deleted file mode 100644
> index bb9f9b3..0000000
> --- a/engine/tests/Functional.lwip/Functional.lwip.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.lwip",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.lwip/spec
> b/engine/tests/Functional.lwip/spec
> new file mode 100644
> index 0000000..bb9f9b3
> --- /dev/null
> +++ b/engine/tests/Functional.lwip/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.lwip",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.mesa-demos/Functional.mesa-
> demos.spec b/engine/tests/Functional.mesa-demos/Functional.mesa-
> demos.spec
> deleted file mode 100644
> index 0712e09..0000000
> --- a/engine/tests/Functional.mesa-demos/Functional.mesa-demos.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.mesa-demos",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.mesa-demos/spec
> b/engine/tests/Functional.mesa-demos/spec
> new file mode 100644
> index 0000000..0712e09
> --- /dev/null
> +++ b/engine/tests/Functional.mesa-demos/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.mesa-demos",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.neon/Functional.neon.spec
> b/engine/tests/Functional.neon/Functional.neon.spec
> deleted file mode 100644
> index 348b913..0000000
> --- a/engine/tests/Functional.neon/Functional.neon.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.neon",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.neon/spec
> b/engine/tests/Functional.neon/spec
> new file mode 100644
> index 0000000..348b913
> --- /dev/null
> +++ b/engine/tests/Functional.neon/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.neon",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.net-tools/Functional.net-tools.spec
> b/engine/tests/Functional.net-tools/Functional.net-tools.spec
> deleted file mode 100644
> index f702fa6..0000000
> --- a/engine/tests/Functional.net-tools/Functional.net-tools.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.net-tools",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.net-tools/spec
> b/engine/tests/Functional.net-tools/spec
> new file mode 100644
> index 0000000..f702fa6
> --- /dev/null
> +++ b/engine/tests/Functional.net-tools/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.net-tools",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.netperf/Functional.netperf.spec
> b/engine/tests/Functional.netperf/Functional.netperf.spec
> deleted file mode 100644
> index 2838d34..0000000
> --- a/engine/tests/Functional.netperf/Functional.netperf.spec
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> - "testName": "Functional.netperf",
> - "specs":
> - [
> - {
> - "name":"default",
> - "SRV":"default"
> - },
> - {
> - "name":"docker",
> - "SRV":"docker"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.netperf/spec
> b/engine/tests/Functional.netperf/spec
> new file mode 100644
> index 0000000..2838d34
> --- /dev/null
> +++ b/engine/tests/Functional.netperf/spec
> @@ -0,0 +1,14 @@
> +{
> + "testName": "Functional.netperf",
> + "specs":
> + [
> + {
> + "name":"default",
> + "SRV":"default"
> + },
> + {
> + "name":"docker",
> + "SRV":"docker"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.pi_tests/Functional.pi_tests.spec
> b/engine/tests/Functional.pi_tests/Functional.pi_tests.spec
> deleted file mode 100644
> index 2971959..0000000
> --- a/engine/tests/Functional.pi_tests/Functional.pi_tests.spec
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -{
> - "testName": "Functional.pi_tests",
> - "specs":
> - [
> - {
> - "name":"default",
> - "INVERSIONS":"100",
> - "GROUPS":"1",
> - "TIMEOUT":"10"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.pi_tests/spec
> b/engine/tests/Functional.pi_tests/spec
> new file mode 100644
> index 0000000..2971959
> --- /dev/null
> +++ b/engine/tests/Functional.pi_tests/spec
> @@ -0,0 +1,12 @@
> +{
> + "testName": "Functional.pi_tests",
> + "specs":
> + [
> + {
> + "name":"default",
> + "INVERSIONS":"100",
> + "GROUPS":"1",
> + "TIMEOUT":"10"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.pixman/Functional.pixman.spec
> b/engine/tests/Functional.pixman/Functional.pixman.spec
> deleted file mode 100644
> index 1cd16f8..0000000
> --- a/engine/tests/Functional.pixman/Functional.pixman.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.pixman",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.pixman/spec
> b/engine/tests/Functional.pixman/spec
> new file mode 100644
> index 0000000..1cd16f8
> --- /dev/null
> +++ b/engine/tests/Functional.pixman/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.pixman",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.pppd/Functional.pppd.spec
> b/engine/tests/Functional.pppd/Functional.pppd.spec
> deleted file mode 100644
> index d1cbc93..0000000
> --- a/engine/tests/Functional.pppd/Functional.pppd.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.pppd",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.pppd/spec
> b/engine/tests/Functional.pppd/spec
> new file mode 100644
> index 0000000..d1cbc93
> --- /dev/null
> +++ b/engine/tests/Functional.pppd/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.pppd",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.protobuf/Functional.protobuf.spec
> b/engine/tests/Functional.protobuf/Functional.protobuf.spec
> deleted file mode 100644
> index a04b726..0000000
> --- a/engine/tests/Functional.protobuf/Functional.protobuf.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.protobuf",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.protobuf/spec
> b/engine/tests/Functional.protobuf/spec
> new file mode 100644
> index 0000000..a04b726
> --- /dev/null
> +++ b/engine/tests/Functional.protobuf/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.protobuf",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.rmaptest/Functional.rmaptest.spec
> b/engine/tests/Functional.rmaptest/Functional.rmaptest.spec
> deleted file mode 100644
> index d19b99f..0000000
> --- a/engine/tests/Functional.rmaptest/Functional.rmaptest.spec
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -{
> - "testName": "Functional.rmaptest",
> - "specs":
> - [
> - {
> - "name":"default",
> - "ITERATIONS":"100",
> - "VMA":"100",
> - "VMA_SIZE":"100",
> - "TASKS":"100",
> - "VMAS_FOR_PROCESS":"10"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.rmaptest/spec
> b/engine/tests/Functional.rmaptest/spec
> new file mode 100644
> index 0000000..d19b99f
> --- /dev/null
> +++ b/engine/tests/Functional.rmaptest/spec
> @@ -0,0 +1,14 @@
> +{
> + "testName": "Functional.rmaptest",
> + "specs":
> + [
> + {
> + "name":"default",
> + "ITERATIONS":"100",
> + "VMA":"100",
> + "VMA_SIZE":"100",
> + "TASKS":"100",
> + "VMAS_FOR_PROCESS":"10"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.scifab/Functional.scifab.spec
> b/engine/tests/Functional.scifab/Functional.scifab.spec
> deleted file mode 100644
> index 0ae5344..0000000
> --- a/engine/tests/Functional.scifab/Functional.scifab.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.scifab",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.scifab/spec
> b/engine/tests/Functional.scifab/spec
> new file mode 100644
> index 0000000..0ae5344
> --- /dev/null
> +++ b/engine/tests/Functional.scifab/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.scifab",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.scrashme/Functional.scrashme.spec
> b/engine/tests/Functional.scrashme/Functional.scrashme.spec
> deleted file mode 100644
> index 5065506..0000000
> --- a/engine/tests/Functional.scrashme/Functional.scrashme.spec
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -{
> - "testName": "Functional.scrashme",
> - "specs":
> - [
> - {
> - "name":"default",
> - "NUM":"100",
> - "MODE":"random"
> - },
> - {
> - "name":"rotate",
> - "NUM":"100",
> - "MODE":"rotate"
> - },
> - {
> - "name":"capcheck",
> - "NUM":"100",
> - "MODE":"capcheck"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.scrashme/spec
> b/engine/tests/Functional.scrashme/spec
> new file mode 100644
> index 0000000..5065506
> --- /dev/null
> +++ b/engine/tests/Functional.scrashme/spec
> @@ -0,0 +1,21 @@
> +{
> + "testName": "Functional.scrashme",
> + "specs":
> + [
> + {
> + "name":"default",
> + "NUM":"100",
> + "MODE":"random"
> + },
> + {
> + "name":"rotate",
> + "NUM":"100",
> + "MODE":"rotate"
> + },
> + {
> + "name":"capcheck",
> + "NUM":"100",
> + "MODE":"capcheck"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
> b/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
> deleted file mode 100644
> index c0f134e..0000000
> --- a/engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.sdhi_0",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.sdhi_0/spec
> b/engine/tests/Functional.sdhi_0/spec
> new file mode 100644
> index 0000000..c0f134e
> --- /dev/null
> +++ b/engine/tests/Functional.sdhi_0/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.sdhi_0",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.stress/Functional.stress.spec
> b/engine/tests/Functional.stress/Functional.stress.spec
> deleted file mode 100644
> index 5a40f31..0000000
> --- a/engine/tests/Functional.stress/Functional.stress.spec
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -{
> - "testName": "Functional.stress",
> - "specs":
> - [
> - {
> - "name":"default",
> - "SYNC":"2",
> - "SQRT":"2",
> - "HDD":"2",
> - "HDD_BYTES":"100M",
> - "VM":"2",
> - "VM_BYTES":"128M",
> - "TIMEOUT":"60"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.stress/spec
> b/engine/tests/Functional.stress/spec
> new file mode 100644
> index 0000000..5a40f31
> --- /dev/null
> +++ b/engine/tests/Functional.stress/spec
> @@ -0,0 +1,16 @@
> +{
> + "testName": "Functional.stress",
> + "specs":
> + [
> + {
> + "name":"default",
> + "SYNC":"2",
> + "SQRT":"2",
> + "HDD":"2",
> + "HDD_BYTES":"100M",
> + "VM":"2",
> + "VM_BYTES":"128M",
> + "TIMEOUT":"60"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.synctest/Functional.synctest.spec
> b/engine/tests/Functional.synctest/Functional.synctest.spec
> deleted file mode 100644
> index 4d920b9..0000000
> --- a/engine/tests/Functional.synctest/Functional.synctest.spec
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -{
> - "testName": "Functional.synctest",
> - "specs":
> - [
> - {
> - "name":"sata",
> - "MOUNT_BLOCKDEV":"$SATA_DEV",
> - "MOUNT_POINT":"$SATA_MP",
> - "LEN":"10",
> - "LOOP":"10"
> - },
> - {
> - "name":"mmc",
> - "MOUNT_BLOCKDEV":"$MMC_DEV",
> - "MOUNT_POINT":"$MMC_MP",
> - "LEN":"10",
> - "LOOP":"10"
> - },
> - {
> - "name":"usb",
> - "MOUNT_BLOCKDEV":"$USB_DEV",
> - "MOUNT_POINT":"$USB_MP",
> - "LEN":"10",
> - "LOOP":"10"
> - },
> - {
> - "name":"default",
> - "MOUNT_BLOCKDEV":"ROOT",
> - "MOUNT_POINT":"$BOARD_TESTDIR/work",
> - "LEN":"10",
> - "LOOP":"10"
> - }
> - ]
> -}
> -
> -
> -
> -
> diff --git a/engine/tests/Functional.synctest/spec
> b/engine/tests/Functional.synctest/spec
> new file mode 100644
> index 0000000..4d920b9
> --- /dev/null
> +++ b/engine/tests/Functional.synctest/spec
> @@ -0,0 +1,38 @@
> +{
> + "testName": "Functional.synctest",
> + "specs":
> + [
> + {
> + "name":"sata",
> + "MOUNT_BLOCKDEV":"$SATA_DEV",
> + "MOUNT_POINT":"$SATA_MP",
> + "LEN":"10",
> + "LOOP":"10"
> + },
> + {
> + "name":"mmc",
> + "MOUNT_BLOCKDEV":"$MMC_DEV",
> + "MOUNT_POINT":"$MMC_MP",
> + "LEN":"10",
> + "LOOP":"10"
> + },
> + {
> + "name":"usb",
> + "MOUNT_BLOCKDEV":"$USB_DEV",
> + "MOUNT_POINT":"$USB_MP",
> + "LEN":"10",
> + "LOOP":"10"
> + },
> + {
> + "name":"default",
> + "MOUNT_BLOCKDEV":"ROOT",
> + "MOUNT_POINT":"$BOARD_TESTDIR/work",
> + "LEN":"10",
> + "LOOP":"10"
> + }
> + ]
> +}
> +
> +
> +
> +
> diff --git a/engine/tests/Functional.thrift/Functional.thrift.spec
> b/engine/tests/Functional.thrift/Functional.thrift.spec
> deleted file mode 100644
> index 860aea2..0000000
> --- a/engine/tests/Functional.thrift/Functional.thrift.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.thrift",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.thrift/spec
> b/engine/tests/Functional.thrift/spec
> new file mode 100644
> index 0000000..860aea2
> --- /dev/null
> +++ b/engine/tests/Functional.thrift/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.thrift",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.tiff/Functional.tiff.spec
> b/engine/tests/Functional.tiff/Functional.tiff.spec
> deleted file mode 100644
> index e7d3736..0000000
> --- a/engine/tests/Functional.tiff/Functional.tiff.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.tiff",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.tiff/spec
> b/engine/tests/Functional.tiff/spec
> new file mode 100644
> index 0000000..e7d3736
> --- /dev/null
> +++ b/engine/tests/Functional.tiff/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.tiff",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.vsomeip/Functional.vsomeip.spec
> b/engine/tests/Functional.vsomeip/Functional.vsomeip.spec
> deleted file mode 100644
> index 61022d2..0000000
> --- a/engine/tests/Functional.vsomeip/Functional.vsomeip.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.vsomeip",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.vsomeip/spec
> b/engine/tests/Functional.vsomeip/spec
> new file mode 100644
> index 0000000..61022d2
> --- /dev/null
> +++ b/engine/tests/Functional.vsomeip/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.vsomeip",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.xorg-macros/Functional.xorg-
> macros.spec b/engine/tests/Functional.xorg-macros/Functional.xorg-
> macros.spec
> deleted file mode 100644
> index e1b83f7..0000000
> --- a/engine/tests/Functional.xorg-macros/Functional.xorg-macros.spec
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -{
> - "testName": "Functional.xorg-macros",
> - "specs": [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.xorg-macros/spec
> b/engine/tests/Functional.xorg-macros/spec
> new file mode 100644
> index 0000000..e1b83f7
> --- /dev/null
> +++ b/engine/tests/Functional.xorg-macros/spec
> @@ -0,0 +1,8 @@
> +{
> + "testName": "Functional.xorg-macros",
> + "specs": [
> + {
> + "name":"default"
> + }
> + ]
> +}
> diff --git a/engine/tests/Functional.zlib/Functional.zlib.spec
> b/engine/tests/Functional.zlib/Functional.zlib.spec
> deleted file mode 100644
> index be3ed34..0000000
> --- a/engine/tests/Functional.zlib/Functional.zlib.spec
> +++ /dev/null
> @@ -1,9 +0,0 @@
> -{
> - "testName": "Functional.zlib",
> - "specs":
> - [
> - {
> - "name":"default"
> - }
> - ]
> -}
> diff --git a/engine/tests/Functional.zlib/spec
> b/engine/tests/Functional.zlib/spec
> new file mode 100644
> index 0000000..be3ed34
> --- /dev/null
> +++ b/engine/tests/Functional.zlib/spec
> @@ -0,0 +1,9 @@
> +{
> + "testName": "Functional.zlib",
> + "specs":
> + [
> + {
> + "name":"default"
> + }
> + ]
> +}
> --
> 2.7.4
>
>
> _______________________________________________
> Fuego mailing list
> Fuego@lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2017-04-27 17:08 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-27 8:26 [Fuego] Re-send and a few new fixes Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 01/23] parser: fix bug in the parser Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 02/23] ftc: add timeout parameter when using add-jobs without testplans Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 03/23] specs: change the name of the specs to spec Daniel Sangorrin
2017-04-27 17:08 ` Bird, Timothy
2017-04-27 8:26 ` [Fuego] [PATCH 04/23] tests: add FIXTHIS to tests without any shell script Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 05/23] tests: rename incorrectly named test shell scripts Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 06/23] fuego_test: rename all test shell scripts to fuego_test.sh Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 07/23] stress: remove stress.sh and references Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 08/23] scrashme: just fix indentation Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 09/23] git: introduce a generic git mechanism and use pi_tests as a poc Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 10/23] expat: fix the expat test Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 11/23] crashme: fix indentation Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 12/23] bzip2: fix trailing spaces and indentation Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 13/23] bzip2: when using log_compare two times record the return value Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 14/23] IOzone: remove unneeded definition of bytes Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 15/23] bonnie: fix indentation and add fixthis for sleep Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 16/23] phases: rework the order of phases Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 17/23] log_compare: add fixthis about a non-used parameter Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 18/23] LTP: add separated build and run phases Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 19/23] kernel_build: set linux mainstream as default spec Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 20/23] spec format: modify so that the spec name is the key Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 21/23] generic_parser: rewrite the label Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 22/23] links: links can now be specified by the specs Daniel Sangorrin
2017-04-27 8:26 ` [Fuego] [PATCH 23/23] testplan_docker: add synctest expat and crashme Daniel Sangorrin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.