Page MenuHomeFreeBSD
Files F153466247

D11707.id31140.diff
No OneTemporary
Actions

D11707.id31140.diff
View Options

Index: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d
===================================================================
--- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d
+++ cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d
@@ -27,6 +27,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#pragma D option quiet
+#pragma D option dynvarsize=2m
/*
* This test verifies that the basename() and dirname() functions are working
@@ -54,12 +55,16 @@
dir[i++] = "f";
dir[i++] = "f/";
dir[i++] = "/////";
+ /*
+ * basename(3) and basename(1) return different results for the empty
+ * string on FreeBSD, so we need special handling.
dir[i++] = "";
+ */
end = i;
i = 0;
- printf("#!/usr/bin/ksh\n\n");
+ printf("#!/usr/bin/env ksh\n\n");
}
tick-1ms
@@ -83,5 +88,19 @@
tick-1ms
/i == end/
{
+ dir[i] = "";
+ printf("if [ \"`basename \"%s\"`\" != \"%s\" -a \".\" != \"%s\" ]; then\n",
+ dir[i], basename(dir[i]), basename(dir[i]));
+ printf(" echo \"basename(\\\"%s\\\") is \\\"%s\\\"; ",
+ dir[i], basename(dir[i]));
+ printf("expected \\\"`basename \"%s\"`\\\" or \\\".\\\"\"\n", dir[i]);
+ printf("fi\n\n");
+ printf("if [ `dirname \"%s\"` != \"%s\" ]; then\n",
+ dir[i], dirname(dir[i]));
+ printf(" echo \"dirname(\\\"%s\\\") is \\\"%s\\\"; ",
+ dir[i], dirname(dir[i]));
+ printf("expected \\\"`dirname \"%s\"`\"\\\"\n", dir[i]);
+ printf("fi\n\n");
+
exit(0);
}
Index: cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out
===================================================================
--- cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out
+++ cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out
@@ -1,4 +1,4 @@
-#!/usr/bin/ksh
+#!/usr/bin/env ksh
if [ `basename "/foo/bar/baz"` != "baz" ]; then
echo "basename(\"/foo/bar/baz\") is \"baz\"; expected \"`basename "/foo/bar/baz"`"\"
@@ -152,8 +152,8 @@
echo "dirname(\"/////\") is \"/\"; expected \"`dirname "/////"`"\"
fi
-if [ `basename ""` != "." ]; then
- echo "basename(\"\") is \".\"; expected \"`basename ""`"\"
+if [ "`basename ""`" != "." -a "." != "." ]; then
+ echo "basename(\"\") is \".\"; expected \"`basename ""`\" or \".\""
fi
if [ `dirname ""` != "." ]; then

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 8:12 AM (5 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31911845
Default Alt Text
D11707.id31140.diff (2 KB)

Event Timeline