[v1,11/24] tests/tcg: move i386 specific tests into subdir

Message ID 20180410193919.28026-12-alex.bennee@linaro.org
State Superseded
Headers show
Series
  • fix building of tests/tcg
Related show

Commit Message

Alex Bennée April 10, 2018, 7:39 p.m.
These only need to be built for i386 guests. This includes a stub
tests/tcg/i386/Makfile.target which absorbs some of what was in
tests/tcg/Makefile.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/tcg/README                        |  39 --------------------------------
 tests/tcg/i386/Makefile.target          |  10 ++++++++
 tests/tcg/i386/README                   |  38 +++++++++++++++++++++++++++++++
 tests/tcg/{ => i386}/hello-i386.c       |   0
 tests/tcg/{ => i386}/pi_10.com          | Bin
 tests/tcg/{ => i386}/runcom.c           |   0
 tests/tcg/{ => i386}/test-i386-code16.S |   0
 tests/tcg/{ => i386}/test-i386-fprem.c  |   0
 tests/tcg/{ => i386}/test-i386-muldiv.h |   0
 tests/tcg/{ => i386}/test-i386-shift.h  |   0
 tests/tcg/{ => i386}/test-i386-ssse3.c  |   0
 tests/tcg/{ => i386}/test-i386-vm86.S   |   0
 tests/tcg/{ => i386}/test-i386.c        |   0
 tests/tcg/{ => i386}/test-i386.h        |   0
 14 files changed, 48 insertions(+), 39 deletions(-)
 create mode 100644 tests/tcg/i386/Makefile.target
 create mode 100644 tests/tcg/i386/README
 rename tests/tcg/{ => i386}/hello-i386.c (100%)
 rename tests/tcg/{ => i386}/pi_10.com (100%)
 rename tests/tcg/{ => i386}/runcom.c (100%)
 rename tests/tcg/{ => i386}/test-i386-code16.S (100%)
 rename tests/tcg/{ => i386}/test-i386-fprem.c (100%)
 rename tests/tcg/{ => i386}/test-i386-muldiv.h (100%)
 rename tests/tcg/{ => i386}/test-i386-shift.h (100%)
 rename tests/tcg/{ => i386}/test-i386-ssse3.c (100%)
 rename tests/tcg/{ => i386}/test-i386-vm86.S (100%)
 rename tests/tcg/{ => i386}/test-i386.c (100%)
 rename tests/tcg/{ => i386}/test-i386.h (100%)

-- 
2.16.2

Comments

Thomas Huth April 11, 2018, 10:30 a.m. | #1
On 10.04.2018 21:39, Alex Bennée wrote:
> These only need to be built for i386 guests. This includes a stub

> tests/tcg/i386/Makfile.target which absorbs some of what was in

> tests/tcg/Makefile.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  tests/tcg/README                        |  39 --------------------------------

>  tests/tcg/i386/Makefile.target          |  10 ++++++++

>  tests/tcg/i386/README                   |  38 +++++++++++++++++++++++++++++++

>  tests/tcg/{ => i386}/hello-i386.c       |   0

>  tests/tcg/{ => i386}/pi_10.com          | Bin

>  tests/tcg/{ => i386}/runcom.c           |   0

>  tests/tcg/{ => i386}/test-i386-code16.S |   0

>  tests/tcg/{ => i386}/test-i386-fprem.c  |   0

>  tests/tcg/{ => i386}/test-i386-muldiv.h |   0

>  tests/tcg/{ => i386}/test-i386-shift.h  |   0

>  tests/tcg/{ => i386}/test-i386-ssse3.c  |   0

>  tests/tcg/{ => i386}/test-i386-vm86.S   |   0


Maybe remove the "-i386-" part from the file name now?

Anyway:

Reviewed-by: Thomas Huth <thuth@redhat.com>
Philippe Mathieu-Daudé April 16, 2018, 12:08 a.m. | #2
On 04/10/2018 04:39 PM, Alex Bennée wrote:
> These only need to be built for i386 guests. This includes a stub

> tests/tcg/i386/Makfile.target which absorbs some of what was in


Mak[e]file

> tests/tcg/Makefile.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  tests/tcg/README                        |  39 --------------------------------

>  tests/tcg/i386/Makefile.target          |  10 ++++++++

>  tests/tcg/i386/README                   |  38 +++++++++++++++++++++++++++++++

>  tests/tcg/{ => i386}/hello-i386.c       |   0

>  tests/tcg/{ => i386}/pi_10.com          | Bin

>  tests/tcg/{ => i386}/runcom.c           |   0

>  tests/tcg/{ => i386}/test-i386-code16.S |   0

>  tests/tcg/{ => i386}/test-i386-fprem.c  |   0

>  tests/tcg/{ => i386}/test-i386-muldiv.h |   0

>  tests/tcg/{ => i386}/test-i386-shift.h  |   0

>  tests/tcg/{ => i386}/test-i386-ssse3.c  |   0

>  tests/tcg/{ => i386}/test-i386-vm86.S   |   0

>  tests/tcg/{ => i386}/test-i386.c        |   0

>  tests/tcg/{ => i386}/test-i386.h        |   0

>  14 files changed, 48 insertions(+), 39 deletions(-)

>  create mode 100644 tests/tcg/i386/Makefile.target

>  create mode 100644 tests/tcg/i386/README

>  rename tests/tcg/{ => i386}/hello-i386.c (100%)

>  rename tests/tcg/{ => i386}/pi_10.com (100%)

>  rename tests/tcg/{ => i386}/runcom.c (100%)

>  rename tests/tcg/{ => i386}/test-i386-code16.S (100%)

>  rename tests/tcg/{ => i386}/test-i386-fprem.c (100%)

>  rename tests/tcg/{ => i386}/test-i386-muldiv.h (100%)

>  rename tests/tcg/{ => i386}/test-i386-shift.h (100%)

>  rename tests/tcg/{ => i386}/test-i386-ssse3.c (100%)

>  rename tests/tcg/{ => i386}/test-i386-vm86.S (100%)

>  rename tests/tcg/{ => i386}/test-i386.c (100%)

>  rename tests/tcg/{ => i386}/test-i386.h (100%)

> 

> diff --git a/tests/tcg/README b/tests/tcg/README

> index 0890044cf0..469504c4cb 100644

> --- a/tests/tcg/README

> +++ b/tests/tcg/README

> @@ -3,45 +3,6 @@ regression testing. Tests are either multi-arch, meaning they can be

>  built for all guest architectures that support linux-user executable,

>  or they are architecture specific.

>  

> -i386

> -====

> -

> -test-i386

> ----------

> -

> -This program executes most of the 16 bit and 32 bit x86 instructions and

> -generates a text output, for comparison with the output obtained with

> -a real CPU or another emulator.

> -

> -The Linux system call modify_ldt() is used to create x86 selectors

> -to test some 16 bit addressing and 32 bit with segmentation cases.

> -

> -The Linux system call vm86() is used to test vm86 emulation.

> -

> -Various exceptions are raised to test most of the x86 user space

> -exception reporting.

> -

> -linux-test

> -----------

> -

> -This program tests various Linux system calls. It is used to verify

> -that the system call parameters are correctly converted between target

> -and host CPUs.

> -

> -test-i386-fprem

> ----------------

> -

> -runcom

> -------

> -

> -test-mmap

> ----------

> -

> -sha1

> -----

> -

> -hello-i386

> -----------

>  

>  

>  ARM

> diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target

> new file mode 100644

> index 0000000000..7dbb7992e7

> --- /dev/null

> +++ b/tests/tcg/i386/Makefile.target

> @@ -0,0 +1,10 @@

> +# i386 cross compile notes

> +

> +# If we are using a cross compiler config-target.mak may have also

> +# defined some CFLAGs to use.

> +

> +ifeq ($(CC), $(CROSS_CC_GUEST))

> +ifdef CROSS_CC_GUEST_CFLAGS

> +CFLAGS+=$(CROSS_CC_GUEST_CFLAGS)

> +endif

> +endif

> diff --git a/tests/tcg/i386/README b/tests/tcg/i386/README

> new file mode 100644

> index 0000000000..7a0a47bf27

> --- /dev/null

> +++ b/tests/tcg/i386/README

> @@ -0,0 +1,38 @@

> +These are i386 specific guest programs

> +

> +test-i386

> +---------

> +

> +This program executes most of the 16 bit and 32 bit x86 instructions and

> +generates a text output, for comparison with the output obtained with

> +a real CPU or another emulator.

> +

> +The Linux system call modify_ldt() is used to create x86 selectors

> +to test some 16 bit addressing and 32 bit with segmentation cases.

> +

> +The Linux system call vm86() is used to test vm86 emulation.

> +

> +Various exceptions are raised to test most of the x86 user space

> +exception reporting.

> +

> +linux-test

> +----------

> +

> +This program tests various Linux system calls. It is used to verify

> +that the system call parameters are correctly converted between target

> +and host CPUs.

> +

> +test-i386-fprem

> +---------------

> +

> +runcom

> +------

> +

> +test-mmap

> +---------

> +

> +sha1

> +----

> +

> +hello-i386

> +----------

> diff --git a/tests/tcg/hello-i386.c b/tests/tcg/i386/hello-i386.c

> similarity index 100%

> rename from tests/tcg/hello-i386.c

> rename to tests/tcg/i386/hello-i386.c

> diff --git a/tests/tcg/pi_10.com b/tests/tcg/i386/pi_10.com

> similarity index 100%

> rename from tests/tcg/pi_10.com

> rename to tests/tcg/i386/pi_10.com

> diff --git a/tests/tcg/runcom.c b/tests/tcg/i386/runcom.c

> similarity index 100%

> rename from tests/tcg/runcom.c

> rename to tests/tcg/i386/runcom.c

> diff --git a/tests/tcg/test-i386-code16.S b/tests/tcg/i386/test-i386-code16.S

> similarity index 100%

> rename from tests/tcg/test-i386-code16.S

> rename to tests/tcg/i386/test-i386-code16.S

> diff --git a/tests/tcg/test-i386-fprem.c b/tests/tcg/i386/test-i386-fprem.c

> similarity index 100%

> rename from tests/tcg/test-i386-fprem.c

> rename to tests/tcg/i386/test-i386-fprem.c

> diff --git a/tests/tcg/test-i386-muldiv.h b/tests/tcg/i386/test-i386-muldiv.h

> similarity index 100%

> rename from tests/tcg/test-i386-muldiv.h

> rename to tests/tcg/i386/test-i386-muldiv.h

> diff --git a/tests/tcg/test-i386-shift.h b/tests/tcg/i386/test-i386-shift.h

> similarity index 100%

> rename from tests/tcg/test-i386-shift.h

> rename to tests/tcg/i386/test-i386-shift.h

> diff --git a/tests/tcg/test-i386-ssse3.c b/tests/tcg/i386/test-i386-ssse3.c

> similarity index 100%

> rename from tests/tcg/test-i386-ssse3.c

> rename to tests/tcg/i386/test-i386-ssse3.c

> diff --git a/tests/tcg/test-i386-vm86.S b/tests/tcg/i386/test-i386-vm86.S

> similarity index 100%

> rename from tests/tcg/test-i386-vm86.S

> rename to tests/tcg/i386/test-i386-vm86.S

> diff --git a/tests/tcg/test-i386.c b/tests/tcg/i386/test-i386.c

> similarity index 100%

> rename from tests/tcg/test-i386.c

> rename to tests/tcg/i386/test-i386.c

> diff --git a/tests/tcg/test-i386.h b/tests/tcg/i386/test-i386.h

> similarity index 100%

> rename from tests/tcg/test-i386.h

> rename to tests/tcg/i386/test-i386.h

>

Patch

diff --git a/tests/tcg/README b/tests/tcg/README
index 0890044cf0..469504c4cb 100644
--- a/tests/tcg/README
+++ b/tests/tcg/README
@@ -3,45 +3,6 @@  regression testing. Tests are either multi-arch, meaning they can be
 built for all guest architectures that support linux-user executable,
 or they are architecture specific.
 
-i386
-====
-
-test-i386
----------
-
-This program executes most of the 16 bit and 32 bit x86 instructions and
-generates a text output, for comparison with the output obtained with
-a real CPU or another emulator.
-
-The Linux system call modify_ldt() is used to create x86 selectors
-to test some 16 bit addressing and 32 bit with segmentation cases.
-
-The Linux system call vm86() is used to test vm86 emulation.
-
-Various exceptions are raised to test most of the x86 user space
-exception reporting.
-
-linux-test
-----------
-
-This program tests various Linux system calls. It is used to verify
-that the system call parameters are correctly converted between target
-and host CPUs.
-
-test-i386-fprem
----------------
-
-runcom
-------
-
-test-mmap
----------
-
-sha1
-----
-
-hello-i386
-----------
 
 
 ARM
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
new file mode 100644
index 0000000000..7dbb7992e7
--- /dev/null
+++ b/tests/tcg/i386/Makefile.target
@@ -0,0 +1,10 @@ 
+# i386 cross compile notes
+
+# If we are using a cross compiler config-target.mak may have also
+# defined some CFLAGs to use.
+
+ifeq ($(CC), $(CROSS_CC_GUEST))
+ifdef CROSS_CC_GUEST_CFLAGS
+CFLAGS+=$(CROSS_CC_GUEST_CFLAGS)
+endif
+endif
diff --git a/tests/tcg/i386/README b/tests/tcg/i386/README
new file mode 100644
index 0000000000..7a0a47bf27
--- /dev/null
+++ b/tests/tcg/i386/README
@@ -0,0 +1,38 @@ 
+These are i386 specific guest programs
+
+test-i386
+---------
+
+This program executes most of the 16 bit and 32 bit x86 instructions and
+generates a text output, for comparison with the output obtained with
+a real CPU or another emulator.
+
+The Linux system call modify_ldt() is used to create x86 selectors
+to test some 16 bit addressing and 32 bit with segmentation cases.
+
+The Linux system call vm86() is used to test vm86 emulation.
+
+Various exceptions are raised to test most of the x86 user space
+exception reporting.
+
+linux-test
+----------
+
+This program tests various Linux system calls. It is used to verify
+that the system call parameters are correctly converted between target
+and host CPUs.
+
+test-i386-fprem
+---------------
+
+runcom
+------
+
+test-mmap
+---------
+
+sha1
+----
+
+hello-i386
+----------
diff --git a/tests/tcg/hello-i386.c b/tests/tcg/i386/hello-i386.c
similarity index 100%
rename from tests/tcg/hello-i386.c
rename to tests/tcg/i386/hello-i386.c
diff --git a/tests/tcg/pi_10.com b/tests/tcg/i386/pi_10.com
similarity index 100%
rename from tests/tcg/pi_10.com
rename to tests/tcg/i386/pi_10.com
diff --git a/tests/tcg/runcom.c b/tests/tcg/i386/runcom.c
similarity index 100%
rename from tests/tcg/runcom.c
rename to tests/tcg/i386/runcom.c
diff --git a/tests/tcg/test-i386-code16.S b/tests/tcg/i386/test-i386-code16.S
similarity index 100%
rename from tests/tcg/test-i386-code16.S
rename to tests/tcg/i386/test-i386-code16.S
diff --git a/tests/tcg/test-i386-fprem.c b/tests/tcg/i386/test-i386-fprem.c
similarity index 100%
rename from tests/tcg/test-i386-fprem.c
rename to tests/tcg/i386/test-i386-fprem.c
diff --git a/tests/tcg/test-i386-muldiv.h b/tests/tcg/i386/test-i386-muldiv.h
similarity index 100%
rename from tests/tcg/test-i386-muldiv.h
rename to tests/tcg/i386/test-i386-muldiv.h
diff --git a/tests/tcg/test-i386-shift.h b/tests/tcg/i386/test-i386-shift.h
similarity index 100%
rename from tests/tcg/test-i386-shift.h
rename to tests/tcg/i386/test-i386-shift.h
diff --git a/tests/tcg/test-i386-ssse3.c b/tests/tcg/i386/test-i386-ssse3.c
similarity index 100%
rename from tests/tcg/test-i386-ssse3.c
rename to tests/tcg/i386/test-i386-ssse3.c
diff --git a/tests/tcg/test-i386-vm86.S b/tests/tcg/i386/test-i386-vm86.S
similarity index 100%
rename from tests/tcg/test-i386-vm86.S
rename to tests/tcg/i386/test-i386-vm86.S
diff --git a/tests/tcg/test-i386.c b/tests/tcg/i386/test-i386.c
similarity index 100%
rename from tests/tcg/test-i386.c
rename to tests/tcg/i386/test-i386.c
diff --git a/tests/tcg/test-i386.h b/tests/tcg/i386/test-i386.h
similarity index 100%
rename from tests/tcg/test-i386.h
rename to tests/tcg/i386/test-i386.h