[COMMITTED,MSP430,TESTSUITE] Move devices-main.c test source file
diff mbox series

Message ID 20191031184830.520ceaec@jozef-kubuntu
State New
Headers show
Series
  • [COMMITTED,MSP430,TESTSUITE] Move devices-main.c test source file
Related show

Commit Message

Jozef Lawrynowicz Oct. 31, 2019, 6:48 p.m. UTC
In preparation for an upcoming patch, I've moved devices-main.c from
gcc.target/msp430/devices-main.c to gcc.target/msp430/devices/devices-main.c
and updated references to it in the test source files.

Committed as obvious.

Patch
diff mbox series

From c2c40bdeb6d8212bfe6435154e1f31882ce36478 Mon Sep 17 00:00:00 2001
From: jozefl <jozefl@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 31 Oct 2019 17:36:53 +0000
Subject: [PATCH] 2019-10-31  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* gcc.target/msp430/devices-main.c: Move to devices subdirectory.
	* gcc.target/msp430/devices/bad-devices-1.c: Update #include path to
	devices-main.c.
	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
	* gcc.target/msp430/devices/hard-foo.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277684 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                       | 34 +++++++++++++++++++
 .../gcc.target/msp430/devices/bad-devices-1.c |  2 +-
 .../gcc.target/msp430/devices/bad-devices-2.c |  2 +-
 .../gcc.target/msp430/devices/bad-devices-3.c |  2 +-
 .../gcc.target/msp430/devices/bad-devices-4.c |  2 +-
 .../gcc.target/msp430/devices/bad-devices-5.c |  2 +-
 .../gcc.target/msp430/devices/bad-devices-6.c |  2 +-
 .../msp430/devices/csv-device-order.c         |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_00.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_01.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_02.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_04.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_08.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_10.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_11.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_12.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_14.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_18.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_20.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_21.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_22.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_24.c |  2 +-
 .../gcc.target/msp430/devices/csv-msp430_28.c |  2 +-
 .../msp430/devices/csv-msp430fr5969.c         |  2 +-
 .../gcc.target/msp430/devices/devices-main.c  |  6 ++++
 .../msp430/devices/hard-cc430f5123.c          |  2 +-
 .../gcc.target/msp430/devices/hard-foo.c      |  2 +-
 .../msp430/devices/hard-msp430afe253.c        |  2 +-
 .../msp430/devices/hard-msp430cg4616.c        |  2 +-
 .../msp430/devices/hard-msp430f4783.c         |  2 +-
 .../msp430/devices/hard-rf430frl154h_rom.c    |  2 +-
 31 files changed, 69 insertions(+), 29 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/msp430/devices/devices-main.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1830b4d691f..79936089d20 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,37 @@ 
+2019-10-31  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/devices-main.c: Move to devices subdirectory.
+	* gcc.target/msp430/devices/bad-devices-1.c: Update #include path to
+	devices-main.c.
+	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
+	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
+	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
+	* gcc.target/msp430/devices/hard-foo.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
+	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.
+
 2019-10-31  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* g++.target/aarch64/sve/vcond_1_run.C: Update test name.
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
index 29ef85968d5..2f01d7797cb 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'CPU_TYPE' column heading is missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
index 32e5cebd46e..dcf37c52947 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'MPY_TYPE' column heading is missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
index c982c4a7de5..9556104b69a 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'CPU_TYPE' and 'MPY_TYPE' column headings are missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
index 89ebe61d179..d687fd2206b 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "format of column headings in 'devices.csv' is incorrect" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
index e33bac06b42..639608400ad 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "invalid 'CPU_TYPE' value of '5' read from 'devices.csv' for 'msp430_00'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
index 9dd9ed9e156..9c31811d917 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
@@ -2,4 +2,4 @@ 
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "invalid 'MPY_TYPE' value of '3' read from 'devices.csv' for 'msp430_00'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c b/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
index 172880321de..2bc338cd0ac 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
@@ -8,4 +8,4 @@ 
    devices.csv, but should not be matched.
    Errors and warnings will be emitted if msp430f0123 is wrongly matched.  */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
index 8d56873140e..908faf2b9df 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
index 154511b6fea..36d5789185f 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
index 4c721638903..7d16dc7b390 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
index c8ed711eb1d..a58796cec86 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
index 0214e636644..acb9bc2e1a7 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
index 86f89ed51cf..807f2999ed4 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "does not have hardware multiply" "" { target msp430_hwmul_not_none } 0 } */
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
index 2923238e6b8..af0437a77d0 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
index ed59ac890c1..c06ba8e4681 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
index fb038a0d30f..69c769530d4 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit hardware multiply" "" { target msp430_hwmul_not_32bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
index 133f984d031..cdd06680788 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
index c7c94252b00..df8256480a6 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "does not have hardware multiply" "" { target msp430_hwmul_not_none } 0 } */
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
index 8794f891db7..f46e4e47f32 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
index 47d90f4f730..ebc3c73b9bb 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
index 0a616307e86..ea031aa329d 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit hardware multiply" "" { target msp430_hwmul_not_32bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
index 1243f7527e3..ad002cee539 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
index 636460756ad..392ac99e54f 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
@@ -8,4 +8,4 @@ 
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/devices-main.c b/gcc/testsuite/gcc.target/msp430/devices/devices-main.c
new file mode 100644
index 00000000000..20448f4f03d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/devices/devices-main.c
@@ -0,0 +1,6 @@ 
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c b/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
index 15a4ae1a584..ec9e061a189 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
 /* revision=2, hwmpy=8 */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c b/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
index e13acb52c50..2c0f572d9b3 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
@@ -3,4 +3,4 @@ 
 /* { dg-warning "could not locate MCU data file 'devices.csv'" "" { target *-*-* } 0 } */
 /* { dg-warning "Unrecognized MCU name 'msp430foo'.*\n.*Use the" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
index 9edf6eb02a7..d19e09b33f2 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
@@ -5,4 +5,4 @@ 
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=2  */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
index 493d02258f2..877a1156d74 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
@@ -4,4 +4,4 @@ 
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
 /* revision=1, hwmpy=1 */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
index af918c3e516..ae0ae0c82f1 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
@@ -5,4 +5,4 @@ 
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=4  */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c b/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
index ad0c33d39b3..306d1d6c091 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
@@ -5,4 +5,4 @@ 
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=0  */
-#include "../devices-main.c"
+#include "devices-main.c"
-- 
2.17.1