aboutsummaryrefslogtreecommitdiff
path: root/libphobos
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2019-02-18 13:53:51 +0000
committerRainer Orth <ro@gcc.gnu.org>2019-02-18 13:53:51 +0000
commitcc2cc3bef3510b8ed9c485292f1dc4de607eba84 (patch)
treeb371bdf150a13a6ebcfa696005d0e3cc42c727bd /libphobos
parentc41491973b05547236fe0bb82ae2419607c6f3ef (diff)
downloadgcc-cc2cc3bef3510b8ed9c485292f1dc4de607eba84.zip
gcc-cc2cc3bef3510b8ed9c485292f1dc4de607eba84.tar.gz
gcc-cc2cc3bef3510b8ed9c485292f1dc4de607eba84.tar.bz2
Tabify all D *.exp files
libphobos: * testsuite/lib/libphobos-dg.exp: Tabify. * testsuite/lib/libphobos.exp: Likewise. * testsuite/libphobos.cycles/cycles.exp: Likewise. * testsuite/libphobos.shared/shared.exp: Likewise. * testsuite/libphobos.unittests/unittests.exp: Likewise. gcc/testsuite: * gdc.dg/dg.exp: Tabify. * gdc.dg/lto/lto.exp: Likewise. * gdc.test/gdc-test.exp: Likewise. * lib/gdc-dg.exp: Likewise. * lib/gdc.exp: Likewise. From-SVN: r268987
Diffstat (limited to 'libphobos')
-rw-r--r--libphobos/ChangeLog8
-rw-r--r--libphobos/testsuite/lib/libphobos-dg.exp12
-rw-r--r--libphobos/testsuite/lib/libphobos.exp74
-rw-r--r--libphobos/testsuite/libphobos.cycles/cycles.exp6
-rw-r--r--libphobos/testsuite/libphobos.shared/shared.exp16
-rw-r--r--libphobos/testsuite/libphobos.unittests/unittests.exp8
6 files changed, 66 insertions, 58 deletions
diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog
index 22766a2..c2bfe50 100644
--- a/libphobos/ChangeLog
+++ b/libphobos/ChangeLog
@@ -1,3 +1,11 @@
+2019-02-18 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * testsuite/lib/libphobos-dg.exp: Tabify.
+ * testsuite/lib/libphobos.exp: Likewise.
+ * testsuite/libphobos.cycles/cycles.exp: Likewise.
+ * testsuite/libphobos.shared/shared.exp: Likewise.
+ * testsuite/libphobos.unittests/unittests.exp: Likewise.
+
2019-02-14 Maya Rashish <coypu@sdf.org>
* configure.tgt: Add netbsd/x86 as supported target.
diff --git a/libphobos/testsuite/lib/libphobos-dg.exp b/libphobos/testsuite/lib/libphobos-dg.exp
index b796011..5f33e4d 100644
--- a/libphobos/testsuite/lib/libphobos-dg.exp
+++ b/libphobos/testsuite/lib/libphobos-dg.exp
@@ -42,11 +42,11 @@ if { [info procs libphobos_load] != [list] \
rename libphobos_load prev_libphobos_load
proc libphobos_load { program args } {
- global libphobos_run_args
- if { $libphobos_run_args != "" } {
- set args [concat "{$libphobos_run_args}"]
- }
- set result [eval [list prev_libphobos_load $program] $args ]
- return $result
+ global libphobos_run_args
+ if { $libphobos_run_args != "" } {
+ set args [concat "{$libphobos_run_args}"]
+ }
+ set result [eval [list prev_libphobos_load $program] $args ]
+ return $result
}
}
diff --git a/libphobos/testsuite/lib/libphobos.exp b/libphobos/testsuite/lib/libphobos.exp
index 3985b44..1944c7d 100644
--- a/libphobos/testsuite/lib/libphobos.exp
+++ b/libphobos/testsuite/lib/libphobos.exp
@@ -48,30 +48,30 @@ proc libphobos-dg-test { prog do_what extra_tool_flags } {
# Set up the compiler flags, based on what we're going to do.
switch $do_what {
- "run" {
- set compile_type "executable"
- # FIXME: "./" is to cope with "." not being in $PATH.
- # Should this be handled elsewhere?
- # YES.
- set output_file "./[file rootname [file tail $prog]].exe"
- # This is the only place where we care if an executable was
- # created or not. If it was, dg.exp will try to run it.
- catch { remote_file build delete $output_file }
- }
- "link" {
- set compile_type "executable"
- set output_file "./[file rootname [file tail $prog]].exe"
- }
- default {
- perror "$do_what: not a valid dg-do keyword"
- return ""
- }
+ "run" {
+ set compile_type "executable"
+ # FIXME: "./" is to cope with "." not being in $PATH.
+ # Should this be handled elsewhere?
+ # YES.
+ set output_file "./[file rootname [file tail $prog]].exe"
+ # This is the only place where we care if an executable was
+ # created or not. If it was, dg.exp will try to run it.
+ catch { remote_file build delete $output_file }
+ }
+ "link" {
+ set compile_type "executable"
+ set output_file "./[file rootname [file tail $prog]].exe"
+ }
+ default {
+ perror "$do_what: not a valid dg-do keyword"
+ return ""
+ }
}
set select_compile "libphobos_target_compile"
set options ""
if { $extra_tool_flags != "" } {
- lappend options "additional_flags=$extra_tool_flags"
+ lappend options "additional_flags=$extra_tool_flags"
}
set comp_output [$select_compile "$prog" "$output_file" "$compile_type" $options]
@@ -95,15 +95,15 @@ proc libphobos_init { args } {
# If a testcase doesn't have special options, use these.
if ![info exists DEFAULT_DFLAGS] then {
- set DEFAULT_DFLAGS ""
+ set DEFAULT_DFLAGS ""
}
# By default, we assume we want to run program images.
global dg-do-what-default
if [isnative] {
- set dg-do-what-default "run"
+ set dg-do-what-default "run"
} else {
- set dg-do-what-default "link"
+ set dg-do-what-default "link"
}
# What arguments to pass to run program images.
@@ -121,15 +121,15 @@ proc libphobos_init { args } {
set gdcldflags ""
if { [file exists $flags_file] } {
- set gdc [exec sh $flags_file --gdc]
- set gdcflags [exec sh $flags_file --gdcflags]
- set gdcpaths [exec sh $flags_file --gdcpaths]
- set gdcldflags [exec sh $flags_file --gdcldflags]
+ set gdc [exec sh $flags_file --gdc]
+ set gdcflags [exec sh $flags_file --gdcflags]
+ set gdcpaths [exec sh $flags_file --gdcpaths]
+ set gdcldflags [exec sh $flags_file --gdcldflags]
}
set exeext ""
if [info exists env(EXEEXT)] {
- set exeext $env(EXEEXT)
+ set exeext $env(EXEEXT)
}
# Compute what needs to be added to the existing LD_LIBRARY_PATH.
@@ -137,16 +137,16 @@ proc libphobos_init { args } {
set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a]
if {$gccdir != ""} {
- set gccdir [file dirname $gccdir]
- append ld_library_path ":${gccdir}"
+ set gccdir [file dirname $gccdir]
+ append ld_library_path ":${gccdir}"
}
if { [file exists "${blddir}/libdruntime/.libs/libgdruntime.${shlib_ext}"] } {
- append ld_library_path ":${blddir}/libdruntime/.libs"
+ append ld_library_path ":${blddir}/libdruntime/.libs"
}
if { [file exists "${blddir}/src/.libs/libgphobos.${shlib_ext}"] } {
- append ld_library_path ":${blddir}/src/.libs"
+ append ld_library_path ":${blddir}/src/.libs"
}
set_ld_library_path_env_vars
@@ -166,21 +166,21 @@ proc libphobos_target_compile { source dest type options } {
lappend options "additional_flags=-fno-diagnostics-show-caret -fdiagnostics-color=never"
if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
- lappend options "libs=${gluefile}"
- lappend options "ldflags=${wrap_flags}"
+ lappend options "libs=${gluefile}"
+ lappend options "ldflags=${wrap_flags}"
}
# Flag setting based on type argument.
if { $type == "executable" } {
- # Link the support objects into executables.
- lappend options "additional_flags=$gdcldflags"
+ # Link the support objects into executables.
+ lappend options "additional_flags=$gdcldflags"
}
# Set the compiler, only add D flags and paths if building D sources.
set gdc_final $gdc
if [regexp ".*\.d\$" $source] {
- set gdc_final [concat $gdc_final $gdcflags]
- set gdc_final [concat $gdc_final $gdcpaths]
+ set gdc_final [concat $gdc_final $gdcflags]
+ set gdc_final [concat $gdc_final $gdcpaths]
}
lappend options "compiler=$gdc_final"
diff --git a/libphobos/testsuite/libphobos.cycles/cycles.exp b/libphobos/testsuite/libphobos.cycles/cycles.exp
index 0bc99ca..5ea2fe4 100644
--- a/libphobos/testsuite/libphobos.cycles/cycles.exp
+++ b/libphobos/testsuite/libphobos.cycles/cycles.exp
@@ -20,7 +20,7 @@ set dg-output-text [list]
# Arguments to pass to the test program, expected output, and return code.
set cycle_test_list [list \
- { ignore "" 0 } \
+ { ignore "" 0 } \
{ abort "object.Error@.*: Cyclic dependency between module mod. and mod." 1 } \
{ print "Cyclic dependency between module mod. and mod." 0 } \
{ deprecate "Deprecation 16211 warning:" 0 } \
@@ -41,8 +41,8 @@ foreach cycle_test $cycle_test_list {
set expected_fail [lindex $cycle_test 2]
foreach test $tests {
- set shouldfail $expected_fail
- dg-test $test "" $DEFAULT_DFLAGS
+ set shouldfail $expected_fail
+ dg-test $test "" $DEFAULT_DFLAGS
}
set shouldfail 0
diff --git a/libphobos/testsuite/libphobos.shared/shared.exp b/libphobos/testsuite/libphobos.shared/shared.exp
index ecbf928..7765634 100644
--- a/libphobos/testsuite/libphobos.shared/shared.exp
+++ b/libphobos/testsuite/libphobos.shared/shared.exp
@@ -39,9 +39,9 @@ proc shared_library { source destfile options } {
set comp_output [libphobos_target_compile "$source" "$destfile" "executable" $options]
if ![ string match "" $comp_output ] {
- fail "libphobos.shared/[file tail $source]"
- verbose -log $comp_output
- return 1
+ fail "libphobos.shared/[file tail $source]"
+ verbose -log $comp_output
+ return 1
}
lappend all_libraries $destfile
@@ -52,7 +52,7 @@ shared_library "$srcdir/$subdir/lib.d" "lib.so" ""
# liblinkdep.so
shared_library "$srcdir/$subdir/liblinkdep.d" "liblinkdep.so" \
- [list "additional_flags=-I$srcdir/$subdir lib.so"]
+ [list "additional_flags=-I$srcdir/$subdir lib.so"]
# libloaddep.so
shared_library "$srcdir/$subdir/libloaddep.d" "libloaddep.so" ""
@@ -69,14 +69,14 @@ dg-init
# Main loop.
dg-test "$srcdir/$subdir/link.d" "-I$srcdir/$subdir lib.so -shared-libphobos" \
- "$DEFAULT_DFLAGS"
+ "$DEFAULT_DFLAGS"
dg-test "$srcdir/$subdir/link_linkdep.d" \
- "-I$srcdir/$subdir liblinkdep.so lib.so -shared-libphobos" \
- "$DEFAULT_DFLAGS"
+ "-I$srcdir/$subdir liblinkdep.so lib.so -shared-libphobos" \
+ "$DEFAULT_DFLAGS"
dg-test "$srcdir/$subdir/link_loaddep.d" \
- "-I$srcdir/$subdir libloaddep.so -shared-libphobos" "$DEFAULT_DFLAGS"
+ "-I$srcdir/$subdir libloaddep.so -shared-libphobos" "$DEFAULT_DFLAGS"
# dlopen() tests.
if [is-effective-target dlopen] {
diff --git a/libphobos/testsuite/libphobos.unittests/unittests.exp b/libphobos/testsuite/libphobos.unittests/unittests.exp
index 4379714..b734a9b 100644
--- a/libphobos/testsuite/libphobos.unittests/unittests.exp
+++ b/libphobos/testsuite/libphobos.unittests/unittests.exp
@@ -29,15 +29,15 @@ proc unittest_list_modules { prog } {
# Runs all unittests for each module compiled into the test program.
proc unittest_run_tests { name prog } {
foreach module [unittest_list_modules $prog] {
- set result [libphobos_load "$prog" "$module" ""]
- set status [lindex $result 0]
- $status "libphobos.unittests/$name/$module"
+ set result [libphobos_load "$prog" "$module" ""]
+ set status [lindex $result 0]
+ $status "libphobos.unittests/$name/$module"
}
}
proc unittester { name prog } {
if [file exists $prog] {
- unittest_run_tests $name $prog
+ unittest_run_tests $name $prog
}
}