From 40fc3e43cea224623400ac07b6f03c700d209dec Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 27 Apr 2009 04:34:42 -0400
Subject: Add function of returning the char in given position of string

* tapset/string.stp: New function stringat.
* testsuite/systemtap.printf/char1.exp: Update test case.
* testsuite/systemtap.printf/char1.stp: Ditto.
---
 testsuite/systemtap.printf/char1.exp | 2 +-
 testsuite/systemtap.printf/char1.stp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'testsuite/systemtap.printf')

diff --git a/testsuite/systemtap.printf/char1.exp b/testsuite/systemtap.printf/char1.exp
index 35aa479f..f9343c0e 100644
--- a/testsuite/systemtap.printf/char1.exp
+++ b/testsuite/systemtap.printf/char1.exp
@@ -1,3 +1,3 @@
 set test "char1"
-set ::result_string {stap}
+set ::result_string {stapok}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.printf/char1.stp b/testsuite/systemtap.printf/char1.stp
index 207d1bc5..564c416b 100644
--- a/testsuite/systemtap.printf/char1.stp
+++ b/testsuite/systemtap.printf/char1.stp
@@ -3,6 +3,7 @@ probe begin
 	printf("%c", 115)
 	printf("%c", 116)
 	printf("%c%c", 97, 112)
+	printf("%c%c", stringat("ok", 0), stringat("ok", 1))
 	print("\n")
 	exit()
 }
-- 
cgit 


From c4f51a54acff992cf19902ffd56e8338158c5811 Mon Sep 17 00:00:00 2001
From: Wenji Huang <wenji.huang@oracle.com>
Date: Mon, 27 Apr 2009 05:38:18 -0400
Subject: PR10099: Extend %M directive to support hexdumping large buffers

This patch will make %M directive dump the variable width
buffer in hex format instead of returning uint64_t number
as before.

* runtime/vsprintf.c: Modify %M directive.
* stap.1.in: Update description.
* testsuite/systemtap.printf/memory1.stp: Add test case.
---
 testsuite/systemtap.printf/memory1.stp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'testsuite/systemtap.printf')

diff --git a/testsuite/systemtap.printf/memory1.stp b/testsuite/systemtap.printf/memory1.stp
index f9cbf60b..15aa565b 100644
--- a/testsuite/systemtap.printf/memory1.stp
+++ b/testsuite/systemtap.printf/memory1.stp
@@ -113,6 +113,20 @@ probe syscall.open {
 		success = 0;
 	}
 
+	expected_16_actual = sprintf ("  %02x%02x%02x%02x%02x%02x",
+				      stringat(filename, 0),
+				      stringat(filename, 1),
+				      stringat(filename, 2),
+				      stringat(filename, 3),
+				      stringat(filename, 4),
+				      stringat(filename, 5));
+	testName = "%M dynamic width larger than dynamic precision";
+	result = sprintf ("%*.*M", 14, 6, $filename);
+	if (result != expected_16_actual) {
+		printf ("Test %s failed\n", testName);
+		success = 0;
+	}
+
 	if (success)
 	   print ("Test passed\n");
 
-- 
cgit