From 50e021a590c75eae2ad86d3874b29eedf63b9646 Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Wed, 13 Mar 2019 00:18:37 +0000
Subject: [PATCH] pr88957.d: Move to gdc.dg/ubsan.

gcc/testsuite/ChangeLog:

2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>

	* gdc.dg/pr88957.d: Move to gdc.dg/ubsan.
	* gdc.dg/ubsan/ubsan.exp: New file.
	* lib/gdc.exp (gdc_include_flags): Remove unused target variable.
	Explicitly return flags from procedure.

From-SVN: r269632
---
 gcc/testsuite/ChangeLog                    |  7 +++++
 gcc/testsuite/gdc.dg/{ => ubsan}/pr88957.d |  0
 gcc/testsuite/gdc.dg/ubsan/ubsan.exp       | 32 ++++++++++++++++++++++
 gcc/testsuite/lib/gdc.exp                  |  3 +-
 4 files changed, 41 insertions(+), 1 deletion(-)
 rename gcc/testsuite/gdc.dg/{ => ubsan}/pr88957.d (100%)
 create mode 100644 gcc/testsuite/gdc.dg/ubsan/ubsan.exp

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 94144c93a3d..d09651c5a97 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
+
+	* gdc.dg/pr88957.d: Move to gdc.dg/ubsan.
+	* gdc.dg/ubsan/ubsan.exp: New file.
+	* lib/gdc.exp (gdc_include_flags): Remove unused target variable.
+	Explicitly return flags from procedure.
+
 2019-03-13  Iain Buclaw  <ibuclaw@gdcproject.org>
 
 	PR d/88957
diff --git a/gcc/testsuite/gdc.dg/pr88957.d b/gcc/testsuite/gdc.dg/ubsan/pr88957.d
similarity index 100%
rename from gcc/testsuite/gdc.dg/pr88957.d
rename to gcc/testsuite/gdc.dg/ubsan/pr88957.d
diff --git a/gcc/testsuite/gdc.dg/ubsan/ubsan.exp b/gcc/testsuite/gdc.dg/ubsan/ubsan.exp
new file mode 100644
index 00000000000..a2e2da017cc
--- /dev/null
+++ b/gcc/testsuite/gdc.dg/ubsan/ubsan.exp
@@ -0,0 +1,32 @@
+#   Copyright (C) 2019 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# Load support procs.
+load_lib gdc-dg.exp
+load_lib ubsan-dg.exp
+
+# Initialize `dg'.
+dg-init
+ubsan_init
+
+# Main loop.
+if [check_effective_target_fsanitize_undefined] {
+  gdc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.d]] "" ""
+}
+
+# All done.
+ubsan_finish
+dg-finish
diff --git a/gcc/testsuite/lib/gdc.exp b/gcc/testsuite/lib/gdc.exp
index f5957c3d2ee..e09f5ee987a 100644
--- a/gcc/testsuite/lib/gdc.exp
+++ b/gcc/testsuite/lib/gdc.exp
@@ -78,7 +78,6 @@ proc gdc_include_flags { paths } {
     }
 
     set gccpath ${paths}
-    set target [file tail [file normalize ${paths}]]
 
     if { $gccpath != "" } {
 	if [file exists "${gccpath}/libphobos/libdruntime"] {
@@ -95,6 +94,8 @@ proc gdc_include_flags { paths } {
 	set idx [lsearch $cxxflags "-nostdinc++"]
 	append flags [lreplace $cxxflags $idx $idx]
     }
+
+    return "$flags"
 }
 
 #
-- 
2.30.2