diff options
Diffstat (limited to 'source4')
-rw-r--r-- | source4/pidl/lib/Parse/Pidl/Expr.pm | 68 | ||||
-rw-r--r-- | source4/pidl/lib/Parse/Pidl/IDL.pm | 154 | ||||
-rwxr-xr-x | source4/script/tests/test_smbclient.sh | 90 | ||||
-rwxr-xr-x | source4/script/tests/tests_all.sh | 2 |
4 files changed, 112 insertions, 202 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Expr.pm b/source4/pidl/lib/Parse/Pidl/Expr.pm index c6e5cd3dca..34c30b824f 100644 --- a/source4/pidl/lib/Parse/Pidl/Expr.pm +++ b/source4/pidl/lib/Parse/Pidl/Expr.pm @@ -1085,7 +1085,7 @@ sub new { [#Rule 2 'exp', 1, sub -#line 22 "expr.yp" +#line 22 "pidl/expr.yp" { "\"$_[1]\"" } ], [#Rule 3 @@ -1094,187 +1094,187 @@ sub [#Rule 4 'exp', 3, sub -#line 24 "expr.yp" +#line 24 "pidl/expr.yp" { "$_[1].$_[3]" } ], [#Rule 5 'exp', 1, sub -#line 25 "expr.yp" +#line 25 "pidl/expr.yp" { $_[0]->_Lookup($_[1]) } ], [#Rule 6 'exp', 2, sub -#line 26 "expr.yp" +#line 26 "pidl/expr.yp" { $_[0]->_Dereference($_[2]); "*$_[2]" } ], [#Rule 7 'exp', 2, sub -#line 27 "expr.yp" +#line 27 "pidl/expr.yp" { "~$_[2]" } ], [#Rule 8 'exp', 3, sub -#line 28 "expr.yp" +#line 28 "pidl/expr.yp" { "$_[1] + $_[3]" } ], [#Rule 9 'exp', 3, sub -#line 29 "expr.yp" +#line 29 "pidl/expr.yp" { "$_[1] - $_[3]" } ], [#Rule 10 'exp', 3, sub -#line 30 "expr.yp" +#line 30 "pidl/expr.yp" { "$_[1] * $_[3]" } ], [#Rule 11 'exp', 3, sub -#line 31 "expr.yp" +#line 31 "pidl/expr.yp" { "$_[1] % $_[3]" } ], [#Rule 12 'exp', 3, sub -#line 32 "expr.yp" +#line 32 "pidl/expr.yp" { "$_[1] < $_[3]" } ], [#Rule 13 'exp', 3, sub -#line 33 "expr.yp" +#line 33 "pidl/expr.yp" { "$_[1] > $_[3]" } ], [#Rule 14 'exp', 3, sub -#line 34 "expr.yp" +#line 34 "pidl/expr.yp" { "$_[1] | $_[3]" } ], [#Rule 15 'exp', 3, sub -#line 35 "expr.yp" +#line 35 "pidl/expr.yp" { "$_[1] == $_[3]" } ], [#Rule 16 'exp', 3, sub -#line 36 "expr.yp" +#line 36 "pidl/expr.yp" { "$_[1] <= $_[3]" } ], [#Rule 17 'exp', 3, sub -#line 37 "expr.yp" +#line 37 "pidl/expr.yp" { "$_[1] => $_[3]" } ], [#Rule 18 'exp', 3, sub -#line 38 "expr.yp" +#line 38 "pidl/expr.yp" { "$_[1] << $_[3]" } ], [#Rule 19 'exp', 3, sub -#line 39 "expr.yp" +#line 39 "pidl/expr.yp" { "$_[1] >> $_[3]" } ], [#Rule 20 'exp', 3, sub -#line 40 "expr.yp" +#line 40 "pidl/expr.yp" { "$_[1] != $_[3]" } ], [#Rule 21 'exp', 3, sub -#line 41 "expr.yp" +#line 41 "pidl/expr.yp" { "$_[1] || $_[3]" } ], [#Rule 22 'exp', 3, sub -#line 42 "expr.yp" +#line 42 "pidl/expr.yp" { "$_[1] && $_[3]" } ], [#Rule 23 'exp', 3, sub -#line 43 "expr.yp" +#line 43 "pidl/expr.yp" { "$_[1] & $_[3]" } ], [#Rule 24 'exp', 3, sub -#line 44 "expr.yp" +#line 44 "pidl/expr.yp" { $_[1]."->".$_[3] } ], [#Rule 25 'exp', 5, sub -#line 45 "expr.yp" +#line 45 "pidl/expr.yp" { "$_[1]?$_[3]:$_[5]" } ], [#Rule 26 'exp', 2, sub -#line 46 "expr.yp" +#line 46 "pidl/expr.yp" { "~$_[1]" } ], [#Rule 27 'exp', 2, sub -#line 47 "expr.yp" +#line 47 "pidl/expr.yp" { "not $_[1]" } ], [#Rule 28 'exp', 3, sub -#line 48 "expr.yp" +#line 48 "pidl/expr.yp" { "$_[1] / $_[3]" } ], [#Rule 29 'exp', 2, sub -#line 49 "expr.yp" +#line 49 "pidl/expr.yp" { "-$_[2]" } ], [#Rule 30 'exp', 2, sub -#line 50 "expr.yp" +#line 50 "pidl/expr.yp" { "&$_[2]" } ], [#Rule 31 'exp', 3, sub -#line 51 "expr.yp" +#line 51 "pidl/expr.yp" { "$_[1]^$_[3]" } ], [#Rule 32 'exp', 3, sub -#line 52 "expr.yp" +#line 52 "pidl/expr.yp" { "($_[2])" } ], [#Rule 33 'func', 4, sub -#line 55 "expr.yp" +#line 55 "pidl/expr.yp" { "$_[1]($_[3])" } ], [#Rule 34 'opt_args', 0, sub -#line 56 "expr.yp" +#line 56 "pidl/expr.yp" { "" } ], [#Rule 35 @@ -1286,7 +1286,7 @@ sub [#Rule 37 'args', 3, sub -#line 57 "expr.yp" +#line 57 "pidl/expr.yp" { "$_[1], $_[3]" } ] ], @@ -1294,7 +1294,7 @@ sub bless($self,$class); } -#line 59 "expr.yp" +#line 59 "pidl/expr.yp" package Parse::Pidl::Expr; diff --git a/source4/pidl/lib/Parse/Pidl/IDL.pm b/source4/pidl/lib/Parse/Pidl/IDL.pm index 3d9eb4ea74..71c4470870 100644 --- a/source4/pidl/lib/Parse/Pidl/IDL.pm +++ b/source4/pidl/lib/Parse/Pidl/IDL.pm @@ -1811,37 +1811,37 @@ sub new { [#Rule 2 'idl', 2, sub -#line 19 "idl.yp" +#line 19 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 3 'idl', 2, sub -#line 20 "idl.yp" +#line 20 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 4 'idl', 2, sub -#line 21 "idl.yp" +#line 21 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 5 'idl', 2, sub -#line 22 "idl.yp" +#line 22 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 6 'idl', 2, sub -#line 23 "idl.yp" +#line 23 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 7 'import', 3, sub -#line 26 "idl.yp" +#line 26 "pidl/idl.yp" {{ "TYPE" => "IMPORT", "PATHS" => $_[2], @@ -1852,7 +1852,7 @@ sub [#Rule 8 'include', 3, sub -#line 33 "idl.yp" +#line 33 "pidl/idl.yp" {{ "TYPE" => "INCLUDE", "PATHS" => $_[2], @@ -1863,7 +1863,7 @@ sub [#Rule 9 'importlib', 3, sub -#line 40 "idl.yp" +#line 40 "pidl/idl.yp" {{ "TYPE" => "IMPORTLIB", "PATHS" => $_[2], @@ -1874,19 +1874,19 @@ sub [#Rule 10 'commalist', 1, sub -#line 49 "idl.yp" +#line 49 "pidl/idl.yp" { [ $_[1] ] } ], [#Rule 11 'commalist', 3, sub -#line 50 "idl.yp" +#line 50 "pidl/idl.yp" { push(@{$_[1]}, $_[3]); $_[1] } ], [#Rule 12 'coclass', 7, sub -#line 54 "idl.yp" +#line 54 "pidl/idl.yp" {{ "TYPE" => "COCLASS", "PROPERTIES" => $_[1], @@ -1902,13 +1902,13 @@ sub [#Rule 14 'interface_names', 4, sub -#line 66 "idl.yp" +#line 66 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 15 'interface', 8, sub -#line 70 "idl.yp" +#line 70 "pidl/idl.yp" {{ "TYPE" => "INTERFACE", "PROPERTIES" => $_[1], @@ -1925,19 +1925,19 @@ sub [#Rule 17 'base_interface', 2, sub -#line 83 "idl.yp" +#line 83 "pidl/idl.yp" { $_[2] } ], [#Rule 18 'definitions', 1, sub -#line 87 "idl.yp" +#line 87 "pidl/idl.yp" { [ $_[1] ] } ], [#Rule 19 'definitions', 2, sub -#line 88 "idl.yp" +#line 88 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 20 @@ -1958,7 +1958,7 @@ sub [#Rule 25 'const', 7, sub -#line 96 "idl.yp" +#line 96 "pidl/idl.yp" {{ "TYPE" => "CONST", "DTYPE" => $_[2], @@ -1972,7 +1972,7 @@ sub [#Rule 26 'const', 8, sub -#line 106 "idl.yp" +#line 106 "pidl/idl.yp" {{ "TYPE" => "CONST", "DTYPE" => $_[2], @@ -1987,7 +1987,7 @@ sub [#Rule 27 'function', 7, sub -#line 120 "idl.yp" +#line 120 "pidl/idl.yp" {{ "TYPE" => "FUNCTION", "NAME" => $_[3], @@ -2001,7 +2001,7 @@ sub [#Rule 28 'declare', 5, sub -#line 132 "idl.yp" +#line 132 "pidl/idl.yp" {{ "TYPE" => "DECLARE", "PROPERTIES" => $_[2], @@ -2023,7 +2023,7 @@ sub [#Rule 32 'decl_enum', 1, sub -#line 146 "idl.yp" +#line 146 "pidl/idl.yp" {{ "TYPE" => "ENUM" }} @@ -2031,7 +2031,7 @@ sub [#Rule 33 'decl_bitmap', 1, sub -#line 152 "idl.yp" +#line 152 "pidl/idl.yp" {{ "TYPE" => "BITMAP" }} @@ -2039,7 +2039,7 @@ sub [#Rule 34 'decl_union', 1, sub -#line 158 "idl.yp" +#line 158 "pidl/idl.yp" {{ "TYPE" => "UNION" }} @@ -2047,7 +2047,7 @@ sub [#Rule 35 'typedef', 6, sub -#line 164 "idl.yp" +#line 164 "pidl/idl.yp" {{ "TYPE" => "TYPEDEF", "PROPERTIES" => $_[2], @@ -2073,7 +2073,7 @@ sub [#Rule 40 'typedecl', 2, sub -#line 177 "idl.yp" +#line 177 "pidl/idl.yp" { $_[1] } ], [#Rule 41 @@ -2085,7 +2085,7 @@ sub [#Rule 43 'existingtype', 2, sub -#line 182 "idl.yp" +#line 182 "pidl/idl.yp" { ($_[1]?$_[1]:"signed") ." $_[2]" } ], [#Rule 44 @@ -2100,13 +2100,13 @@ sub [#Rule 47 'type', 1, sub -#line 186 "idl.yp" +#line 186 "pidl/idl.yp" { "void" } ], [#Rule 48 'enum_body', 3, sub -#line 188 "idl.yp" +#line 188 "pidl/idl.yp" { $_[2] } ], [#Rule 49 @@ -2118,7 +2118,7 @@ sub [#Rule 51 'enum', 3, sub -#line 191 "idl.yp" +#line 191 "pidl/idl.yp" {{ "TYPE" => "ENUM", "NAME" => $_[2], @@ -2128,13 +2128,13 @@ sub [#Rule 52 'enum_elements', 1, sub -#line 199 "idl.yp" +#line 199 "pidl/idl.yp" { [ $_[1] ] } ], [#Rule 53 'enum_elements', 3, sub -#line 200 "idl.yp" +#line 200 "pidl/idl.yp" { push(@{$_[1]}, $_[3]); $_[1] } ], [#Rule 54 @@ -2143,13 +2143,13 @@ sub [#Rule 55 'enum_element', 3, sub -#line 204 "idl.yp" +#line 204 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 56 'bitmap_body', 3, sub -#line 207 "idl.yp" +#line 207 "pidl/idl.yp" { $_[2] } ], [#Rule 57 @@ -2161,7 +2161,7 @@ sub [#Rule 59 'bitmap', 3, sub -#line 210 "idl.yp" +#line 210 "pidl/idl.yp" {{ "TYPE" => "BITMAP", "NAME" => $_[2], @@ -2171,13 +2171,13 @@ sub [#Rule 60 'bitmap_elements', 1, sub -#line 218 "idl.yp" +#line 218 "pidl/idl.yp" { [ $_[1] ] } ], [#Rule 61 'bitmap_elements', 3, sub -#line 219 "idl.yp" +#line 219 "pidl/idl.yp" { push(@{$_[1]}, $_[3]); $_[1] } ], [#Rule 62 @@ -2189,13 +2189,13 @@ sub [#Rule 64 'bitmap_element', 3, sub -#line 224 "idl.yp" +#line 224 "pidl/idl.yp" { "$_[1] ( $_[3] )" } ], [#Rule 65 'struct_body', 3, sub -#line 227 "idl.yp" +#line 227 "pidl/idl.yp" { $_[2] } ], [#Rule 66 @@ -2207,7 +2207,7 @@ sub [#Rule 68 'struct', 3, sub -#line 231 "idl.yp" +#line 231 "pidl/idl.yp" {{ "TYPE" => "STRUCT", "NAME" => $_[2], @@ -2217,7 +2217,7 @@ sub [#Rule 69 'empty_element', 2, sub -#line 239 "idl.yp" +#line 239 "pidl/idl.yp" {{ "NAME" => "", "TYPE" => "EMPTY", @@ -2237,7 +2237,7 @@ sub [#Rule 72 'optional_base_element', 2, sub -#line 253 "idl.yp" +#line 253 "pidl/idl.yp" { $_[2]->{PROPERTIES} = FlattenHash([$_[1],$_[2]->{PROPERTIES}]); $_[2] } ], [#Rule 73 @@ -2246,13 +2246,13 @@ sub [#Rule 74 'union_elements', 2, sub -#line 258 "idl.yp" +#line 258 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 75 'union_body', 3, sub -#line 261 "idl.yp" +#line 261 "pidl/idl.yp" { $_[2] } ], [#Rule 76 @@ -2264,7 +2264,7 @@ sub [#Rule 78 'union', 3, sub -#line 265 "idl.yp" +#line 265 "pidl/idl.yp" {{ "TYPE" => "UNION", "NAME" => $_[2], @@ -2274,7 +2274,7 @@ sub [#Rule 79 'base_element', 5, sub -#line 273 "idl.yp" +#line 273 "pidl/idl.yp" {{ "NAME" => $_[4], "TYPE" => $_[2], @@ -2288,13 +2288,13 @@ sub [#Rule 80 'pointers', 0, sub -#line 287 "idl.yp" +#line 287 "pidl/idl.yp" { 0 } ], [#Rule 81 'pointers', 2, sub -#line 288 "idl.yp" +#line 288 "pidl/idl.yp" { $_[1]+1 } ], [#Rule 82 @@ -2303,7 +2303,7 @@ sub [#Rule 83 'element_list1', 3, sub -#line 293 "idl.yp" +#line 293 "pidl/idl.yp" { push(@{$_[1]}, $_[2]); $_[1] } ], [#Rule 84 @@ -2315,13 +2315,13 @@ sub [#Rule 86 'element_list2', 1, sub -#line 299 "idl.yp" +#line 299 "pidl/idl.yp" { [ $_[1] ] } ], [#Rule 87 'element_list2', 3, sub -#line 300 "idl.yp" +#line 300 "pidl/idl.yp" { push(@{$_[1]}, $_[3]); $_[1] } ], [#Rule 88 @@ -2330,13 +2330,13 @@ sub [#Rule 89 'array_len', 3, sub -#line 305 "idl.yp" +#line 305 "pidl/idl.yp" { push(@{$_[3]}, "*"); $_[3] } ], [#Rule 90 'array_len', 4, sub -#line 306 "idl.yp" +#line 306 "pidl/idl.yp" { push(@{$_[4]}, "$_[2]"); $_[4] } ], [#Rule 91 @@ -2345,31 +2345,31 @@ sub [#Rule 92 'property_list', 4, sub -#line 312 "idl.yp" +#line 312 "pidl/idl.yp" { FlattenHash([$_[1],$_[3]]); } ], [#Rule 93 'properties', 1, sub -#line 315 "idl.yp" +#line 315 "pidl/idl.yp" { $_[1] } ], [#Rule 94 'properties', 3, sub -#line 316 "idl.yp" +#line 316 "pidl/idl.yp" { FlattenHash([$_[1], $_[3]]); } ], [#Rule 95 'property', 1, sub -#line 319 "idl.yp" +#line 319 "pidl/idl.yp" {{ "$_[1]" => "1" }} ], [#Rule 96 'property', 4, sub -#line 320 "idl.yp" +#line 320 "pidl/idl.yp" {{ "$_[1]" => "$_[3]" }} ], [#Rule 97 @@ -2378,7 +2378,7 @@ sub [#Rule 98 'listtext', 3, sub -#line 325 "idl.yp" +#line 325 "pidl/idl.yp" { "$_[1] $_[3]" } ], [#Rule 99 @@ -2387,13 +2387,13 @@ sub [#Rule 100 'commalisttext', 3, sub -#line 330 "idl.yp" +#line 330 "pidl/idl.yp" { "$_[1],$_[3]" } ], [#Rule 101 'anytext', 0, sub -#line 334 "idl.yp" +#line 334 "pidl/idl.yp" { "" } ], [#Rule 102 @@ -2408,91 +2408,91 @@ sub [#Rule 105 'anytext', 3, sub -#line 336 "idl.yp" +#line 336 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 106 'anytext', 3, sub -#line 337 "idl.yp" +#line 337 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 107 'anytext', 3, sub -#line 338 "idl.yp" +#line 338 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 108 'anytext', 3, sub -#line 339 "idl.yp" +#line 339 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 109 'anytext', 3, sub -#line 340 "idl.yp" +#line 340 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 110 'anytext', 3, sub -#line 341 "idl.yp" +#line 341 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 111 'anytext', 3, sub -#line 342 "idl.yp" +#line 342 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 112 'anytext', 3, sub -#line 343 "idl.yp" +#line 343 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 113 'anytext', 3, sub -#line 344 "idl.yp" +#line 344 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 114 'anytext', 3, sub -#line 345 "idl.yp" +#line 345 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 115 'anytext', 3, sub -#line 346 "idl.yp" +#line 346 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 116 'anytext', 3, sub -#line 347 "idl.yp" +#line 347 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 117 'anytext', 3, sub -#line 348 "idl.yp" +#line 348 "pidl/idl.yp" { "$_[1]$_[2]$_[3]" } ], [#Rule 118 'anytext', 5, sub -#line 349 "idl.yp" +#line 349 "pidl/idl.yp" { "$_[1]$_[2]$_[3]$_[4]$_[5]" } ], [#Rule 119 'anytext', 5, sub -#line 350 "idl.yp" +#line 350 "pidl/idl.yp" { "$_[1]$_[2]$_[3]$_[4]$_[5]" } ], [#Rule 120 @@ -2510,7 +2510,7 @@ sub [#Rule 124 'text', 1, sub -#line 364 "idl.yp" +#line 364 "pidl/idl.yp" { "\"$_[1]\"" } ], [#Rule 125 @@ -2524,7 +2524,7 @@ sub bless($self,$class); } -#line 375 "idl.yp" +#line 375 "pidl/idl.yp" use Parse::Pidl qw(error); diff --git a/source4/script/tests/test_smbclient.sh b/source4/script/tests/test_smbclient.sh deleted file mode 100755 index 08f5cad618..0000000000 --- a/source4/script/tests/test_smbclient.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -if [ $# -lt 5 ]; then -cat <<EOF -Usage: test_smbclient.sh SERVER USERNAME PASSWORD DOMAIN PREFIX -EOF -exit 1; -fi - -SERVER=$1 -USERNAME=$2 -PASSWORD=$3 -DOMAIN=$4 -PREFIX=$5 -shift 5 -failed=0 - -runcmd() { - name="$1" - shift - testit "$name" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp -W "$DOMAIN "-U"$USERNAME"%"$PASSWORD" $@ -} - -incdir=`dirname $0` -. $incdir/test_functions.sh - -# Generate random file -cat >tmpfile<<EOF -foo -bar -bloe -blah -EOF - - -# put that file -echo mput tmpfile | runcmd "MPutting file" || failed=`expr $failed + 1` -# check file info -echo altname tmpfile | runcmd "Getting alternative name" || failed=`expr $failed + 1` -# run allinfo on that file -echo allinfo tmpfile | runcmd "Checking info on file" || failed=`expr $failed + 1` -# get that file -mv tmpfile tmpfile-old -echo mget tmpfile | runcmd "MGetting file" || failed=`expr $failed + 1` -# remove that file -echo rm tmpfile | runcmd "Removing file" || failed=`expr $failed + 1` -# compare locally -testit "Comparing files" diff tmpfile-old tmpfile || failed=`expr $failed + 1` -# create directory -echo mkdir bla | runcmd "Creating directory" || failed=`expr $failed + 1` -# cd to directory -echo cd bla | runcmd "Changing directory" || failed=`expr $failed + 1` -# cd to top level directory -echo cd .. | runcmd "Going back" || failed=`expr $failed + 1` -# remove directory -echo rmdir bla | runcmd "Removing directory" || failed=`expr $failed + 1` -# enable recurse, create nested directory -echo "recurse; echo mkdir bla/bloe; exit" | runcmd "Creating nested directory" || failed=`expr $failed + 1` -# remove parent directory -echo rmdir bla/bloe | runcmd "Removing directory" || failed=`expr $failed + 1` -# remove child directory -echo rmdir bla | runcmd "Removing directory" || failed=`expr $failed + 1` -# run fsinfo -echo fsinfo objectid | runcmd "Getting file system info" || failed=`expr $failed + 1` - -# put that file -echo put tmpfile | runcmd "Putting file" || failed=`expr $failed + 1` -# get that file -mv tmpfile tmpfile-old -echo get tmpfile | runcmd "Getting file" || failed=`expr $failed + 1` -# remove that file -echo rm tmpfile | runcmd "Removing file" || failed=`expr $failed + 1` -# compare locally -testit "Comparing files" diff tmpfile-old tmpfile || failed=`expr $failed + 1` -# put that file -echo put tmpfile tmpfilex | runcmd "Putting file with different name" || failed=`expr $failed + 1` -# get that file -echo get tmpfilex | runcmd "Getting file again" || failed=`expr $failed + 1` -# compare locally -testit "Comparing files" diff tmpfilex tmpfile || failed=`expr $failed + 1` -# remove that file -echo rm tmpfilex | runcmd "Removing file" || failed=`expr $failed + 1` - -# do some simple operations using old protocol versions -echo ls | runcmd "List directory with LANMAN1" -m LANMAN1 || failed=`expr $failed + 1` -echo ls | runcmd "List directory with LANMAN2" -m LANMAN2 || failed=`expr $failed + 1` - -rm -f tmpfile tmpfile-old tmpfilex - -testok $0 $failed diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh index aecaf8ac8e..9fde15f4de 100755 --- a/source4/script/tests/tests_all.sh +++ b/source4/script/tests/tests_all.sh @@ -11,6 +11,6 @@ $SRCDIR/script/tests/test_posix.sh //$SERVER/tmp $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` $SRCDIR/script/tests/test_local.sh || totalfailed=`expr $totalfailed + $?` $SRCDIR/script/tests/test_pidl.sh || totalfailed=`expr $totalfailed + $?` - $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?` + $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?` $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?` $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?` |