From 0fa344a92f52c5916a81b86557a3c1339a26e58b Mon Sep 17 00:00:00 2001 From: hunt Date: Wed, 10 Jan 2007 15:14:36 +0000 Subject: [PATCH] 2007-01-10 Martin Hunt * systemtap.maps/foreach_foreach.exp: Update for new delete func. * systemtap.maps/ii.exp: Ditto. * systemtap.maps/ii.stp: Ditto. * systemtap.maps/iiiiii.exp: Ditto. * systemtap.maps/iiiiii.stp: Ditto. * systemtap.maps/is.stp: Ditto. * systemtap.maps/si.exp: Ditto. * systemtap.maps/si.stp: Ditto. * systemtap.maps/ss.stp: Ditto. --- testsuite/ChangeLog | 12 ++++++++++++ testsuite/systemtap.maps/foreach_foreach.exp | 12 +++++++++++- testsuite/systemtap.maps/ii.exp | 8 +++++++- testsuite/systemtap.maps/ii.stp | 10 +++++----- testsuite/systemtap.maps/iiiiii.exp | 4 +++- testsuite/systemtap.maps/iiiiii.stp | 2 +- testsuite/systemtap.maps/is.stp | 8 ++++---- testsuite/systemtap.maps/si.exp | 8 +++++++- testsuite/systemtap.maps/si.stp | 8 ++++---- testsuite/systemtap.maps/ss.stp | 8 ++++---- 10 files changed, 58 insertions(+), 22 deletions(-) diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index f0f0f0c44..43b50f8b4 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2007-01-10 Martin Hunt + + * systemtap.maps/foreach_foreach.exp: Update for new delete func. + * systemtap.maps/ii.exp: Ditto. + * systemtap.maps/ii.stp: Ditto. + * systemtap.maps/iiiiii.exp: Ditto. + * systemtap.maps/iiiiii.stp: Ditto. + * systemtap.maps/is.stp: Ditto. + * systemtap.maps/si.exp: Ditto. + * systemtap.maps/si.stp: Ditto. + * systemtap.maps/ss.stp: Ditto. + 2006-12-29 Frank Ch. Eigler PR 3523. diff --git a/testsuite/systemtap.maps/foreach_foreach.exp b/testsuite/systemtap.maps/foreach_foreach.exp index a84937e3f..7ea5b9cd4 100644 --- a/testsuite/systemtap.maps/foreach_foreach.exp +++ b/testsuite/systemtap.maps/foreach_foreach.exp @@ -4,7 +4,8 @@ load_lib "stap_run2.exp" set test "foreach_foreach" -set ::result_string {foo[1] = 1 +set ::result_string {foo[0] = 0 +foo[1] = 1 foo[2] = 4 foo[3] = 9 foo[4] = 16 @@ -15,6 +16,7 @@ foo[8] = 64 foo[9] = 81 foo[10] = 100 +bar[0] = 0 bar[1] = 1 bar[2] = 8 bar[3] = 27 @@ -26,6 +28,8 @@ bar[8] = 512 bar[9] = 729 bar[10] = 1000 +foo[0] = 0 +bar[0] = 0 foo[1] = 1 bar[1] = 1 foo[2] = 4 @@ -47,6 +51,12 @@ bar[9] = 729 foo[10] = 100 bar[10] = 1000 +bar[20] = 8000 +bar[21] = 9261 +bar[22] = 10648 +bar[23] = 12167 +bar[24] = 13824 +foo[0] = 0 bar[20] = 8000 bar[21] = 9261 bar[22] = 10648 diff --git a/testsuite/systemtap.maps/ii.exp b/testsuite/systemtap.maps/ii.exp index 915e9c303..3b913696f 100644 --- a/testsuite/systemtap.maps/ii.exp +++ b/testsuite/systemtap.maps/ii.exp @@ -3,7 +3,8 @@ load_lib "stap_run2.exp" set test "ii" -set ::result_string {foo[1] = 1 +set ::result_string {foo[0] = 0 +foo[1] = 1 foo[2] = 4 foo[3] = 9 foo[4] = 16 @@ -14,6 +15,7 @@ foo[8] = 64 foo[9] = 81 foo[10] = 100 +foo[0] = 0 foo[1] = 1 foo[2] = 4 foo[3] = 9 @@ -24,6 +26,7 @@ foo[8] = 64 foo[9] = 81 foo[10] = 100 +foo[0] = 0 foo[2] = 4 foo[3] = 9 foo[4] = 16 @@ -32,6 +35,7 @@ foo[7] = 49 foo[8] = 64 foo[9] = 81 +foo[0] = 0 foo[2] = 4 foo[3] = 900 foo[4] = -16 @@ -40,6 +44,7 @@ foo[7] = 49 foo[8] = 64 foo[9] = -81 +foo[0] = 0 foo[2] = 4 foo[3] = 900 foo[6] = 36 @@ -48,6 +53,7 @@ foo[8] = 64 foo[9] = -81 +foo[0] = 0 foo[1] = 1 foo[2] = 5 foo[3] = 14 diff --git a/testsuite/systemtap.maps/ii.stp b/testsuite/systemtap.maps/ii.stp index a83ae8ce0..aaf627973 100755 --- a/testsuite/systemtap.maps/ii.stp +++ b/testsuite/systemtap.maps/ii.stp @@ -10,15 +10,15 @@ probe begin { printf("foo[%d] = %d\n", i, foo[i]) # delete out of the middle - foo[5] = 0 + delete foo[5] printf("\n") foreach (i in foo) printf("foo[%d] = %d\n", i, foo[i]) # delete first entry - foo[1] = 0 + delete foo[1] # and last entry - foo[10] = 0 + delete foo[10] printf("\n") foreach (i in foo) printf("foo[%d] = %d\n", i, foo[i]) @@ -32,14 +32,14 @@ probe begin { printf("foo[%d] = %d\n", i, foo[i]) # delete one - foo[4] = 0 + delete foo[4] printf("\n") foreach (i in foo) printf("foo[%d] = %d\n", i, foo[i]) # delete all for (i=0;i<11;i++) - foo[i] = 0 + delete foo[i] printf("\n") foreach (i in foo) printf("foo[%d] = %d\n", i, foo[i]) diff --git a/testsuite/systemtap.maps/iiiiii.exp b/testsuite/systemtap.maps/iiiiii.exp index 69fdfd3d2..2d1fae565 100644 --- a/testsuite/systemtap.maps/iiiiii.exp +++ b/testsuite/systemtap.maps/iiiiii.exp @@ -3,7 +3,8 @@ load_lib "stap_run2.exp" set test "iiiiii" -set ::result_string {foo[0,0,0,0,1] = 1 +set ::result_string {foo[0,0,0,0,0] = 0 +foo[0,0,0,0,1] = 1 foo[0,0,0,1,0] = 1 foo[0,0,0,1,1] = 2 foo[0,0,1,0,0] = 1 @@ -35,6 +36,7 @@ foo[1,1,1,0,1] = 4 foo[1,1,1,1,0] = 4 foo[1,1,1,1,1] = 5 +foo[0,0,0,0,0] = 0 foo[0,0,0,0,1] = 1 foo[0,0,0,1,0] = 1 foo[0,0,0,1,1] = 2 diff --git a/testsuite/systemtap.maps/iiiiii.stp b/testsuite/systemtap.maps/iiiiii.stp index 369c2fec8..b1e112bab 100755 --- a/testsuite/systemtap.maps/iiiiii.stp +++ b/testsuite/systemtap.maps/iiiiii.stp @@ -13,7 +13,7 @@ probe begin { foreach ([a,b,c,d,e] in foo) printf("foo[%d,%d,%d,%d,%d] = %d\n", a,b,c,d,e, foo[a,b,c,d,e]) - foo[0,0,1,1,1] = 0 + delete foo[0,0,1,1,1] printf("\n") foreach ([a,b,c,d,e] in foo) printf("foo[%d,%d,%d,%d,%d] = %d\n", a,b,c,d,e, foo[a,b,c,d,e]) diff --git a/testsuite/systemtap.maps/is.stp b/testsuite/systemtap.maps/is.stp index 993f375ef..ce14571dc 100755 --- a/testsuite/systemtap.maps/is.stp +++ b/testsuite/systemtap.maps/is.stp @@ -10,15 +10,15 @@ probe begin { printf("foo[%d] = %s\n", i, foo[i]) # delete out of the middle - foo[5] = "" + delete foo[5] printf("\n") foreach (i in foo) printf("foo[%d] = %s\n", i, foo[i]) # delete first entry - foo[0] = "" + delete foo[0] # and last entry - foo[10] = "" + delete foo[10] printf("\n") foreach (i in foo) printf("foo[%d] = %s\n", i, foo[i]) @@ -32,7 +32,7 @@ probe begin { printf("foo[%d] = %s\n", i, foo[i]) # delete one - foo[4] = "" + delete foo[4] printf("\n") foreach (i in foo) printf("foo[%d] = %s\n", i, foo[i]) diff --git a/testsuite/systemtap.maps/si.exp b/testsuite/systemtap.maps/si.exp index 53bc12717..c14794bf2 100644 --- a/testsuite/systemtap.maps/si.exp +++ b/testsuite/systemtap.maps/si.exp @@ -3,7 +3,8 @@ load_lib "stap_run2.exp" set test "si" -set ::result_string {foo[1] = 1 +set ::result_string {foo[0] = 0 +foo[1] = 1 foo[2] = 4 foo[3] = 9 foo[4] = 16 @@ -14,6 +15,7 @@ foo[8] = 64 foo[9] = 81 foo[10] = 100 +foo[0] = 0 foo[1] = 1 foo[2] = 4 foo[3] = 9 @@ -24,6 +26,7 @@ foo[8] = 64 foo[9] = 81 foo[10] = 100 +foo[0] = 0 foo[2] = 4 foo[3] = 9 foo[4] = 16 @@ -32,6 +35,7 @@ foo[7] = 49 foo[8] = 64 foo[9] = 81 +foo[0] = 0 foo[2] = 4 foo[3] = 900 foo[4] = -16 @@ -40,6 +44,7 @@ foo[7] = 49 foo[8] = 64 foo[9] = -81 +foo[0] = 0 foo[2] = 4 foo[3] = 900 foo[6] = 36 @@ -48,6 +53,7 @@ foo[8] = 64 foo[9] = -81 +foo[0] = 0 foo[1] = 1 foo[2] = 5 foo[3] = 14 diff --git a/testsuite/systemtap.maps/si.stp b/testsuite/systemtap.maps/si.stp index 3267b2836..89b112f09 100755 --- a/testsuite/systemtap.maps/si.stp +++ b/testsuite/systemtap.maps/si.stp @@ -10,15 +10,15 @@ probe begin { printf("foo[%s] = %d\n", str, foo[str]) # delete out of the middle - foo["5"] = 0 + delete foo["5"] printf("\n") foreach (str in foo) printf("foo[%s] = %d\n", str, foo[str]) # delete first entry - foo["1"] = 0 + delete foo["1"] # and last entry - foo["10"] = 0 + delete foo["10"] printf("\n") foreach (str in foo) printf("foo[%s] = %d\n", str, foo[str]) @@ -34,7 +34,7 @@ probe begin { # delete one - foo["4"] = 0 + delete foo["4"] printf("\n") foreach (str in foo) printf("foo[%s] = %d\n", str, foo[str]) diff --git a/testsuite/systemtap.maps/ss.stp b/testsuite/systemtap.maps/ss.stp index d649c25ce..5587b9825 100755 --- a/testsuite/systemtap.maps/ss.stp +++ b/testsuite/systemtap.maps/ss.stp @@ -10,16 +10,16 @@ probe begin { printf("foo[%s] = %s\n", str, foo[str]) # delete out of the middle - foo["5"] = "" + delete foo["5"] printf("\n") foreach (str in foo) printf("foo[%s] = %s\n", str, foo[str]) # delete first entry - foo["0"] = "" + delete foo["0"] # and last entry - foo["10"] = "" + delete foo["10"] printf("\n") foreach (str in foo) printf("foo[%s] = %s\n", str, foo[str]) @@ -35,7 +35,7 @@ probe begin { # delete one - foo["4"] = "" + delete foo["4"] printf("\n") foreach (str in foo) printf("foo[%s] = %s\n", str, foo[str]) -- 2.43.5