Page MenuHomeFreeBSD
Differential D24187

Install expected kyua docs.
ClosedPublic
Actions

Authored by brooks on Mar 25 2020, 8:50 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Apr 4, 4:03 PM
Unknown Object (File)
Fri, Mar 7, 3:17 PM
Unknown Object (File)
Feb 12 2025, 1:22 PM
Unknown Object (File)
Feb 12 2025, 1:02 PM
Unknown Object (File)
Feb 12 2025, 9:58 AM
Unknown Object (File)
Jan 19 2025, 12:05 AM
Unknown Object (File)
Jan 19 2025, 12:04 AM
Unknown Object (File)
Jan 18 2025, 6:53 PM
View All 54 Files
Subscribers
imp

Details

Reviewers
emaste
lwhsu
Commits
rS359335: Install expected kyua docs.
Summary

The "kyua about" command assumes these files exist causing tests to fail.

Fix a bug defining the default KYUA_DOCDIR so the installed files can be
found.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

brooks created this revision.Mar 25 2020, 8:50 PM
Harbormaster completed remote builds in B30103: Diff 69869.Mar 25 2020, 8:50 PM
brooks added a comment.Mar 25 2020, 9:55 PM

Somewhat annoyingly, these fixes aren't -DNO_CLEAN safe as the changes are all in Makefiles.

lwhsu accepted this revision.Mar 26 2020, 2:40 AM

Haven't tested, but looks good to me.

This revision is now accepted and ready to land.Mar 26 2020, 2:40 AM
Closed by commit rS359335: Install expected kyua docs. (authored by brooks). · Explain WhyMar 26 2020, 5:34 PM
This revision was automatically updated to reflect the committed changes.
brooks added a commit: rS359335: Install expected kyua docs..
Herald added a subscriber: imp. · View Herald TranscriptMar 26 2020, 5:34 PM

Revision Contents
Changeset List

PathSize
head/
etc/
mtree/
2 lines
lib/
kyua/
2 lines
cli/
2 lines
usr.bin/
kyua/
5 lines

Diff 69897

View Options

head/etc/mtree/BSD.usr.dist

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines "pagesize should be superpagesize, supported sizes:");
free(pagesizes); free(pagesizes);
break; break;
case '?': case '?':
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = create_one_shm(argv[i], mode, idx); ret1 = create_one_shm(argv[i], mode, idx);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 13 Linesdelete_one_shm(const char *path)
return (ret); return (ret);
} }
static int static int
delete_shm(int argc, char **argv) delete_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = delete_one_shm(argv[i]); ret1 = delete_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Linesout:
return (ret); return (ret);
} }
static int static int
read_shm(int argc, char **argv) read_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = read_one_shm(argv[i]); ret1 = read_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines while ((c = getopt(argc, argv, "hn")) != -1) {
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = stat_one_shm(argv[i], hsize, uname); ret1 = stat_one_shm(argv[i], hsize, uname);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 24 Linestruncate_shm(int argc, char **argv)
uint64_t newsize; uint64_t newsize;
int c, i, ret, ret1; int c, i, ret, ret1;
newsize = 0; newsize = 0;
while ((c = getopt(argc, argv, "s:")) != -1) { while ((c = getopt(argc, argv, "s:")) != -1) {
switch (c) { switch (c) {
case 's': case 's':
if (expand_number(optarg, &newsize) == -1) if (expand_number(optarg, &newsize) == -1)
err(1, "size:"); err(1, "size");
break; break;
case '?': case '?':
default: default:
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = truncate_one_shm(argv[i], newsize); ret1 = truncate_one_shm(argv[i], newsize);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines
View Options

head/lib/kyua/Makefile.kyua

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines "pagesize should be superpagesize, supported sizes:");
free(pagesizes); free(pagesizes);
break; break;
case '?': case '?':
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = create_one_shm(argv[i], mode, idx); ret1 = create_one_shm(argv[i], mode, idx);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 13 Linesdelete_one_shm(const char *path)
return (ret); return (ret);
} }
static int static int
delete_shm(int argc, char **argv) delete_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = delete_one_shm(argv[i]); ret1 = delete_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Linesout:
return (ret); return (ret);
} }
static int static int
read_shm(int argc, char **argv) read_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = read_one_shm(argv[i]); ret1 = read_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines while ((c = getopt(argc, argv, "hn")) != -1) {
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = stat_one_shm(argv[i], hsize, uname); ret1 = stat_one_shm(argv[i], hsize, uname);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 24 Linestruncate_shm(int argc, char **argv)
uint64_t newsize; uint64_t newsize;
int c, i, ret, ret1; int c, i, ret, ret1;
newsize = 0; newsize = 0;
while ((c = getopt(argc, argv, "s:")) != -1) { while ((c = getopt(argc, argv, "s:")) != -1) {
switch (c) { switch (c) {
case 's': case 's':
if (expand_number(optarg, &newsize) == -1) if (expand_number(optarg, &newsize) == -1)
err(1, "size:"); err(1, "size");
break; break;
case '?': case '?':
default: default:
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = truncate_one_shm(argv[i], newsize); ret1 = truncate_one_shm(argv[i], newsize);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines
View Options

head/lib/kyua/cli/Makefile

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines "pagesize should be superpagesize, supported sizes:");
free(pagesizes); free(pagesizes);
break; break;
case '?': case '?':
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = create_one_shm(argv[i], mode, idx); ret1 = create_one_shm(argv[i], mode, idx);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 13 Linesdelete_one_shm(const char *path)
return (ret); return (ret);
} }
static int static int
delete_shm(int argc, char **argv) delete_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = delete_one_shm(argv[i]); ret1 = delete_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Linesout:
return (ret); return (ret);
} }
static int static int
read_shm(int argc, char **argv) read_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = read_one_shm(argv[i]); ret1 = read_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines while ((c = getopt(argc, argv, "hn")) != -1) {
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = stat_one_shm(argv[i], hsize, uname); ret1 = stat_one_shm(argv[i], hsize, uname);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 24 Linestruncate_shm(int argc, char **argv)
uint64_t newsize; uint64_t newsize;
int c, i, ret, ret1; int c, i, ret, ret1;
newsize = 0; newsize = 0;
while ((c = getopt(argc, argv, "s:")) != -1) { while ((c = getopt(argc, argv, "s:")) != -1) {
switch (c) { switch (c) {
case 's': case 's':
if (expand_number(optarg, &newsize) == -1) if (expand_number(optarg, &newsize) == -1)
err(1, "size:"); err(1, "size");
break; break;
case '?': case '?':
default: default:
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = truncate_one_shm(argv[i], newsize); ret1 = truncate_one_shm(argv[i], newsize);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines
View Options

head/usr.bin/kyua/Makefile

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Lines "pagesize should be superpagesize, supported sizes:");
free(pagesizes); free(pagesizes);
break; break;
case '?': case '?':
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = create_one_shm(argv[i], mode, idx); ret1 = create_one_shm(argv[i], mode, idx);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 13 Linesdelete_one_shm(const char *path)
return (ret); return (ret);
} }
static int static int
delete_shm(int argc, char **argv) delete_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = delete_one_shm(argv[i]); ret1 = delete_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 152 Lines • ▼ Show 20 Linesout:
return (ret); return (ret);
} }
static int static int
read_shm(int argc, char **argv) read_shm(int argc, char **argv)
{ {
int i, ret, ret1; int i, ret, ret1;
if (argc == 1) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
ret1 = read_one_shm(argv[i]); ret1 = read_one_shm(argv[i]);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines while ((c = getopt(argc, argv, "hn")) != -1) {
default: default:
usage(); usage();
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = stat_one_shm(argv[i], hsize, uname); ret1 = stat_one_shm(argv[i], hsize, uname);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
Show All 24 Linestruncate_shm(int argc, char **argv)
uint64_t newsize; uint64_t newsize;
int c, i, ret, ret1; int c, i, ret, ret1;
newsize = 0; newsize = 0;
while ((c = getopt(argc, argv, "s:")) != -1) { while ((c = getopt(argc, argv, "s:")) != -1) {
switch (c) { switch (c) {
case 's': case 's':
if (expand_number(optarg, &newsize) == -1) if (expand_number(optarg, &newsize) == -1)
err(1, "size:"); err(1, "size");
break; break;
case '?': case '?':
default: default:
return (2); return (2);
} }
} }
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc == 0) {
usage();
return (2);
}
ret = 0; ret = 0;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
ret1 = truncate_one_shm(argv[i], newsize); ret1 = truncate_one_shm(argv[i], newsize);
if (ret1 != 0 && ret == 0) if (ret1 != 0 && ret == 0)
ret = ret1; ret = ret1;
} }
return (ret); return (ret);
} }
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines