[Fuego] Fuego Digest, Vol 9, Issue 83

dhinakar k dhinakar.k at gmail.com
Thu Apr 27 19:28:23 UTC 2017


Thanks Tim, I will build bash or dash and put it on n Target and get back
to you.

Regards,
Dhinakar

On Apr 27, 2017 10:26 PM, <fuego-request at lists.linuxfoundation.org> wrote:

Send Fuego mailing list submissions to
        fuego at lists.linuxfoundation.org

To subscribe or unsubscribe via the World Wide Web, visit
        https://lists.linuxfoundation.org/mailman/listinfo/fuego
or, via email, send a message with subject or body 'help' to
        fuego-request at lists.linuxfoundation.org

You can reach the person managing the list at
        fuego-owner at lists.linuxfoundation.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Fuego digest..."


Today's Topics:

   1. Re: Functional.fuego_board_check test failure - console log
      (/dev/ttyUSB0) (Bird, Timothy)
   2. [PATCH 03/23] specs: change the name of the specs to spec
      (Daniel Sangorrin)


----------------------------------------------------------------------

Message: 1
Date: Thu, 27 Apr 2017 16:49:28 +0000
From: "Bird, Timothy" <Tim.Bird at sony.com>
To: "dhinakar.k at samsung.com" <dhinakar.k at samsung.com>,
        "fuego at lists.linuxfoundation.org" <fuego at lists.linuxfoundation.org>
Cc: Frank Rowand <frowand.list at gmail.com>
Subject: Re: [Fuego] Functional.fuego_board_check test failure -
        console log (/dev/ttyUSB0)
Message-ID:
        <ECADFF3FD767C149AD96A924E7EA6EAF1FA85973 at USCULXMSG01.am.sony.com>
Content-Type: text/plain; charset="us-ascii"



> -----Original Message-----
> From: Dhinakar Kalyanasundaram on Wednesday, April 26, 2017 9:34 PM
>
> Thanks Tim for reproducing the issue.
>
> I will check with the development manager regarding using 'bash' on the
> target.

Note that I'm pretty sure dash would work also.

Can't you just build bash or dash and put it on the target yourself?
sercp seems to work, and you only need to do this once.  It doesn't
have the be the main shell of the target, just installed somewhere
it can be used.  the sequence would be:
Once:
 * build bash or dash for the target (or find an ARM version somewhere on
the Internet)
 * install it on target (somewhere like /usr/local/bin)

Once before executing tests:
 * manually start /usr/local/bin/bash on target so it will be the console
shell

During tests:
 * run tests normally, and they should use that shell.

After executing tests:
 * just exit the shell on the console, to return to the original busybox
shell.

Eventually, invoking the alternate shell could be put into something like
the ov_transport_connect() function (when that is created).  But it could
be done manually as a workaround for the short term.
>
> Meanwhile, Is it difficult to fix this issue or any workaround available?

Well, this should get fixed in serio - it should handle busybox sh
correctly.
I don't have time to work on this much this week, though.  I don't have any
workaround aside from using a supported shell.

 -- Tim



------------------------------

Message: 2
Date: Thu, 27 Apr 2017 17:26:36 +0900
From: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
To: fuego at lists.linuxfoundation.org
Subject: [Fuego] [PATCH 03/23] specs: change the name of the specs to
        spec
Message-ID:
        <5d006c8bda17e00045eccebf4dcb0ef6ebf630b2.1493281360.git.
daniel.sangorrin at toshiba.co.jp>


This is to avoid typical misspelling errors by test writers

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/scripts/ovgen.py                            |  2 +-
 .../Benchmark.Dhrystone/Benchmark.Dhrystone.spec   | 25 ------------
 engine/tests/Benchmark.Dhrystone/spec              | 25 ++++++++++++
 .../tests/Benchmark.GLMark/Benchmark.GLMark.spec   | 10 -----
 engine/tests/Benchmark.GLMark/spec                 | 10 +++++
 .../tests/Benchmark.IOzone/Benchmark.IOzone.spec   | 45
---------------------
 engine/tests/Benchmark.IOzone/spec                 | 45
+++++++++++++++++++++
 .../Benchmark.Interbench/Benchmark.Interbench.spec | 20 ---------
 engine/tests/Benchmark.Interbench/spec             | 20 +++++++++
 engine/tests/Benchmark.Java/Benchmark.Java.spec    | 10 -----
 engine/tests/Benchmark.Java/spec                   | 10 +++++
 .../tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec | 10 -----
 engine/tests/Benchmark.OpenSSL/spec                | 10 +++++
 .../tests/Benchmark.Stream/Benchmark.Stream.spec   | 10 -----
 engine/tests/Benchmark.Stream/spec                 | 10 +++++
 .../Benchmark.Whetstone/Benchmark.Whetstone.spec   | 11 -----
 engine/tests/Benchmark.Whetstone/spec              | 11 +++++
 engine/tests/Benchmark.aim7/Benchmark.aim7.spec    |  8 ----
 engine/tests/Benchmark.aim7/spec                   |  8 ++++
 .../Benchmark.blobsallad/Benchmark.blobsallad.spec | 16 --------
 engine/tests/Benchmark.blobsallad/spec             | 16 ++++++++
 .../tests/Benchmark.bonnie/Benchmark.bonnie.spec   | 47
----------------------
 engine/tests/Benchmark.bonnie/spec                 | 47
++++++++++++++++++++++
 .../Benchmark.cyclictest/Benchmark.cyclictest.spec | 11 -----
 engine/tests/Benchmark.cyclictest/spec             | 11 +++++
 .../tests/Benchmark.dbench/Benchmark.dbench.spec   | 42 -------------------
 engine/tests/Benchmark.dbench/spec                 | 42 +++++++++++++++++++
 .../tests/Benchmark.ebizzy/Benchmark.ebizzy.spec   | 14 -------
 engine/tests/Benchmark.ebizzy/spec                 | 14 +++++++
 engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec    | 30 --------------
 engine/tests/Benchmark.ffsb/spec                   | 30 ++++++++++++++
 engine/tests/Benchmark.fio/Benchmark.fio.spec      | 35 ----------------
 engine/tests/Benchmark.fio/spec                    | 35 ++++++++++++++++
 .../tests/Benchmark.fs_mark/Benchmark.fs_mark.spec |  8 ----
 engine/tests/Benchmark.fs_mark/spec                |  8 ++++
 .../Benchmark.fuego_check_plots.spec               | 13 ------
 engine/tests/Benchmark.fuego_check_plots/spec      | 13 ++++++
 .../tests/Benchmark.gtkperf/Benchmark.gtkperf.spec | 16 --------
 engine/tests/Benchmark.gtkperf/spec                | 16 ++++++++
 .../Benchmark.hackbench/Benchmark.hackbench.spec   | 11 -----
 engine/tests/Benchmark.hackbench/spec              | 11 +++++
 .../tests/Benchmark.himeno/Benchmark.himeno.spec   | 10 -----
 engine/tests/Benchmark.himeno/spec                 | 10 +++++
 engine/tests/Benchmark.iperf/Benchmark.iperf.spec  | 11 -----
 engine/tests/Benchmark.iperf/spec                  | 11 +++++
 .../tests/Benchmark.linpack/Benchmark.linpack.spec | 10 -----
 engine/tests/Benchmark.linpack/spec                | 10 +++++
 .../Benchmark.lmbench2/Benchmark.lmbench2.spec     | 10 -----
 engine/tests/Benchmark.lmbench2/spec               | 10 +++++
 .../Benchmark.nbench-byte.spec                     |  8 ----
 engine/tests/Benchmark.nbench-byte/spec            |  8 ++++
 .../Benchmark.nbench_byte.spec                     | 10 -----
 engine/tests/Benchmark.nbench_byte/spec            | 10 +++++
 .../tests/Benchmark.netperf/Benchmark.netperf.spec | 14 -------
 engine/tests/Benchmark.netperf/spec                | 14 +++++++
 .../tests/Benchmark.netpipe/Benchmark.netpipe.spec | 12 ------
 engine/tests/Benchmark.netpipe/spec                | 12 ++++++
 .../tests/Benchmark.reboot/Benchmark.reboot.spec   | 10 -----
 engine/tests/Benchmark.reboot/spec                 | 10 +++++
 .../Benchmark.signaltest/Benchmark.signaltest.spec | 11 -----
 engine/tests/Benchmark.signaltest/spec             | 11 +++++
 .../Benchmark.sysbench/Benchmark.sysbench.spec     |  8 ----
 engine/tests/Benchmark.sysbench/spec               |  8 ++++
 .../Benchmark.tiobench/Benchmark.tiobench.spec     | 38 -----------------
 engine/tests/Benchmark.tiobench/spec               | 38 +++++++++++++++++
 .../tests/Benchmark.x11perf/Benchmark.x11perf.spec | 11 -----
 engine/tests/Benchmark.x11perf/spec                | 11 +++++
 engine/tests/Functional.LTP/Functional.LTP.spec    | 34 ----------------
 engine/tests/Functional.LTP/spec                   | 34 ++++++++++++++++
 .../Functional.OpenSSL/Functional.OpenSSL.spec     |  8 ----
 engine/tests/Functional.OpenSSL/spec               |  8 ++++
 .../Functional.aiostress/Functional.aiostress.spec | 31 --------------
 engine/tests/Functional.aiostress/spec             | 31 ++++++++++++++
 .../Functional.arch_timer.spec                     |  8 ----
 engine/tests/Functional.arch_timer/spec            |  8 ++++
 engine/tests/Functional.bc/Functional.bc.spec      | 33 ---------------
 engine/tests/Functional.bc/spec                    | 33 +++++++++++++++
 .../tests/Functional.boost/Functional.boost.spec   | 10 -----
 engine/tests/Functional.boost/spec                 | 10 +++++
 .../tests/Functional.bsdiff/Functional.bsdiff.spec |  8 ----
 engine/tests/Functional.bsdiff/spec                |  8 ++++
 .../tests/Functional.bzip2/Functional.bzip2.spec   |  9 -----
 engine/tests/Functional.bzip2/spec                 |  9 +++++
 engine/tests/Functional.cmt/Functional.cmt.spec    |  8 ----
 engine/tests/Functional.cmt/spec                   |  8 ++++
 .../Functional.commonAPI_C++.spec                  |  8 ----
 engine/tests/Functional.commonAPI_C++/spec         |  8 ++++
 .../Functional.commonAPI_Dbus.spec                 |  8 ----
 engine/tests/Functional.commonAPI_Dbus/spec        |  8 ++++
 .../Functional.commonAPI_SomeIp.spec               |  8 ----
 engine/tests/Functional.commonAPI_SomeIp/spec      |  8 ++++
 .../Functional.crashme/Functional.crashme.spec     | 14 -------
 engine/tests/Functional.crashme/spec               | 14 +++++++
 .../tests/Functional.croco/Functional.croco.spec   |  8 ----
 engine/tests/Functional.croco/spec                 |  8 ++++
 engine/tests/Functional.curl/Functional.curl.spec  | 10 -----
 engine/tests/Functional.curl/spec                  | 10 +++++
 .../tests/Functional.expat/Functional.expat.spec   |  9 -----
 engine/tests/Functional.expat/spec                 |  9 +++++
 .../Functional.fixesproto.spec                     |  8 ----
 engine/tests/Functional.fixesproto/spec            |  8 ++++
 .../Functional.fontconfig.spec                     |  9 -----
 engine/tests/Functional.fontconfig/spec            |  9 +++++
 .../tests/Functional.fsfuzz/Functional.fsfuzz.spec |  8 ----
 engine/tests/Functional.fsfuzz/spec                |  8 ++++
 .../Functional.ft2demos/Functional.ft2demos.spec   |  9 -----
 engine/tests/Functional.ft2demos/spec              |  9 +++++
 .../Functional.fuego_abort.spec                    | 10 -----
 engine/tests/Functional.fuego_abort/spec           | 10 +++++
 .../Functional.fuego_board_check.spec              | 13 ------
 engine/tests/Functional.fuego_board_check/spec     | 13 ++++++
 .../Functional.fuego_test_phases.spec              | 10 -----
 engine/tests/Functional.fuego_test_phases/spec     | 10 +++++
 .../Functional.fuego_transport.spec                |  9 -----
 engine/tests/Functional.fuego_transport/spec       |  9 +++++
 engine/tests/Functional.fuse/Functional.fuse.spec  |  8 ----
 engine/tests/Functional.fuse/spec                  |  8 ++++
 .../tests/Functional.giflib/Functional.giflib.spec |  8 ----
 engine/tests/Functional.giflib/spec                |  8 ++++
 engine/tests/Functional.glib/Functional.glib.spec  |  9 -----
 engine/tests/Functional.glib/spec                  |  9 +++++
 .../tests/Functional.glib2/Functional.glib2.spec   |  8 ----
 engine/tests/Functional.glib2/spec                 |  8 ++++
 .../tests/Functional.glibc/Functional.glibc.spec   |  8 ----
 engine/tests/Functional.glibc/spec                 |  8 ++++
 .../Functional.hciattach/Functional.hciattach.spec |  8 ----
 engine/tests/Functional.hciattach/spec             |  8 ++++
 .../Functional.hello_world.spec                    | 19 ---------
 engine/tests/Functional.hello_world/spec           | 19 +++++++++
 .../Functional.imagemagick.spec                    |  8 ----
 engine/tests/Functional.imagemagick/spec           |  8 ++++
 .../Functional.iptables/Functional.iptables.spec   |  8 ----
 engine/tests/Functional.iptables/spec              |  8 ++++
 .../Functional.iputils/Functional.iputils.spec     |  8 ----
 engine/tests/Functional.iputils/spec               |  8 ++++
 .../Functional.ipv6connect.spec                    |  9 -----
 engine/tests/Functional.ipv6connect/spec           |  9 +++++
 engine/tests/Functional.jpeg/Functional.jpeg.spec  |  9 -----
 engine/tests/Functional.jpeg/spec                  |  9 +++++
 .../Functional.kernel_build.spec                   | 18 ---------
 engine/tests/Functional.kernel_build/spec          | 18 +++++++++
 engine/tests/Functional.kmod/Functional.kmod.spec  |  8 ----
 engine/tests/Functional.kmod/spec                  |  8 ++++
 .../tests/Functional.libogg/Functional.libogg.spec |  8 ----
 engine/tests/Functional.libogg/spec                |  8 ++++
 .../Functional.libpcap/Functional.libpcap.spec     |  8 ----
 engine/tests/Functional.libpcap/spec               |  8 ++++
 .../Functional.librsvg/Functional.librsvg.spec     |  8 ----
 engine/tests/Functional.librsvg/spec               |  8 ++++
 .../Functional.libspeex/Functional.libspeex.spec   |  8 ----
 engine/tests/Functional.libspeex/spec              |  8 ++++
 .../tests/Functional.libtar/Functional.libtar.spec |  8 ----
 engine/tests/Functional.libtar/spec                |  8 ++++
 .../Functional.libwebsocket.spec                   |  8 ----
 engine/tests/Functional.libwebsocket/spec          |  8 ++++
 .../Functional.linus_stress.spec                   | 11 -----
 engine/tests/Functional.linus_stress/spec          | 11 +++++
 engine/tests/Functional.lwip/Functional.lwip.spec  |  8 ----
 engine/tests/Functional.lwip/spec                  |  8 ++++
 .../Functional.mesa-demos.spec                     |  8 ----
 engine/tests/Functional.mesa-demos/spec            |  8 ++++
 engine/tests/Functional.neon/Functional.neon.spec  |  8 ----
 engine/tests/Functional.neon/spec                  |  8 ++++
 .../Functional.net-tools/Functional.net-tools.spec |  8 ----
 engine/tests/Functional.net-tools/spec             |  8 ++++
 .../Functional.netperf/Functional.netperf.spec     | 14 -------
 engine/tests/Functional.netperf/spec               | 14 +++++++
 .../Functional.pi_tests/Functional.pi_tests.spec   | 12 ------
 engine/tests/Functional.pi_tests/spec              | 12 ++++++
 .../tests/Functional.pixman/Functional.pixman.spec |  8 ----
 engine/tests/Functional.pixman/spec                |  8 ++++
 engine/tests/Functional.pppd/Functional.pppd.spec  |  8 ----
 engine/tests/Functional.pppd/spec                  |  8 ++++
 .../Functional.protobuf/Functional.protobuf.spec   |  8 ----
 engine/tests/Functional.protobuf/spec              |  8 ++++
 .../Functional.rmaptest/Functional.rmaptest.spec   | 14 -------
 engine/tests/Functional.rmaptest/spec              | 14 +++++++
 .../tests/Functional.scifab/Functional.scifab.spec |  8 ----
 engine/tests/Functional.scifab/spec                |  8 ++++
 .../Functional.scrashme/Functional.scrashme.spec   | 21 ----------
 engine/tests/Functional.scrashme/spec              | 21 ++++++++++
 .../tests/Functional.sdhi_0/Functional.sdhi_0.spec |  8 ----
 engine/tests/Functional.sdhi_0/spec                |  8 ++++
 .../tests/Functional.stress/Functional.stress.spec | 16 --------
 engine/tests/Functional.stress/spec                | 16 ++++++++
 .../Functional.synctest/Functional.synctest.spec   | 38 -----------------
 engine/tests/Functional.synctest/spec              | 38 +++++++++++++++++
 .../tests/Functional.thrift/Functional.thrift.spec |  8 ----
 engine/tests/Functional.thrift/spec                |  8 ++++
 engine/tests/Functional.tiff/Functional.tiff.spec  |  8 ----
 engine/tests/Functional.tiff/spec                  |  8 ++++
 .../Functional.vsomeip/Functional.vsomeip.spec     |  8 ----
 engine/tests/Functional.vsomeip/spec               |  8 ++++
 .../Functional.xorg-macros.spec                    |  8 ----
 engine/tests/Functional.xorg-macros/spec           |  8 ++++
 engine/tests/Functional.zlib/Functional.zlib.spec  |  9 -----
 engine/tests/Functional.zlib/spec                  |  9 +++++
 197 files changed, 1269 insertions(+), 1269 deletions(-)
 delete mode 100644 engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.
spec
 create mode 100644 engine/tests/Benchmark.Dhrystone/spec
 delete mode 100644 engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
 create mode 100644 engine/tests/Benchmark.GLMark/spec
 delete mode 100644 engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
 create mode 100644 engine/tests/Benchmark.IOzone/spec
 delete mode 100644 engine/tests/Benchmark.Interbench/Benchmark.
Interbench.spec
 create mode 100644 engine/tests/Benchmark.Interbench/spec
 delete mode 100644 engine/tests/Benchmark.Java/Benchmark.Java.spec
 create mode 100644 engine/tests/Benchmark.Java/spec
 delete mode 100644 engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
 create mode 100644 engine/tests/Benchmark.OpenSSL/spec
 delete mode 100644 engine/tests/Benchmark.Stream/Benchmark.Stream.spec
 create mode 100644 engine/tests/Benchmark.Stream/spec
 delete mode 100644 engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.
spec
 create mode 100644 engine/tests/Benchmark.Whetstone/spec
 delete mode 100644 engine/tests/Benchmark.aim7/Benchmark.aim7.spec
 create mode 100644 engine/tests/Benchmark.aim7/spec
 delete mode 100644 engine/tests/Benchmark.blobsallad/Benchmark.
blobsallad.spec
 create mode 100644 engine/tests/Benchmark.blobsallad/spec
 delete mode 100644 engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
 create mode 100644 engine/tests/Benchmark.bonnie/spec
 delete mode 100644 engine/tests/Benchmark.cyclictest/Benchmark.
cyclictest.spec
 create mode 100644 engine/tests/Benchmark.cyclictest/spec
 delete mode 100644 engine/tests/Benchmark.dbench/Benchmark.dbench.spec
 create mode 100644 engine/tests/Benchmark.dbench/spec
 delete mode 100644 engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
 create mode 100644 engine/tests/Benchmark.ebizzy/spec
 delete mode 100644 engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
 create mode 100644 engine/tests/Benchmark.ffsb/spec
 delete mode 100644 engine/tests/Benchmark.fio/Benchmark.fio.spec
 create mode 100644 engine/tests/Benchmark.fio/spec
 delete mode 100644 engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
 create mode 100644 engine/tests/Benchmark.fs_mark/spec
 delete mode 100644 engine/tests/Benchmark.fuego_
check_plots/Benchmark.fuego_check_plots.spec
 create mode 100644 engine/tests/Benchmark.fuego_check_plots/spec
 delete mode 100644 engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
 create mode 100644 engine/tests/Benchmark.gtkperf/spec
 delete mode 100644 engine/tests/Benchmark.hackbench/Benchmark.hackbench.
spec
 create mode 100644 engine/tests/Benchmark.hackbench/spec
 delete mode 100644 engine/tests/Benchmark.himeno/Benchmark.himeno.spec
 create mode 100644 engine/tests/Benchmark.himeno/spec
 delete mode 100644 engine/tests/Benchmark.iperf/Benchmark.iperf.spec
 create mode 100644 engine/tests/Benchmark.iperf/spec
 delete mode 100644 engine/tests/Benchmark.linpack/Benchmark.linpack.spec
 create mode 100644 engine/tests/Benchmark.linpack/spec
 delete mode 100644 engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
 create mode 100644 engine/tests/Benchmark.lmbench2/spec
 delete mode 100644 engine/tests/Benchmark.nbench-
byte/Benchmark.nbench-byte.spec
 create mode 100644 engine/tests/Benchmark.nbench-byte/spec
 delete mode 100644 engine/tests/Benchmark.nbench_
byte/Benchmark.nbench_byte.spec
 create mode 100644 engine/tests/Benchmark.nbench_byte/spec
 delete mode 100644 engine/tests/Benchmark.netperf/Benchmark.netperf.spec
 create mode 100644 engine/tests/Benchmark.netperf/spec
 delete mode 100644 engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
 create mode 100644 engine/tests/Benchmark.netpipe/spec
 delete mode 100644 engine/tests/Benchmark.reboot/Benchmark.reboot.spec
 create mode 100644 engine/tests/Benchmark.reboot/spec
 delete mode 100644 engine/tests/Benchmark.signaltest/Benchmark.
signaltest.spec
 create mode 100644 engine/tests/Benchmark.signaltest/spec
 delete mode 100644 engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
 create mode 100644 engine/tests/Benchmark.sysbench/spec
 delete mode 100644 engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
 create mode 100644 engine/tests/Benchmark.tiobench/spec
 delete mode 100644 engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
 create mode 100644 engine/tests/Benchmark.x11perf/spec
 delete mode 100644 engine/tests/Functional.LTP/Functional.LTP.spec
 create mode 100644 engine/tests/Functional.LTP/spec
 delete mode 100644 engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
 create mode 100644 engine/tests/Functional.OpenSSL/spec
 delete mode 100644 engine/tests/Functional.aiostress/Functional.
aiostress.spec
 create mode 100644 engine/tests/Functional.aiostress/spec
 delete mode 100644 engine/tests/Functional.arch_
timer/Functional.arch_timer.spec
 create mode 100644 engine/tests/Functional.arch_timer/spec
 delete mode 100644 engine/tests/Functional.bc/Functional.bc.spec
 create mode 100644 engine/tests/Functional.bc/spec
 delete mode 100644 engine/tests/Functional.boost/Functional.boost.spec
 create mode 100644 engine/tests/Functional.boost/spec
 delete mode 100644 engine/tests/Functional.bsdiff/Functional.bsdiff.spec
 create mode 100644 engine/tests/Functional.bsdiff/spec
 delete mode 100644 engine/tests/Functional.bzip2/Functional.bzip2.spec
 create mode 100644 engine/tests/Functional.bzip2/spec
 delete mode 100644 engine/tests/Functional.cmt/Functional.cmt.spec
 create mode 100644 engine/tests/Functional.cmt/spec
 delete mode 100644 engine/tests/Functional.commonAPI_C++/Functional.
commonAPI_C++.spec
 create mode 100644 engine/tests/Functional.commonAPI_C++/spec
 delete mode 100644 engine/tests/Functional.commonAPI_Dbus/Functional.
commonAPI_Dbus.spec
 create mode 100644 engine/tests/Functional.commonAPI_Dbus/spec
 delete mode 100644 engine/tests/Functional.commonAPI_SomeIp/Functional.
commonAPI_SomeIp.spec
 create mode 100644 engine/tests/Functional.commonAPI_SomeIp/spec
 delete mode 100644 engine/tests/Functional.crashme/Functional.crashme.spec
 create mode 100644 engine/tests/Functional.crashme/spec
 delete mode 100644 engine/tests/Functional.croco/Functional.croco.spec
 create mode 100644 engine/tests/Functional.croco/spec
 delete mode 100644 engine/tests/Functional.curl/Functional.curl.spec
 create mode 100644 engine/tests/Functional.curl/spec
 delete mode 100644 engine/tests/Functional.expat/Functional.expat.spec
 create mode 100644 engine/tests/Functional.expat/spec
 delete mode 100644 engine/tests/Functional.fixesproto/Functional.
fixesproto.spec
 create mode 100644 engine/tests/Functional.fixesproto/spec
 delete mode 100644 engine/tests/Functional.fontconfig/Functional.
fontconfig.spec
 create mode 100644 engine/tests/Functional.fontconfig/spec
 delete mode 100644 engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
 create mode 100644 engine/tests/Functional.fsfuzz/spec
 delete mode 100644 engine/tests/Functional.ft2demos/Functional.ft2demos.
spec
 create mode 100644 engine/tests/Functional.ft2demos/spec
 delete mode 100644 engine/tests/Functional.fuego_
abort/Functional.fuego_abort.spec
 create mode 100644 engine/tests/Functional.fuego_abort/spec
 delete mode 100644 engine/tests/Functional.fuego_
board_check/Functional.fuego_board_check.spec
 create mode 100644 engine/tests/Functional.fuego_board_check/spec
 delete mode 100644 engine/tests/Functional.fuego_
test_phases/Functional.fuego_test_phases.spec
 create mode 100644 engine/tests/Functional.fuego_test_phases/spec
 delete mode 100644 engine/tests/Functional.fuego_
transport/Functional.fuego_transport.spec
 create mode 100644 engine/tests/Functional.fuego_transport/spec
 delete mode 100644 engine/tests/Functional.fuse/Functional.fuse.spec
 create mode 100644 engine/tests/Functional.fuse/spec
 delete mode 100644 engine/tests/Functional.giflib/Functional.giflib.spec
 create mode 100644 engine/tests/Functional.giflib/spec
 delete mode 100644 engine/tests/Functional.glib/Functional.glib.spec
 create mode 100644 engine/tests/Functional.glib/spec
 delete mode 100644 engine/tests/Functional.glib2/Functional.glib2.spec
 create mode 100644 engine/tests/Functional.glib2/spec
 delete mode 100644 engine/tests/Functional.glibc/Functional.glibc.spec
 create mode 100644 engine/tests/Functional.glibc/spec
 delete mode 100644 engine/tests/Functional.hciattach/Functional.
hciattach.spec
 create mode 100644 engine/tests/Functional.hciattach/spec
 delete mode 100644 engine/tests/Functional.hello_
world/Functional.hello_world.spec
 create mode 100644 engine/tests/Functional.hello_world/spec
 delete mode 100644 engine/tests/Functional.imagemagick/Functional.
imagemagick.spec
 create mode 100644 engine/tests/Functional.imagemagick/spec
 delete mode 100644 engine/tests/Functional.iptables/Functional.iptables.
spec
 create mode 100644 engine/tests/Functional.iptables/spec
 delete mode 100644 engine/tests/Functional.iputils/Functional.iputils.spec
 create mode 100644 engine/tests/Functional.iputils/spec
 delete mode 100644 engine/tests/Functional.ipv6connect/Functional.
ipv6connect.spec
 create mode 100644 engine/tests/Functional.ipv6connect/spec
 delete mode 100644 engine/tests/Functional.jpeg/Functional.jpeg.spec
 create mode 100644 engine/tests/Functional.jpeg/spec
 delete mode 100644 engine/tests/Functional.kernel_build/Functional.
kernel_build.spec
 create mode 100644 engine/tests/Functional.kernel_build/spec
 delete mode 100644 engine/tests/Functional.kmod/Functional.kmod.spec
 create mode 100644 engine/tests/Functional.kmod/spec
 delete mode 100644 engine/tests/Functional.libogg/Functional.libogg.spec
 create mode 100644 engine/tests/Functional.libogg/spec
 delete mode 100644 engine/tests/Functional.libpcap/Functional.libpcap.spec
 create mode 100644 engine/tests/Functional.libpcap/spec
 delete mode 100644 engine/tests/Functional.librsvg/Functional.librsvg.spec
 create mode 100644 engine/tests/Functional.librsvg/spec
 delete mode 100644 engine/tests/Functional.libspeex/Functional.libspeex.
spec
 create mode 100644 engine/tests/Functional.libspeex/spec
 delete mode 100644 engine/tests/Functional.libtar/Functional.libtar.spec
 create mode 100644 engine/tests/Functional.libtar/spec
 delete mode 100644 engine/tests/Functional.libwebsocket/Functional.
libwebsocket.spec
 create mode 100644 engine/tests/Functional.libwebsocket/spec
 delete mode 100644 engine/tests/Functional.linus_stress/Functional.linus_
stress.spec
 create mode 100644 engine/tests/Functional.linus_stress/spec
 delete mode 100644 engine/tests/Functional.lwip/Functional.lwip.spec
 create mode 100644 engine/tests/Functional.lwip/spec
 delete mode 100644 engine/tests/Functional.mesa-
demos/Functional.mesa-demos.spec
 create mode 100644 engine/tests/Functional.mesa-demos/spec
 delete mode 100644 engine/tests/Functional.neon/Functional.neon.spec
 create mode 100644 engine/tests/Functional.neon/spec
 delete mode 100644 engine/tests/Functional.net-tools/Functional.net-tools.
spec
 create mode 100644 engine/tests/Functional.net-tools/spec
 delete mode 100644 engine/tests/Functional.netperf/Functional.netperf.spec
 create mode 100644 engine/tests/Functional.netperf/spec
 delete mode 100644 engine/tests/Functional.pi_
tests/Functional.pi_tests.spec
 create mode 100644 engine/tests/Functional.pi_tests/spec
 delete mode 100644 engine/tests/Functional.pixman/Functional.pixman.spec
 create mode 100644 engine/tests/Functional.pixman/spec
 delete mode 100644 engine/tests/Functional.pppd/Functional.pppd.spec
 create mode 100644 engine/tests/Functional.pppd/spec
 delete mode 100644 engine/tests/Functional.protobuf/Functional.protobuf.
spec
 create mode 100644 engine/tests/Functional.protobuf/spec
 delete mode 100644 engine/tests/Functional.rmaptest/Functional.rmaptest.
spec
 create mode 100644 engine/tests/Functional.rmaptest/spec
 delete mode 100644 engine/tests/Functional.scifab/Functional.scifab.spec
 create mode 100644 engine/tests/Functional.scifab/spec
 delete mode 100644 engine/tests/Functional.scrashme/Functional.scrashme.
spec
 create mode 100644 engine/tests/Functional.scrashme/spec
 delete mode 100644 engine/tests/Functional.sdhi_0/Functional.sdhi_0.spec
 create mode 100644 engine/tests/Functional.sdhi_0/spec
 delete mode 100644 engine/tests/Functional.stress/Functional.stress.spec
 create mode 100644 engine/tests/Functional.stress/spec
 delete mode 100644 engine/tests/Functional.synctest/Functional.synctest.
spec
 create mode 100644 engine/tests/Functional.synctest/spec
 delete mode 100644 engine/tests/Functional.thrift/Functional.thrift.spec
 create mode 100644 engine/tests/Functional.thrift/spec
 delete mode 100644 engine/tests/Functional.tiff/Functional.tiff.spec
 create mode 100644 engine/tests/Functional.tiff/spec
 delete mode 100644 engine/tests/Functional.vsomeip/Functional.vsomeip.spec
 create mode 100644 engine/tests/Functional.vsomeip/spec
 delete mode 100644 engine/tests/Functional.xorg-
macros/Functional.xorg-macros.spec
 create mode 100644 engine/tests/Functional.xorg-macros/spec
 delete mode 100644 engine/tests/Functional.zlib/Functional.zlib.spec
 create mode 100644 engine/tests/Functional.zlib/spec

diff --git a/engine/scripts/ovgen.py b/engine/scripts/ovgen.py
index f3f77e3..222f54f 100755
--- a/engine/scripts/ovgen.py
+++ b/engine/scripts/ovgen.py
@@ -435,7 +435,7 @@ def generateSpec(ts, fout):

 def parseSpec(testdir, testspec):
     # FIXTHIS: get fuego-core from env
-    specpath = '/fuego-core/engine/tests/%s/%s.spec' % (testdir, testdir)
+    specpath = '/fuego-core/engine/tests/%s/spec' % (testdir)
     ts = TestSpecs()

     debug_print("Parsing %s spec file" % (specpath))
diff --git a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
b/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
deleted file mode 100644
index 794ca68..0000000
--- a/engine/tests/Benchmark.Dhrystone/Benchmark.Dhrystone.spec
+++ /dev/null
@@ -1,25 +0,0 @@
-   {
-    "testName": "Benchmark.Dhrystone",
-    "fail_case": [
-        {
-            "fail_regexp": "Measured time too small to obtain meaningful
results",
-            "fail_message": "Measured time too small to obtain meaningful
results. Please increase LOOPS parameter in Dhrystone test spec."
-            }
-        ],
-    "specs":
-    [
-        {
-            "name":"default",
-            "LOOPS":"10000000"
-        },
-        {
-            "name":"100M",
-            "LOOPS":"100000000"
-        },
-        {
-            "name":"500M",
-            "LOOPS":"500000000"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.Dhrystone/spec b/engine/tests/Benchmark.
Dhrystone/spec
new file mode 100644
index 0000000..794ca68
--- /dev/null
+++ b/engine/tests/Benchmark.Dhrystone/spec
@@ -0,0 +1,25 @@
+   {
+    "testName": "Benchmark.Dhrystone",
+    "fail_case": [
+        {
+            "fail_regexp": "Measured time too small to obtain meaningful
results",
+            "fail_message": "Measured time too small to obtain meaningful
results. Please increase LOOPS parameter in Dhrystone test spec."
+            }
+        ],
+    "specs":
+    [
+        {
+            "name":"default",
+            "LOOPS":"10000000"
+        },
+        {
+            "name":"100M",
+            "LOOPS":"100000000"
+        },
+        {
+            "name":"500M",
+            "LOOPS":"500000000"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
b/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
deleted file mode 100644
index d94129d..0000000
--- a/engine/tests/Benchmark.GLMark/Benchmark.GLMark.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.GLMark",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.GLMark/spec b/engine/tests/Benchmark.
GLMark/spec
new file mode 100644
index 0000000..d94129d
--- /dev/null
+++ b/engine/tests/Benchmark.GLMark/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.GLMark",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
b/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
deleted file mode 100644
index 13ba89b..0000000
--- a/engine/tests/Benchmark.IOzone/Benchmark.IOzone.spec
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "testName": "Benchmark.IOzone",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "FILE_SIZE":"2M",
-            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "FILE_SIZE":"2M",
-            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "FILE_SIZE":"2M",
-            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
-        },
-        {
-            "name":"nopread",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "FILE_SIZE":"2M",
-            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "FILE_SIZE":"2M",
-            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
-        }
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.IOzone/spec b/engine/tests/Benchmark.
IOzone/spec
new file mode 100644
index 0000000..13ba89b
--- /dev/null
+++ b/engine/tests/Benchmark.IOzone/spec
@@ -0,0 +1,45 @@
+{
+    "testName": "Benchmark.IOzone",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "FILE_SIZE":"2M",
+            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "FILE_SIZE":"2M",
+            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "FILE_SIZE":"2M",
+            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+        },
+        {
+            "name":"nopread",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "FILE_SIZE":"2M",
+            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8'"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "FILE_SIZE":"2M",
+            "TESTS":"'-i 0 -i 1 -i 2 -i 6 -i 7 -i 8 -i 9'"
+        }
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
b/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
deleted file mode 100644
index e3627bb..0000000
--- a/engine/tests/Benchmark.Interbench/Benchmark.Interbench.spec
+++ /dev/null
@@ -1,20 +0,0 @@
-   {
-    "testName": "Benchmark.Interbench",
-    "specs":
-    [
-        {
-            "name":"default"
-        },
-        {
-            "name":"sata"
-        },
-        {
-            "name":"usb"
-        },
-        {
-            "name":"mmc"
-        }
-
-    ]
-}
-
diff --git a/engine/tests/Benchmark.Interbench/spec
b/engine/tests/Benchmark.Interbench/spec
new file mode 100644
index 0000000..e3627bb
--- /dev/null
+++ b/engine/tests/Benchmark.Interbench/spec
@@ -0,0 +1,20 @@
+   {
+    "testName": "Benchmark.Interbench",
+    "specs":
+    [
+        {
+            "name":"default"
+        },
+        {
+            "name":"sata"
+        },
+        {
+            "name":"usb"
+        },
+        {
+            "name":"mmc"
+        }
+
+    ]
+}
+
diff --git a/engine/tests/Benchmark.Java/Benchmark.Java.spec
b/engine/tests/Benchmark.Java/Benchmark.Java.spec
deleted file mode 100644
index fdad1c9..0000000
--- a/engine/tests/Benchmark.Java/Benchmark.Java.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.Java",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.Java/spec b/engine/tests/Benchmark.Java/
spec
new file mode 100644
index 0000000..fdad1c9
--- /dev/null
+++ b/engine/tests/Benchmark.Java/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.Java",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
b/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
deleted file mode 100644
index 7c00496..0000000
--- a/engine/tests/Benchmark.OpenSSL/Benchmark.OpenSSL.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.OpenSSL",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.OpenSSL/spec b/engine/tests/Benchmark.
OpenSSL/spec
new file mode 100644
index 0000000..7c00496
--- /dev/null
+++ b/engine/tests/Benchmark.OpenSSL/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.OpenSSL",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
b/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
deleted file mode 100644
index 2b88075..0000000
--- a/engine/tests/Benchmark.Stream/Benchmark.Stream.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.Stream",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.Stream/spec b/engine/tests/Benchmark.
Stream/spec
new file mode 100644
index 0000000..2b88075
--- /dev/null
+++ b/engine/tests/Benchmark.Stream/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.Stream",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
b/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
deleted file mode 100644
index b755e31..0000000
--- a/engine/tests/Benchmark.Whetstone/Benchmark.Whetstone.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-   {
-    "testName": "Benchmark.Whetstone",
-    "specs":
-    [
-        {
-            "name":"default",
-            "LOOPS":"100000"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.Whetstone/spec b/engine/tests/Benchmark.
Whetstone/spec
new file mode 100644
index 0000000..b755e31
--- /dev/null
+++ b/engine/tests/Benchmark.Whetstone/spec
@@ -0,0 +1,11 @@
+   {
+    "testName": "Benchmark.Whetstone",
+    "specs":
+    [
+        {
+            "name":"default",
+            "LOOPS":"100000"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
b/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
deleted file mode 100644
index 4ed9154..0000000
--- a/engine/tests/Benchmark.aim7/Benchmark.aim7.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Benchmark.aim7",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Benchmark.aim7/spec b/engine/tests/Benchmark.aim7/
spec
new file mode 100644
index 0000000..4ed9154
--- /dev/null
+++ b/engine/tests/Benchmark.aim7/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Benchmark.aim7",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
b/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
deleted file mode 100644
index a12b7e8..0000000
--- a/engine/tests/Benchmark.blobsallad/Benchmark.blobsallad.spec
+++ /dev/null
@@ -1,16 +0,0 @@
-   {
-    "testName": "Benchmark.blobsallad",
-    "fail_case": [
-        {
-            "fail_regexp": "xrandr: command not found",
-            "fail_message": "target system does not have xrandr"
-        }
-        ],
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.blobsallad/spec
b/engine/tests/Benchmark.blobsallad/spec
new file mode 100644
index 0000000..a12b7e8
--- /dev/null
+++ b/engine/tests/Benchmark.blobsallad/spec
@@ -0,0 +1,16 @@
+   {
+    "testName": "Benchmark.blobsallad",
+    "fail_case": [
+        {
+            "fail_regexp": "xrandr: command not found",
+            "fail_message": "target system does not have xrandr"
+        }
+        ],
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
b/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
deleted file mode 100644
index 426f94b..0000000
--- a/engine/tests/Benchmark.bonnie/Benchmark.bonnie.spec
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "testName": "Benchmark.bonnie",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "SIZE":"32",
-            "RAM":"0",
-            "ROOT":"true"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "SIZE":"32",
-            "RAM":"0",
-            "ROOT":"true"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "SIZE":"32",
-            "RAM":"0",
-            "ROOT":"true"
-        },
-        {
-            "name":"noroot",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "SIZE":"32",
-            "RAM":"0",
-            "ROOT":"false"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "SIZE":"32",
-            "RAM":"0",
-            "ROOT":"true"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.bonnie/spec b/engine/tests/Benchmark.
bonnie/spec
new file mode 100644
index 0000000..426f94b
--- /dev/null
+++ b/engine/tests/Benchmark.bonnie/spec
@@ -0,0 +1,47 @@
+{
+    "testName": "Benchmark.bonnie",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "SIZE":"32",
+            "RAM":"0",
+            "ROOT":"true"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "SIZE":"32",
+            "RAM":"0",
+            "ROOT":"true"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "SIZE":"32",
+            "RAM":"0",
+            "ROOT":"true"
+        },
+        {
+            "name":"noroot",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "SIZE":"32",
+            "RAM":"0",
+            "ROOT":"false"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "SIZE":"32",
+            "RAM":"0",
+            "ROOT":"true"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
b/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
deleted file mode 100644
index 617c1ac..0000000
--- a/engine/tests/Benchmark.cyclictest/Benchmark.cyclictest.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testName": "Benchmark.cyclictest",
-    "specs":
-    [
-        {
-            "name":"default",
-            "LOOPS":"10000"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.cyclictest/spec
b/engine/tests/Benchmark.cyclictest/spec
new file mode 100644
index 0000000..617c1ac
--- /dev/null
+++ b/engine/tests/Benchmark.cyclictest/spec
@@ -0,0 +1,11 @@
+{
+    "testName": "Benchmark.cyclictest",
+    "specs":
+    [
+        {
+            "name":"default",
+            "LOOPS":"10000"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
b/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
deleted file mode 100644
index f7700ab..0000000
--- a/engine/tests/Benchmark.dbench/Benchmark.dbench.spec
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "testName": "Benchmark.dbench",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "TIMELIMIT":"10",
-            "NPROCS":"2"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "TIMELIMIT":"10",
-            "NPROCS":"2"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "TIMELIMIT":"10",
-            "NPROCS":"2"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"/a",
-            "TIMELIMIT":"10",
-            "NPROCS":"2"
-        },
-        {
-            "name":"testdir",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "TIMELIMIT":"10",
-            "NPROCS":"2"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.dbench/spec b/engine/tests/Benchmark.
dbench/spec
new file mode 100644
index 0000000..f7700ab
--- /dev/null
+++ b/engine/tests/Benchmark.dbench/spec
@@ -0,0 +1,42 @@
+{
+    "testName": "Benchmark.dbench",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "TIMELIMIT":"10",
+            "NPROCS":"2"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "TIMELIMIT":"10",
+            "NPROCS":"2"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "TIMELIMIT":"10",
+            "NPROCS":"2"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"/a",
+            "TIMELIMIT":"10",
+            "NPROCS":"2"
+        },
+        {
+            "name":"testdir",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "TIMELIMIT":"10",
+            "NPROCS":"2"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
b/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
deleted file mode 100644
index 062fc1f..0000000
--- a/engine/tests/Benchmark.ebizzy/Benchmark.ebizzy.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "testName": "Benchmark.ebizzy",
-    "specs":
-    [
-        {
-            "name":"default",
-            "CHUNKS":"1000",
-            "CHUNK_SIZE":"51200",
-            "TIME":"100",
-            "THREADS":"100"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.ebizzy/spec b/engine/tests/Benchmark.
ebizzy/spec
new file mode 100644
index 0000000..062fc1f
--- /dev/null
+++ b/engine/tests/Benchmark.ebizzy/spec
@@ -0,0 +1,14 @@
+{
+    "testName": "Benchmark.ebizzy",
+    "specs":
+    [
+        {
+            "name":"default",
+            "CHUNKS":"1000",
+            "CHUNK_SIZE":"51200",
+            "TIME":"100",
+            "THREADS":"100"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
b/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
deleted file mode 100644
index acff523..0000000
--- a/engine/tests/Benchmark.ffsb/Benchmark.ffsb.spec
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "testName": "Benchmark.ffsb",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work"
-        }
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.ffsb/spec b/engine/tests/Benchmark.ffsb/
spec
new file mode 100644
index 0000000..acff523
--- /dev/null
+++ b/engine/tests/Benchmark.ffsb/spec
@@ -0,0 +1,30 @@
+{
+    "testName": "Benchmark.ffsb",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work"
+        }
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.fio/Benchmark.fio.spec
b/engine/tests/Benchmark.fio/Benchmark.fio.spec
deleted file mode 100644
index 947015d..0000000
--- a/engine/tests/Benchmark.fio/Benchmark.fio.spec
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "testName": "Benchmark.fio",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "TIMEOUT":"10"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "TIMEOUT":"10"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "TIMEOUT":"10"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "TIMEOUT":"10"
-        }
-
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.fio/spec b/engine/tests/Benchmark.fio/
spec
new file mode 100644
index 0000000..947015d
--- /dev/null
+++ b/engine/tests/Benchmark.fio/spec
@@ -0,0 +1,35 @@
+{
+    "testName": "Benchmark.fio",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "TIMEOUT":"10"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "TIMEOUT":"10"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "TIMEOUT":"10"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "TIMEOUT":"10"
+        }
+
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
b/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
deleted file mode 100644
index 7a6623b..0000000
--- a/engine/tests/Benchmark.fs_mark/Benchmark.fs_mark.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Benchmark.fs_mark",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Benchmark.fs_mark/spec
b/engine/tests/Benchmark.fs_mark/spec
new file mode 100644
index 0000000..7a6623b
--- /dev/null
+++ b/engine/tests/Benchmark.fs_mark/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Benchmark.fs_mark",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec
b/engine/tests/Benchmark.fuego_check_plots/Benchmark.fuego_check_plots.spec
deleted file mode 100644
index 5ae2190..0000000
--- a/engine/tests/Benchmark.fuego_check_plots/Benchmark.
fuego_check_plots.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "testName": "Benchmark.fuego_check_plots",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.fuego_check_plots/spec
b/engine/tests/Benchmark.fuego_check_plots/spec
new file mode 100644
index 0000000..5ae2190
--- /dev/null
+++ b/engine/tests/Benchmark.fuego_check_plots/spec
@@ -0,0 +1,13 @@
+{
+    "testName": "Benchmark.fuego_check_plots",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
b/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
deleted file mode 100644
index 9ec9d5f..0000000
--- a/engine/tests/Benchmark.gtkperf/Benchmark.gtkperf.spec
+++ /dev/null
@@ -1,16 +0,0 @@
-   {
-    "testName": "Benchmark.gtkperf",
-    "fail_case": [
-        {
-            "fail_regexp": "xrandr: command not found",
-            "fail_message": "target system does not have xrandr"
-        }
-        ],
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.gtkperf/spec b/engine/tests/Benchmark.
gtkperf/spec
new file mode 100644
index 0000000..9ec9d5f
--- /dev/null
+++ b/engine/tests/Benchmark.gtkperf/spec
@@ -0,0 +1,16 @@
+   {
+    "testName": "Benchmark.gtkperf",
+    "fail_case": [
+        {
+            "fail_regexp": "xrandr: command not found",
+            "fail_message": "target system does not have xrandr"
+        }
+        ],
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
b/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
deleted file mode 100644
index f915796..0000000
--- a/engine/tests/Benchmark.hackbench/Benchmark.hackbench.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testName": "Benchmark.hackbench",
-    "specs":
-    [
-        {
-            "name":"default",
-            "GPOUPS":"20"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.hackbench/spec b/engine/tests/Benchmark.
hackbench/spec
new file mode 100644
index 0000000..f915796
--- /dev/null
+++ b/engine/tests/Benchmark.hackbench/spec
@@ -0,0 +1,11 @@
+{
+    "testName": "Benchmark.hackbench",
+    "specs":
+    [
+        {
+            "name":"default",
+            "GPOUPS":"20"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
b/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
deleted file mode 100644
index 4cb58d6..0000000
--- a/engine/tests/Benchmark.himeno/Benchmark.himeno.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.himeno",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.himeno/spec b/engine/tests/Benchmark.
himeno/spec
new file mode 100644
index 0000000..4cb58d6
--- /dev/null
+++ b/engine/tests/Benchmark.himeno/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.himeno",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
b/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
deleted file mode 100644
index e4429f4..0000000
--- a/engine/tests/Benchmark.iperf/Benchmark.iperf.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testName": "Benchmark.iperf",
-    "specs":
-    [
-        {
-            "name":"default",
-            "SRV":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.iperf/spec b/engine/tests/Benchmark.
iperf/spec
new file mode 100644
index 0000000..e4429f4
--- /dev/null
+++ b/engine/tests/Benchmark.iperf/spec
@@ -0,0 +1,11 @@
+{
+    "testName": "Benchmark.iperf",
+    "specs":
+    [
+        {
+            "name":"default",
+            "SRV":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
b/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
deleted file mode 100644
index 9e1ca86..0000000
--- a/engine/tests/Benchmark.linpack/Benchmark.linpack.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.linpack",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.linpack/spec b/engine/tests/Benchmark.
linpack/spec
new file mode 100644
index 0000000..9e1ca86
--- /dev/null
+++ b/engine/tests/Benchmark.linpack/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.linpack",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
b/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
deleted file mode 100644
index f1055c4..0000000
--- a/engine/tests/Benchmark.lmbench2/Benchmark.lmbench2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.lmbench2",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.lmbench2/spec b/engine/tests/Benchmark.
lmbench2/spec
new file mode 100644
index 0000000..f1055c4
--- /dev/null
+++ b/engine/tests/Benchmark.lmbench2/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.lmbench2",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
b/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
deleted file mode 100644
index 319b42d..0000000
--- a/engine/tests/Benchmark.nbench-byte/Benchmark.nbench-byte.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Benchmark.nbench-byte",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Benchmark.nbench-byte/spec
b/engine/tests/Benchmark.nbench-byte/spec
new file mode 100644
index 0000000..319b42d
--- /dev/null
+++ b/engine/tests/Benchmark.nbench-byte/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Benchmark.nbench-byte",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
b/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
deleted file mode 100644
index 2dab856..0000000
--- a/engine/tests/Benchmark.nbench_byte/Benchmark.nbench_byte.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.nbench_byte",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.nbench_byte/spec
b/engine/tests/Benchmark.nbench_byte/spec
new file mode 100644
index 0000000..2dab856
--- /dev/null
+++ b/engine/tests/Benchmark.nbench_byte/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.nbench_byte",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
b/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
deleted file mode 100644
index eac8fcd..0000000
--- a/engine/tests/Benchmark.netperf/Benchmark.netperf.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "testName": "Benchmark.netperf",
-    "specs":
-    [
-        {
-            "name":"default",
-            "SRV":"default"
-        },
-        {
-            "name":"docker",
-            "SRV":"docker"
-        }
-    ]
-}
diff --git a/engine/tests/Benchmark.netperf/spec b/engine/tests/Benchmark.
netperf/spec
new file mode 100644
index 0000000..eac8fcd
--- /dev/null
+++ b/engine/tests/Benchmark.netperf/spec
@@ -0,0 +1,14 @@
+{
+    "testName": "Benchmark.netperf",
+    "specs":
+    [
+        {
+            "name":"default",
+            "SRV":"default"
+        },
+        {
+            "name":"docker",
+            "SRV":"docker"
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
b/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
deleted file mode 100644
index 0ed6717..0000000
--- a/engine/tests/Benchmark.netpipe/Benchmark.netpipe.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "testName": "Benchmark.netpipe",
-    "specs":
-    [
-        {
-            "name":"default",
-            "SRV":"default",
-            "PERT":"2"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.netpipe/spec b/engine/tests/Benchmark.
netpipe/spec
new file mode 100644
index 0000000..0ed6717
--- /dev/null
+++ b/engine/tests/Benchmark.netpipe/spec
@@ -0,0 +1,12 @@
+{
+    "testName": "Benchmark.netpipe",
+    "specs":
+    [
+        {
+            "name":"default",
+            "SRV":"default",
+            "PERT":"2"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
b/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
deleted file mode 100644
index c67f4a5..0000000
--- a/engine/tests/Benchmark.reboot/Benchmark.reboot.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-   {
-    "testName": "Benchmark.reboot",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.reboot/spec b/engine/tests/Benchmark.
reboot/spec
new file mode 100644
index 0000000..c67f4a5
--- /dev/null
+++ b/engine/tests/Benchmark.reboot/spec
@@ -0,0 +1,10 @@
+   {
+    "testName": "Benchmark.reboot",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
b/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
deleted file mode 100644
index 0b2f09d..0000000
--- a/engine/tests/Benchmark.signaltest/Benchmark.signaltest.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-   {
-    "testName": "Benchmark.signaltest",
-    "specs":
-    [
-        {
-            "name":"default",
-            "LOOPS":"10000"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.signaltest/spec
b/engine/tests/Benchmark.signaltest/spec
new file mode 100644
index 0000000..0b2f09d
--- /dev/null
+++ b/engine/tests/Benchmark.signaltest/spec
@@ -0,0 +1,11 @@
+   {
+    "testName": "Benchmark.signaltest",
+    "specs":
+    [
+        {
+            "name":"default",
+            "LOOPS":"10000"
+        }
+    ]
+}
+
diff --git a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
b/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
deleted file mode 100644
index ffe4534..0000000
--- a/engine/tests/Benchmark.sysbench/Benchmark.sysbench.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Benchmark.sysbench",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Benchmark.sysbench/spec b/engine/tests/Benchmark.
sysbench/spec
new file mode 100644
index 0000000..ffe4534
--- /dev/null
+++ b/engine/tests/Benchmark.sysbench/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Benchmark.sysbench",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
b/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
deleted file mode 100644
index e38a7d7..0000000
--- a/engine/tests/Benchmark.tiobench/Benchmark.tiobench.spec
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "testName": "Benchmark.tiobench",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "THREADS":"4",
-            "SIZE":"10"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "THREADS":"4",
-            "SIZE":"10"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "THREADS":"4",
-            "SIZE":"10"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "THREADS":"4",
-            "SIZE":"10"
-        }
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Benchmark.tiobench/spec b/engine/tests/Benchmark.
tiobench/spec
new file mode 100644
index 0000000..e38a7d7
--- /dev/null
+++ b/engine/tests/Benchmark.tiobench/spec
@@ -0,0 +1,38 @@
+{
+    "testName": "Benchmark.tiobench",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "THREADS":"4",
+            "SIZE":"10"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "THREADS":"4",
+            "SIZE":"10"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "THREADS":"4",
+            "SIZE":"10"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "THREADS":"4",
+            "SIZE":"10"
+        }
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
b/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
deleted file mode 100644
index 602bc2d..0000000
--- a/engine/tests/Benchmark.x11perf/Benchmark.x11perf.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "testName": "Benchmark.x11perf",
-    "specs":
-    [
-        {
-            "name":"default",
-            "TIME":"1"
-        }
-    ]
-}
-
diff --git a/engine/tests/Benchmark.x11perf/spec b/engine/tests/Benchmark.
x11perf/spec
new file mode 100644
index 0000000..602bc2d
--- /dev/null
+++ b/engine/tests/Benchmark.x11perf/spec
@@ -0,0 +1,11 @@
+{
+    "testName": "Benchmark.x11perf",
+    "specs":
+    [
+        {
+            "name":"default",
+            "TIME":"1"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.LTP/Functional.LTP.spec
b/engine/tests/Functional.LTP/Functional.LTP.spec
deleted file mode 100644
index 1c1a090..0000000
--- a/engine/tests/Functional.LTP/Functional.LTP.spec
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "testName": "Functional.LTP",
-    "specs":
-    [
-        {
-            "name": "default",
-            "tests": "syscalls SEM"
-        },
-        {
-            "name": "selection",
-            "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO
MSG SEM SIG THR TMR TPS"
-        },
-        {
-            "name": "selectionwithrt",
-            "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO
MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate
func/sched_latency func/sched_jitter"
-        },
-        {
-            "name": "ltplite",
-            "tests": "ltplite"
-        },
-        {
-            "name": "ptsonly",
-            "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
-        },
-        {
-            "name": "smoketest",
-            "tests": "fs_bind"
-        },
-        {
-            "name": "rtonly",
-            "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate
func/sched_latency func/sched_jitter"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.LTP/spec b/engine/tests/Functional.LTP/
spec
new file mode 100644
index 0000000..1c1a090
--- /dev/null
+++ b/engine/tests/Functional.LTP/spec
@@ -0,0 +1,34 @@
+{
+    "testName": "Functional.LTP",
+    "specs":
+    [
+        {
+            "name": "default",
+            "tests": "syscalls SEM"
+        },
+        {
+            "name": "selection",
+            "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO
MSG SEM SIG THR TMR TPS"
+        },
+        {
+            "name": "selectionwithrt",
+            "tests": "syscalls fs pipes sched timers dio mm ipc pty AIO
MSG SEM SIG THR TMR TPS func/hrtimer-prio func/pi-tests func/rt-migrate
func/sched_latency func/sched_jitter"
+        },
+        {
+            "name": "ltplite",
+            "tests": "ltplite"
+        },
+        {
+            "name": "ptsonly",
+            "tests": "AIO MEM MSG SEM SIG THR TMR TPS"
+        },
+        {
+            "name": "smoketest",
+            "tests": "fs_bind"
+        },
+        {
+            "name": "rtonly",
+            "tests": "func/hrtimer-prio func/pi-tests func/rt-migrate
func/sched_latency func/sched_jitter"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
b/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
deleted file mode 100644
index d3e4df0..0000000
--- a/engine/tests/Functional.OpenSSL/Functional.OpenSSL.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.OpenSSL",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.OpenSSL/spec b/engine/tests/Functional.
OpenSSL/spec
new file mode 100644
index 0000000..d3e4df0
--- /dev/null
+++ b/engine/tests/Functional.OpenSSL/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.OpenSSL",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.aiostress/Functional.aiostress.spec
b/engine/tests/Functional.aiostress/Functional.aiostress.spec
deleted file mode 100644
index d41f4a0..0000000
--- a/engine/tests/Functional.aiostress/Functional.aiostress.spec
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "testName": "Functional.aiostress",
-    "specs":
-    [
-        {
-            "name":"sata",
-            "MOUNT_BLOCKDEV":"$SATA_DEV",
-            "MOUNT_POINT":"$SATA_MP",
-            "SIZE":"20M"
-        },
-        {
-            "name":"mmc",
-            "MOUNT_BLOCKDEV":"$MMC_DEV",
-            "MOUNT_POINT":"$MMC_MP",
-            "SIZE":"20M"
-        },
-        {
-            "name":"usb",
-            "MOUNT_BLOCKDEV":"$USB_DEV",
-            "MOUNT_POINT":"$USB_MP",
-            "SIZE":"20M"
-        },
-        {
-            "name":"default",
-            "MOUNT_BLOCKDEV":"ROOT",
-            "MOUNT_POINT":"$BOARD_TESTDIR/work",
-            "SIZE":"20M"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.aiostress/spec
b/engine/tests/Functional.aiostress/spec
new file mode 100644
index 0000000..d41f4a0
--- /dev/null
+++ b/engine/tests/Functional.aiostress/spec
@@ -0,0 +1,31 @@
+{
+    "testName": "Functional.aiostress",
+    "specs":
+    [
+        {
+            "name":"sata",
+            "MOUNT_BLOCKDEV":"$SATA_DEV",
+            "MOUNT_POINT":"$SATA_MP",
+            "SIZE":"20M"
+        },
+        {
+            "name":"mmc",
+            "MOUNT_BLOCKDEV":"$MMC_DEV",
+            "MOUNT_POINT":"$MMC_MP",
+            "SIZE":"20M"
+        },
+        {
+            "name":"usb",
+            "MOUNT_BLOCKDEV":"$USB_DEV",
+            "MOUNT_POINT":"$USB_MP",
+            "SIZE":"20M"
+        },
+        {
+            "name":"default",
+            "MOUNT_BLOCKDEV":"ROOT",
+            "MOUNT_POINT":"$BOARD_TESTDIR/work",
+            "SIZE":"20M"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
b/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
deleted file mode 100644
index 3d28603..0000000
--- a/engine/tests/Functional.arch_timer/Functional.arch_timer.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.arch_timer",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.arch_timer/spec
b/engine/tests/Functional.arch_timer/spec
new file mode 100644
index 0000000..3d28603
--- /dev/null
+++ b/engine/tests/Functional.arch_timer/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.arch_timer",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.bc/Functional.bc.spec
b/engine/tests/Functional.bc/Functional.bc.spec
deleted file mode 100644
index 9b22ea6..0000000
--- a/engine/tests/Functional.bc/Functional.bc.spec
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "testName": "Functional.bc",
-    "fail_case": [
-        {
-            "fail_regexp": "some test regexp",
-            "fail_message": "some test message"
-        },
-        {
-            "fail_regexp": "Bug",
-            "fail_message": "Bug or Oops detected in system log",
-            "use_syslog": "1"
-        }
-        ],
-    "specs":
-    [
-        {
-            "name":"bc-mult",
-            "EXPR":"2*2",
-            "RESULT": "4"
-        },
-        {
-            "name":"bc-add",
-            "EXPR":"3+3",
-            "RESULT":"6"
-        },
-        {
-            "name":"default",
-            "EXPR":"3+3",
-            "RESULT":"6"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.bc/spec b/engine/tests/Functional.bc/
spec
new file mode 100644
index 0000000..9b22ea6
--- /dev/null
+++ b/engine/tests/Functional.bc/spec
@@ -0,0 +1,33 @@
+{
+    "testName": "Functional.bc",
+    "fail_case": [
+        {
+            "fail_regexp": "some test regexp",
+            "fail_message": "some test message"
+        },
+        {
+            "fail_regexp": "Bug",
+            "fail_message": "Bug or Oops detected in system log",
+            "use_syslog": "1"
+        }
+        ],
+    "specs":
+    [
+        {
+            "name":"bc-mult",
+            "EXPR":"2*2",
+            "RESULT": "4"
+        },
+        {
+            "name":"bc-add",
+            "EXPR":"3+3",
+            "RESULT":"6"
+        },
+        {
+            "name":"default",
+            "EXPR":"3+3",
+            "RESULT":"6"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.boost/Functional.boost.spec
b/engine/tests/Functional.boost/Functional.boost.spec
deleted file mode 100644
index b25b352..0000000
--- a/engine/tests/Functional.boost/Functional.boost.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "testName": "Functional.boost",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.boost/spec b/engine/tests/Functional.
boost/spec
new file mode 100644
index 0000000..b25b352
--- /dev/null
+++ b/engine/tests/Functional.boost/spec
@@ -0,0 +1,10 @@
+{
+    "testName": "Functional.boost",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
b/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
deleted file mode 100644
index 538beee..0000000
--- a/engine/tests/Functional.bsdiff/Functional.bsdiff.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.bsdiff",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.bsdiff/spec b/engine/tests/Functional.
bsdiff/spec
new file mode 100644
index 0000000..538beee
--- /dev/null
+++ b/engine/tests/Functional.bsdiff/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.bsdiff",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.bzip2/Functional.bzip2.spec
b/engine/tests/Functional.bzip2/Functional.bzip2.spec
deleted file mode 100644
index 9350805..0000000
--- a/engine/tests/Functional.bzip2/Functional.bzip2.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.bzip2",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.bzip2/spec b/engine/tests/Functional.
bzip2/spec
new file mode 100644
index 0000000..9350805
--- /dev/null
+++ b/engine/tests/Functional.bzip2/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.bzip2",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.cmt/Functional.cmt.spec
b/engine/tests/Functional.cmt/Functional.cmt.spec
deleted file mode 100644
index d88d487..0000000
--- a/engine/tests/Functional.cmt/Functional.cmt.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.cmt",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.cmt/spec b/engine/tests/Functional.cmt/
spec
new file mode 100644
index 0000000..d88d487
--- /dev/null
+++ b/engine/tests/Functional.cmt/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.cmt",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
b/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
deleted file mode 100644
index 401ce13..0000000
--- a/engine/tests/Functional.commonAPI_C++/Functional.commonAPI_C++.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.commonAPI_C++",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.commonAPI_C++/spec
b/engine/tests/Functional.commonAPI_C++/spec
new file mode 100644
index 0000000..401ce13
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_C++/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.commonAPI_C++",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
b/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
deleted file mode 100644
index 699e591..0000000
--- a/engine/tests/Functional.commonAPI_Dbus/Functional.commonAPI_Dbus.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.commonAPI_Dbus",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.commonAPI_Dbus/spec
b/engine/tests/Functional.commonAPI_Dbus/spec
new file mode 100644
index 0000000..699e591
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_Dbus/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.commonAPI_Dbus",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec
b/engine/tests/Functional.commonAPI_SomeIp/Functional.commonAPI_SomeIp.spec
deleted file mode 100644
index 4ca9398..0000000
--- a/engine/tests/Functional.commonAPI_SomeIp/Functional.
commonAPI_SomeIp.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.commonAPI_SomeIp",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.commonAPI_SomeIp/spec
b/engine/tests/Functional.commonAPI_SomeIp/spec
new file mode 100644
index 0000000..4ca9398
--- /dev/null
+++ b/engine/tests/Functional.commonAPI_SomeIp/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.commonAPI_SomeIp",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.crashme/Functional.crashme.spec
b/engine/tests/Functional.crashme/Functional.crashme.spec
deleted file mode 100644
index 1793be3..0000000
--- a/engine/tests/Functional.crashme/Functional.crashme.spec
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "testName": "Functional.crashme",
-    "specs":
-    [
-        {
-            "name":"default",
-            "NBYTES":"1000",
-            "INC":"1000",
-            "SRAND":"2",
-            "NTRYS":"100",
-            "NSUB":"3000"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.crashme/spec b/engine/tests/Functional.
crashme/spec
new file mode 100644
index 0000000..1793be3
--- /dev/null
+++ b/engine/tests/Functional.crashme/spec
@@ -0,0 +1,14 @@
+{
+    "testName": "Functional.crashme",
+    "specs":
+    [
+        {
+            "name":"default",
+            "NBYTES":"1000",
+            "INC":"1000",
+            "SRAND":"2",
+            "NTRYS":"100",
+            "NSUB":"3000"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.croco/Functional.croco.spec
b/engine/tests/Functional.croco/Functional.croco.spec
deleted file mode 100644
index bd36f60..0000000
--- a/engine/tests/Functional.croco/Functional.croco.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.croco",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.croco/spec b/engine/tests/Functional.
croco/spec
new file mode 100644
index 0000000..bd36f60
--- /dev/null
+++ b/engine/tests/Functional.croco/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.croco",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.curl/Functional.curl.spec
b/engine/tests/Functional.curl/Functional.curl.spec
deleted file mode 100644
index ee8160a..0000000
--- a/engine/tests/Functional.curl/Functional.curl.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "testName": "Functional.curl",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.curl/spec b/engine/tests/Functional.
curl/spec
new file mode 100644
index 0000000..ee8160a
--- /dev/null
+++ b/engine/tests/Functional.curl/spec
@@ -0,0 +1,10 @@
+{
+    "testName": "Functional.curl",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.expat/Functional.expat.spec
b/engine/tests/Functional.expat/Functional.expat.spec
deleted file mode 100644
index 2edd1b6..0000000
--- a/engine/tests/Functional.expat/Functional.expat.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.expat",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.expat/spec b/engine/tests/Functional.
expat/spec
new file mode 100644
index 0000000..2edd1b6
--- /dev/null
+++ b/engine/tests/Functional.expat/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.expat",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
b/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
deleted file mode 100644
index 2f9ea91..0000000
--- a/engine/tests/Functional.fixesproto/Functional.fixesproto.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.fixesproto",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.fixesproto/spec
b/engine/tests/Functional.fixesproto/spec
new file mode 100644
index 0000000..2f9ea91
--- /dev/null
+++ b/engine/tests/Functional.fixesproto/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.fixesproto",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
b/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
deleted file mode 100644
index 1237d46..0000000
--- a/engine/tests/Functional.fontconfig/Functional.fontconfig.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.fontconfig",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.fontconfig/spec
b/engine/tests/Functional.fontconfig/spec
new file mode 100644
index 0000000..1237d46
--- /dev/null
+++ b/engine/tests/Functional.fontconfig/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.fontconfig",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
b/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
deleted file mode 100644
index 1fb7446..0000000
--- a/engine/tests/Functional.fsfuzz/Functional.fsfuzz.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.fsfuzz",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.fsfuzz/spec b/engine/tests/Functional.
fsfuzz/spec
new file mode 100644
index 0000000..1fb7446
--- /dev/null
+++ b/engine/tests/Functional.fsfuzz/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.fsfuzz",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
b/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
deleted file mode 100644
index edce877..0000000
--- a/engine/tests/Functional.ft2demos/Functional.ft2demos.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.ft2demos",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.ft2demos/spec
b/engine/tests/Functional.ft2demos/spec
new file mode 100644
index 0000000..edce877
--- /dev/null
+++ b/engine/tests/Functional.ft2demos/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.ft2demos",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
b/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
deleted file mode 100644
index 47c6eda..0000000
--- a/engine/tests/Functional.fuego_abort/Functional.fuego_abort.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "testName": "Functional.fuego_test_phases",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.fuego_abort/spec
b/engine/tests/Functional.fuego_abort/spec
new file mode 100644
index 0000000..47c6eda
--- /dev/null
+++ b/engine/tests/Functional.fuego_abort/spec
@@ -0,0 +1,10 @@
+{
+    "testName": "Functional.fuego_test_phases",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.fuego_board_check/Functional.fuego_board_check.spec
b/engine/tests/Functional.fuego_board_check/Functional.
fuego_board_check.spec
deleted file mode 100644
index 05ff8e6..0000000
--- a/engine/tests/Functional.fuego_board_check/Functional.
fuego_board_check.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "testName": "Functional.fuego_board_check",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
-
-
-
diff --git a/engine/tests/Functional.fuego_board_check/spec
b/engine/tests/Functional.fuego_board_check/spec
new file mode 100644
index 0000000..05ff8e6
--- /dev/null
+++ b/engine/tests/Functional.fuego_board_check/spec
@@ -0,0 +1,13 @@
+{
+    "testName": "Functional.fuego_board_check",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
+
+
+
diff --git a/engine/tests/Functional.fuego_test_phases/Functional.fuego_test_phases.spec
b/engine/tests/Functional.fuego_test_phases/Functional.
fuego_test_phases.spec
deleted file mode 100644
index 47c6eda..0000000
--- a/engine/tests/Functional.fuego_test_phases/Functional.
fuego_test_phases.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "testName": "Functional.fuego_test_phases",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.fuego_test_phases/spec
b/engine/tests/Functional.fuego_test_phases/spec
new file mode 100644
index 0000000..47c6eda
--- /dev/null
+++ b/engine/tests/Functional.fuego_test_phases/spec
@@ -0,0 +1,10 @@
+{
+    "testName": "Functional.fuego_test_phases",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
b/engine/tests/Functional.fuego_transport/Functional.fuego_transport.spec
deleted file mode 100644
index a4fae24..0000000
--- a/engine/tests/Functional.fuego_transport/Functional.
fuego_transport.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.fuego_transport",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.fuego_transport/spec
b/engine/tests/Functional.fuego_transport/spec
new file mode 100644
index 0000000..a4fae24
--- /dev/null
+++ b/engine/tests/Functional.fuego_transport/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.fuego_transport",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.fuse/Functional.fuse.spec
b/engine/tests/Functional.fuse/Functional.fuse.spec
deleted file mode 100644
index 11a0ffc..0000000
--- a/engine/tests/Functional.fuse/Functional.fuse.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.fuse",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.fuse/spec b/engine/tests/Functional.
fuse/spec
new file mode 100644
index 0000000..11a0ffc
--- /dev/null
+++ b/engine/tests/Functional.fuse/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.fuse",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.giflib/Functional.giflib.spec
b/engine/tests/Functional.giflib/Functional.giflib.spec
deleted file mode 100644
index 8143cf4..0000000
--- a/engine/tests/Functional.giflib/Functional.giflib.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.giflib",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.giflib/spec b/engine/tests/Functional.
giflib/spec
new file mode 100644
index 0000000..8143cf4
--- /dev/null
+++ b/engine/tests/Functional.giflib/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.giflib",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.glib/Functional.glib.spec
b/engine/tests/Functional.glib/Functional.glib.spec
deleted file mode 100644
index 1266660..0000000
--- a/engine/tests/Functional.glib/Functional.glib.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.glib",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.glib/spec b/engine/tests/Functional.
glib/spec
new file mode 100644
index 0000000..1266660
--- /dev/null
+++ b/engine/tests/Functional.glib/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.glib",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.glib2/Functional.glib2.spec
b/engine/tests/Functional.glib2/Functional.glib2.spec
deleted file mode 100644
index 15bd79f..0000000
--- a/engine/tests/Functional.glib2/Functional.glib2.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.glib2",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.glib2/spec b/engine/tests/Functional.
glib2/spec
new file mode 100644
index 0000000..15bd79f
--- /dev/null
+++ b/engine/tests/Functional.glib2/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.glib2",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.glibc/Functional.glibc.spec
b/engine/tests/Functional.glibc/Functional.glibc.spec
deleted file mode 100644
index f687253..0000000
--- a/engine/tests/Functional.glibc/Functional.glibc.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.glibc",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.glibc/spec b/engine/tests/Functional.
glibc/spec
new file mode 100644
index 0000000..f687253
--- /dev/null
+++ b/engine/tests/Functional.glibc/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.glibc",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.hciattach/Functional.hciattach.spec
b/engine/tests/Functional.hciattach/Functional.hciattach.spec
deleted file mode 100644
index 536da9b..0000000
--- a/engine/tests/Functional.hciattach/Functional.hciattach.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.hciattach",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.hciattach/spec
b/engine/tests/Functional.hciattach/spec
new file mode 100644
index 0000000..536da9b
--- /dev/null
+++ b/engine/tests/Functional.hciattach/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.hciattach",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.hello_world/Functional.hello_world.spec
b/engine/tests/Functional.hello_world/Functional.hello_world.spec
deleted file mode 100644
index 4e1bea5..0000000
--- a/engine/tests/Functional.hello_world/Functional.hello_world.spec
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "testName": "Functional.hello_world",
-    "specs":
-    [
-        {
-            "name":"hello-fail",
-            "ARG":"-f"
-        },
-        {
-            "name":"hello-random",
-            "ARG":"-r"
-        },
-        {
-            "name":"default",
-            "ARG":""
-        }
-    ]
-}
-
diff --git a/engine/tests/Functional.hello_world/spec
b/engine/tests/Functional.hello_world/spec
new file mode 100644
index 0000000..4e1bea5
--- /dev/null
+++ b/engine/tests/Functional.hello_world/spec
@@ -0,0 +1,19 @@
+{
+    "testName": "Functional.hello_world",
+    "specs":
+    [
+        {
+            "name":"hello-fail",
+            "ARG":"-f"
+        },
+        {
+            "name":"hello-random",
+            "ARG":"-r"
+        },
+        {
+            "name":"default",
+            "ARG":""
+        }
+    ]
+}
+
diff --git a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
b/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
deleted file mode 100644
index 0c9babc..0000000
--- a/engine/tests/Functional.imagemagick/Functional.imagemagick.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.imagemagick",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.imagemagick/spec
b/engine/tests/Functional.imagemagick/spec
new file mode 100644
index 0000000..0c9babc
--- /dev/null
+++ b/engine/tests/Functional.imagemagick/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.imagemagick",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.iptables/Functional.iptables.spec
b/engine/tests/Functional.iptables/Functional.iptables.spec
deleted file mode 100644
index 101d26b..0000000
--- a/engine/tests/Functional.iptables/Functional.iptables.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.iptables",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.iptables/spec
b/engine/tests/Functional.iptables/spec
new file mode 100644
index 0000000..101d26b
--- /dev/null
+++ b/engine/tests/Functional.iptables/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.iptables",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.iputils/Functional.iputils.spec
b/engine/tests/Functional.iputils/Functional.iputils.spec
deleted file mode 100644
index 2dc83c7..0000000
--- a/engine/tests/Functional.iputils/Functional.iputils.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.iputils",
-    "specs": [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.iputils/spec b/engine/tests/Functional.
iputils/spec
new file mode 100644
index 0000000..2dc83c7
--- /dev/null
+++ b/engine/tests/Functional.iputils/spec
@@ -0,0 +1,8 @@
+{
+    "testName": "Functional.iputils",
+    "specs": [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
b/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
deleted file mode 100644
index 0c425b7..0000000
--- a/engine/tests/Functional.ipv6connect/Functional.ipv6connect.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.ipv6connect",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.ipv6connect/spec
b/engine/tests/Functional.ipv6connect/spec
new file mode 100644
index 0000000..0c425b7
--- /dev/null
+++ b/engine/tests/Functional.ipv6connect/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.ipv6connect",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.jpeg/Functional.jpeg.spec
b/engine/tests/Functional.jpeg/Functional.jpeg.spec
deleted file mode 100644
index a32bc0e..0000000
--- a/engine/tests/Functional.jpeg/Functional.jpeg.spec
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "testName": "Functional.jpeg",
-    "specs":
-    [
-        {
-            "name":"default"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.jpeg/spec b/engine/tests/Functional.
jpeg/spec
new file mode 100644
index 0000000..a32bc0e
--- /dev/null
+++ b/engine/tests/Functional.jpeg/spec
@@ -0,0 +1,9 @@
+{
+    "testName": "Functional.jpeg",
+    "specs":
+    [
+        {
+            "name":"default"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
b/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
deleted file mode 100644
index 39914a8..0000000
--- a/engine/tests/Functional.kernel_build/Functional.kernel_build.spec
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "testName": "Functional.kernel_build",
-    "specs":
-    [
-        {
-            "name": "cip-x86",
-            "repo": "https://github.com/cip-project/linux-cip.git"
-        },
-        {
-            "name": "cip-arm64",
-            "repo": "https://github.com/cip-project/linux-cip.git",
-            "platform": "aarch64",
-            "arch": "arm64",
-            "params": "-j8 Image dtbs modules",
-            "regex_p": "^  OBJCOPY arch/arm64/boot/Image"
-        }
-    ]
-}
diff --git a/engine/tests/Functional.kernel_build/spec
b/engine/tests/Functional.kernel_build/spec
new file mode 100644
index 0000000..39914a8
--- /dev/null
+++ b/engine/tests/Functional.kernel_build/spec
@@ -0,0 +1,18 @@
+{
+    "testName": "Functional.kernel_build",
+    "specs":
+    [
+        {
+            "name": "cip-x86",
+            "repo": "https://github.com/cip-project/linux-cip.git"
+        },
+        {
+            "name": "cip-arm64",
+            "repo": "https://github.com/cip-project/linux-cip.git",
+            "platform": "aarch64",
+            "arch": "arm64",
+            "params": "-j8 Image dtbs modules",
+            "regex_p": "^  OBJCOPY arch/arm64/boot/Image"
+        }
+    ]
+}
diff --git a/engine/tests/Functional.kmod/Functional.kmod.spec
b/engine/tests/Functional.kmod/Functional.kmod.spec
deleted file mode 100644
index 33df4b1..0000000
--- a/engine/tests/Functional.kmod/Functional.kmod.spec
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "testName": "Functional.kmod",
-    "specs": [
-        {
-            ...
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linuxfoundation.org/pipermail/fuego/attachments/20170428/79abaf27/attachment-0001.html>


More information about the Fuego mailing list