[Fuego] [PATCH 06/23] fuego_test: rename all test shell scripts to fuego_test.sh
Daniel Sangorrin
daniel.sangorrin at toshiba.co.jp
Thu Apr 27 08:26:39 UTC 2017
This is for the test writers to have an easier plugin experience.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin at 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
More information about the Fuego
mailing list