On 2018-Sep-19, at 9:14 AM, Sean Bruno <sbruno at freebsd.org> wrote: > On 9/18/18 8:48 PM, Mark Millard wrote: >> A problem here is that the references should be to usr.bin instead >> of usr/bin . See: >> >> https://lists.freebsd.org/pipermail/svn-src-head/2018-September/118426.html >> >> which reports for svn commit: r336601 - head: >> >> QUOTE >> Looks like this head/ObsoleteFiles.inc update has a typo >> in each thing added to OLD_FILES . . . >> >> # ls -lTdt /usr/tests/usr.bin/indent/* >> -r--r--r-- 1 root wheel 121 Sep 13 22:53:30 2018 /usr/tests/usr.bin/indent/Kyuafile >> . . . >> -r--r--r-- 1 root wheel 295 Sep 13 22:53:29 2018 /usr/tests/usr.bin/indent/binary.0 >> -r--r--r-- 1 root wheel 92 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/sac.0.pro >> -r--r--r-- 1 root wheel 130 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/sac.0.stdout >> -r--r--r-- 1 root wheel 122 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/sac.0 >> -r--r--r-- 1 root wheel 94 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/nsac.0.pro >> -r--r--r-- 1 root wheel 130 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/nsac.0.stdout >> -r--r--r-- 1 root wheel 123 May 1 19:35:24 2018 /usr/tests/usr.bin/indent/nsac.0 >> >> vs. ( note usr.bin vs. usr/bin ): >> >> Modified: head/ObsoleteFiles.inc >> ============================================================================== >> --- head/ObsoleteFiles.inc Sun Jul 22 12:04:21 2018 (r336600) >> +++ head/ObsoleteFiles.inc Sun Jul 22 12:45:02 2018 (r336601) >> _at__at_ -38,6 +38,13 _at__at_ >> # xargs -n1 | sort | uniq -d; >> # done >> >> +# 20180722: indent(1) option renamed, test files follow >> +OLD_FILES+=usr/bin/indent/tests/nsac.0 >> +OLD_FILES+=usr/bin/indent/tests/nsac.0.pro >> +OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout >> +OLD_FILES+=usr/bin/indent/tests/sac.0 >> +OLD_FILES+=usr/bin/indent/tests/sac.0.pro >> +OLD_FILES+=usr/bin/indent/tests/sac.0.stdout >> # 20180721: move of libmlx5.so.1 and libibverbs.so.1 >> OLD_LIBS+=usr/lib/libmlx5.so.1 >> OLD_LIBS+=usr/lib/libibverbs.so.1 >> END QUOTE >> >> This was after having the nsac and sac kyua tests report >> failures in my environment, long after they should have >> not existed. >> >> >> >> === >> Mark Millard >> marklmi at yahoo.com >> ( dsl-only.net went >> away in early 2018-Mar) >> >> > > So, what should we even do here? It sort of looks like this entire > section should be purged or something. > > There was a bit of error committing this section I guess. As near as I can tell the fix would be something like: # svnlite diff /usr/src/ObsoleteFiles.inc Index: /usr/src/ObsoleteFiles.inc =================================================================== --- /usr/src/ObsoleteFiles.inc (revision 338675) +++ /usr/src/ObsoleteFiles.inc (working copy) _at__at_ -48,12 +48,12 _at__at_ # 20180725: Cleanup old libcasper.so.0 OLD_LIBS+=lib/libcasper.so.0 # 20180722: indent(1) option renamed, test files follow -OLD_FILES+=usr/bin/indent/tests/nsac.0 -OLD_FILES+=usr/bin/indent/tests/nsac.0.pro -OLD_FILES+=usr/bin/indent/tests/nsac.0.stdout -OLD_FILES+=usr/bin/indent/tests/sac.0 -OLD_FILES+=usr/bin/indent/tests/sac.0.pro -OLD_FILES+=usr/bin/indent/tests/sac.0.stdout +OLD_FILES+=usr/tests/usr.bin/indent/nsac.0 +OLD_FILES+=usr/tests/usr.bin/indent/nsac.0.pro +OLD_FILES+=usr/tests/usr.bin/indent/nsac.0.stdout +OLD_FILES+=usr/tests/usr.bin/indent/sac.0 +OLD_FILES+=usr/tests/usr.bin/indent/sac.0.pro +OLD_FILES+=usr/tests/usr.bin/indent/sac.0.stdout # 20180721: move of libmlx5.so.1 and libibverbs.so.1 OLD_LIBS+=usr/lib/libmlx5.so.1 OLD_LIBS+=usr/lib/libibverbs.so.1 This is sort of like the older part of the file: # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme OLD_FILES+=usr/tests/usr.bin/col/col OLD_FILES+=usr/tests/usr.bin/diff/diff OLD_FILES+=usr/tests/usr.bin/ident/ident OLD_FILES+=usr/tests/usr.bin/mkimg/mkimg OLD_FILES+=usr/tests/usr.bin/sdiff/sdiff OLD_FILES+=usr/tests/usr.bin/soelim/soelim OLD_FILES+=usr/tests/usr.sbin/pw/pw_config OLD_FILES+=usr/tests/usr.sbin/pw/pw_etcdir OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupadd OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupdel OLD_FILES+=usr/tests/usr.sbin/pw/pw_groupmod OLD_FILES+=usr/tests/usr.sbin/pw/pw_lock OLD_FILES+=usr/tests/usr.sbin/pw/pw_useradd OLD_FILES+=usr/tests/usr.sbin/pw/pw_userdel OLD_FILES+=usr/tests/usr.sbin/pw/pw_usermod OLD_FILES+=usr/tests/usr.sbin/pw/pw_usernext === Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)Received on Wed Sep 19 2018 - 15:08:22 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:18 UTC