Merge branch 'master' into pr6866

Resolved conflicts:
	runtime/task_finder.c: name vs path.

10 files changed, 11 insertions, 21 deletions

diff --git a/testsuite/systemtap.printf/basic3.exp b/testsuite/systemtap.printf/basic3.exp
index e3beb9ed..5c4f7e79 100644
--- a/testsuite/systemtap.printf/basic3.exp
+++ b/testsuite/systemtap.printf/basic3.exp
@@ -1,5 +1,4 @@
 set test "basic3"
 set ::result_string {Hello
-World
-}
+World}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/bin6.exp b/testsuite/systemtap.printf/bin6.exp
index 0de41e78..4c5e7f2b 100644
--- a/testsuite/systemtap.printf/bin6.exp
+++ b/testsuite/systemtap.printf/bin6.exp
diff --git a/testsuite/systemtap.printf/char1.exp b/testsuite/systemtap.printf/char1.exp
index 0e9232e9..35aa479f 100644
--- a/testsuite/systemtap.printf/char1.exp
+++ b/testsuite/systemtap.printf/char1.exp
@@ -1,4 +1,3 @@
 set test "char1"
-set ::result_string {stap
-}
-stap_run2 $srcdir/$subdir/$test.stp
\ No newline at end of file
+set ::result_string {stap}
+stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/int1.exp b/testsuite/systemtap.printf/int1.exp
index bb30b4f3..b308848c 100644
--- a/testsuite/systemtap.printf/int1.exp
+++ b/testsuite/systemtap.printf/int1.exp
@@ -19,6 +19,5 @@ set ::result_string {1,10,9000000000000,-1,-1024
 1,12,202757163310000,1777777777777777777777,1777777777777777776000
  1,12,202757163310000,1777777777777777777777,1777777777777777776000
                1,              12, 202757163310000,1777777777777777777777,1777777777777777776000
-0000000000000001,0000000000000012,0202757163310000,1777777777777777777777,1777777777777777776000
-}
+0000000000000001,0000000000000012,0202757163310000,1777777777777777777777,1777777777777777776000}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/memory1.exp b/testsuite/systemtap.printf/memory1.exp
index 7b55a3d7..c5f03610 100644
--- a/testsuite/systemtap.printf/memory1.exp
+++ b/testsuite/systemtap.printf/memory1.exp
@@ -1,4 +1,3 @@
 set test "memory1"
-set ::result_string {Test passed
-}
+set ::result_string {Test passed}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/print.exp b/testsuite/systemtap.printf/print.exp
index 3a4de529..151de10d 100644
--- a/testsuite/systemtap.printf/print.exp
+++ b/testsuite/systemtap.printf/print.exp
@@ -13,6 +13,5 @@ foo99
 888
 123456789
 hello999
-999hello
-}
+999hello}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/print_char.exp b/testsuite/systemtap.printf/print_char.exp
index bab056dd..a9d63be6 100644
--- a/testsuite/systemtap.printf/print_char.exp
+++ b/testsuite/systemtap.printf/print_char.exp
@@ -1,5 +1,4 @@
 set test "print_char"
 set ::result_string {ABC
-ABCDEFGHIJKLMNOPQRSTUVWXYZ
-}
+ABCDEFGHIJKLMNOPQRSTUVWXYZ}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/println.exp b/testsuite/systemtap.printf/println.exp
index 8deba53f..fcbe0c82 100644
--- a/testsuite/systemtap.printf/println.exp
+++ b/testsuite/systemtap.printf/println.exp
@@ -13,6 +13,5 @@ foo99
 99foo
 123456789
 hello999
-999hello
-}
+999hello}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/ptr.exp b/testsuite/systemtap.printf/ptr.exp
index f25a7a02..3eb412a7 100644
--- a/testsuite/systemtap.printf/ptr.exp
+++ b/testsuite/systemtap.printf/ptr.exp
@@ -29,8 +29,7 @@ if {$::tcl_platform(wordSize) == 8} {
 0x000001X
 0x12345678X
 0x12345678abcdef00X
-0x12345678X
-"
+0x12345678X"
 } else {
   set ::result_string "0x00000000
 0x00000001
@@ -60,7 +59,6 @@ if {$::tcl_platform(wordSize) == 8} {
 0x000001X
 0x12345678X
 0xabcdef00X
-0x12345678X
-"
+0x12345678X"
 }
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/string1.exp b/testsuite/systemtap.printf/string1.exp
index aee0b71a..7c94d645 100644
--- a/testsuite/systemtap.printf/string1.exp
+++ b/testsuite/systemtap.printf/string1.exp
@@ -1,6 +1,5 @@
 set test "string1"
 set ::result_string {The string is <Foobar!>
 Foobar!XYZZY
-XYZZYFoobar!XYZZYFoobar!
-}
+XYZZYFoobar!XYZZYFoobar!}
 stap_run2 $srcdir/$subdir/$test.stp