svn commit: r307716 - stable/10/tests/sys/mac/bsdextended
Author: ngie Date: Fri Oct 21 08:25:03 2016 New Revision: 307716 URL: https://svnweb.freebsd.org/changeset/base/307716 Log: MFstable/11 r307715: MFC r305916,r305918: r305916: Make sure $TMPDIR is created with 0755 permissions This is required to ensure that the temporary script can be executed, as the default mode is apparently too restrictive r305918: Only chmod $TMPDIR if it's not /tmp This is a safety belt to ensure that the /tmp sticky bit stuff doesn't get whacked by accident if someone runs the script outright Modified: stable/10/tests/sys/mac/bsdextended/matches_test.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/tests/sys/mac/bsdextended/matches_test.sh == --- stable/10/tests/sys/mac/bsdextended/matches_test.sh Fri Oct 21 08:22:39 2016(r307715) +++ stable/10/tests/sys/mac/bsdextended/matches_test.sh Fri Oct 21 08:25:03 2016(r307716) @@ -36,6 +36,12 @@ if ! sysctl -N security.mac.bsdextended echo "1..0 # SKIP mac_bsdextended(4) support isn't available" exit 0 fi +if [ "$TMPDIR" != "/tmp" ]; then + if ! chmod -Rf 0755 $TMPDIR; then + echo "1..0 # SKIP failed to chmod $TMPDIR" + exit 0 + fi +fi if ! playground=$(mktemp -d $TMPDIR/tmp.XXX); then echo "1..0 # SKIP failed to create temporary directory" exit 0 ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r307719 - stable/10/lib/libc/tests/stdio
Author: ngie
Date: Fri Oct 21 08:32:26 2016
New Revision: 307719
URL: https://svnweb.freebsd.org/changeset/base/307719
Log:
MFstable/11 r307718:
MFC r305920:
Remove spurious newlines from atf_tc_fail calls
This changes the results from broken (incorrect) to failed (correct) on
i386
Modified:
stable/10/lib/libc/tests/stdio/printbasic_test.c
stable/10/lib/libc/tests/stdio/printfloat_test.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/lib/libc/tests/stdio/printbasic_test.c
==
--- stable/10/lib/libc/tests/stdio/printbasic_test.cFri Oct 21 08:31:15
2016(r307718)
+++ stable/10/lib/libc/tests/stdio/printbasic_test.cFri Oct 21 08:32:26
2016(r307719)
@@ -80,7 +80,7 @@ _testfmt(const char *result, const char
vsnprintf(s, sizeof(s), fmt, ap);
if (strcmp(result, s) != 0) {
atf_tc_fail(
- "printf(\"%s\", %s) ==> [%s], expected [%s]\n",
+ "printf(\"%s\", %s) ==> [%s], expected [%s]",
fmt, argstr, s, result);
}
@@ -91,7 +91,7 @@ _testfmt(const char *result, const char
vswprintf(ws, sizeof(ws) / sizeof(ws[0]), wfmt, ap2);
if (wcscmp(wresult, ws) != 0) {
atf_tc_fail(
- "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]\n",
+ "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
wfmt, argstr, ws, wresult);
}
va_end(ap);
Modified: stable/10/lib/libc/tests/stdio/printfloat_test.c
==
--- stable/10/lib/libc/tests/stdio/printfloat_test.cFri Oct 21 08:31:15
2016(r307718)
+++ stable/10/lib/libc/tests/stdio/printfloat_test.cFri Oct 21 08:32:26
2016(r307719)
@@ -72,7 +72,7 @@ _testfmt(const char *result, const char
vsnprintf(s, sizeof(s), fmt, ap);
if (strcmp(result, s) != 0) {
atf_tc_fail(
- "printf(\"%s\", %s) ==> [%s], expected [%s]\n",
+ "printf(\"%s\", %s) ==> [%s], expected [%s]",
fmt, argstr, s, result);
}
@@ -83,7 +83,7 @@ _testfmt(const char *result, const char
vswprintf(ws, sizeof(ws) / sizeof(ws[0]), wfmt, ap2);
if (wcscmp(wresult, ws) != 0) {
atf_tc_fail(
- "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]\n",
+ "wprintf(\"%ls\", %s) ==> [%ls], expected [%ls]",
wfmt, argstr, ws, wresult);
}
va_end(ap);
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r307722 - in stable/10/libexec/atf: atf-check atf-sh
Author: ngie
Date: Fri Oct 21 08:36:30 2016
New Revision: 307722
URL: https://svnweb.freebsd.org/changeset/base/307722
Log:
MFstable/11 r307721:
MFC r306029:
Use SRCTOP instead of the longhand version for defining the path to
contrib/atf
Modified:
stable/10/libexec/atf/atf-check/Makefile
stable/10/libexec/atf/atf-sh/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/libexec/atf/atf-check/Makefile
==
--- stable/10/libexec/atf/atf-check/MakefileFri Oct 21 08:35:20 2016
(r307721)
+++ stable/10/libexec/atf/atf-check/MakefileFri Oct 21 08:36:30 2016
(r307722)
@@ -27,7 +27,7 @@
.include
-ATF= ${.CURDIR:H:H:H}/contrib/atf
+ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
PROG_CXX= atf-check
Modified: stable/10/libexec/atf/atf-sh/Makefile
==
--- stable/10/libexec/atf/atf-sh/Makefile Fri Oct 21 08:35:20 2016
(r307721)
+++ stable/10/libexec/atf/atf-sh/Makefile Fri Oct 21 08:36:30 2016
(r307722)
@@ -27,7 +27,7 @@
.include
-ATF= ${.CURDIR:H:H:H}/contrib/atf
+ATF= ${SRCTOP}/contrib/atf
.PATH: ${ATF}/atf-sh
PROG_CXX= atf-sh
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r307742 - in stable/10: sbin/mount_msdosfs sys/fs/msdosfs
Author: asomers
Date: Fri Oct 21 17:39:05 2016
New Revision: 307742
URL: https://svnweb.freebsd.org/changeset/base/307742
Log:
MFC r306276, but don't remove findwin95
Mount msdosfs with longnames support by default.
The old behavior depended on the FAT version and on what files were in the
root directory. "mount_msdosfs -o shortnames" is still supported.
Modified:
stable/10/sbin/mount_msdosfs/mount_msdosfs.8
stable/10/sys/fs/msdosfs/msdosfs_vfsops.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sbin/mount_msdosfs/mount_msdosfs.8
==
--- stable/10/sbin/mount_msdosfs/mount_msdosfs.8Fri Oct 21 17:25:19
2016(r307741)
+++ stable/10/sbin/mount_msdosfs/mount_msdosfs.8Fri Oct 21 17:39:05
2016(r307742)
@@ -142,15 +142,8 @@ If neither
nor
.Fl l
are given,
-.Nm
-searches the root directory of the file system to
-be mounted for any existing Win'95 long filenames.
-If no such entries are found, but short DOS filenames are found,
-.Fl s
-is the default.
-Otherwise
.Fl l
-is assumed.
+is the default.
.It Fl 9
Ignore the special Win'95 directory entries even
if deleting or renaming a file.
Modified: stable/10/sys/fs/msdosfs/msdosfs_vfsops.c
==
--- stable/10/sys/fs/msdosfs/msdosfs_vfsops.c Fri Oct 21 17:25:19 2016
(r307741)
+++ stable/10/sys/fs/msdosfs/msdosfs_vfsops.c Fri Oct 21 17:39:05 2016
(r307742)
@@ -175,24 +175,8 @@ update_mp(struct mount *mp, struct threa
if (pmp->pm_flags & MSDOSFSMNT_NOWIN95)
pmp->pm_flags |= MSDOSFSMNT_SHORTNAME;
- else if (!(pmp->pm_flags &
- (MSDOSFSMNT_SHORTNAME | MSDOSFSMNT_LONGNAME))) {
- struct vnode *rootvp;
-
- /*
-* Try to divine whether to support Win'95 long filenames
-*/
- if (FAT32(pmp))
- pmp->pm_flags |= MSDOSFSMNT_LONGNAME;
- else {
- if ((error =
- msdosfs_root(mp, LK_EXCLUSIVE, &rootvp)) != 0)
- return error;
- pmp->pm_flags |= findwin95(VTODE(rootvp)) ?
- MSDOSFSMNT_LONGNAME : MSDOSFSMNT_SHORTNAME;
- vput(rootvp);
- }
- }
+ else
+ pmp->pm_flags |= MSDOSFSMNT_LONGNAME;
return 0;
}
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
svn commit: r307743 - stable/10/sys/vm
Author: markj Date: Fri Oct 21 17:43:25 2016 New Revision: 307743 URL: https://svnweb.freebsd.org/changeset/base/307743 Log: MFC r307236: Plug a vnode lock leak in vm_fault_hold(). Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c == --- stable/10/sys/vm/vm_fault.c Fri Oct 21 17:39:05 2016(r307742) +++ stable/10/sys/vm/vm_fault.c Fri Oct 21 17:43:25 2016(r307743) @@ -320,6 +320,8 @@ RetryFault:; growstack = FALSE; goto RetryFault; } + if (fs.vp != NULL) + vput(fs.vp); return (result); } ___ svn-src-stable-10@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10 To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
