Author: ngie
Date: Sat Apr 22 20:06:11 2017
New Revision: 317291
URL: https://svnweb.freebsd.org/changeset/base/317291
Log:
Rename gctl.t to gctl_test.t and test.c to gctl_test_helper.c
This is being done to reduce ambiguity and to make the tests more portable
in the future to other locations in the source tree.
MFC after: 5 weeks
Sponsored by: Dell EMC Isilon
Added:
head/tools/regression/geom_gpt/gctl_test.t
- copied, changed from r317290, head/tools/regression/geom_gpt/gctl.t
head/tools/regression/geom_gpt/gctl_test_helper.c
- copied unchanged from r317290, head/tools/regression/geom_gpt/test.c
Deleted:
head/tools/regression/geom_gpt/gctl.t
head/tools/regression/geom_gpt/test.c
Copied and modified: head/tools/regression/geom_gpt/gctl_test.t (from r317290,
head/tools/regression/geom_gpt/gctl.t)
==============================================================================
--- head/tools/regression/geom_gpt/gctl.t Sat Apr 22 20:00:52 2017
(r317290, copy source)
+++ head/tools/regression/geom_gpt/gctl_test.t Sat Apr 22 20:06:11 2017
(r317291)
@@ -132,7 +132,7 @@ if (exists $ENV{'TEST_VERBOSE'}) {
}
# Compile the driver...
-my $st = system("cc -o $cmd -g $srcdir/test.c -lgeom");
+my $st = system("cc -o $cmd -g $srcdir/gctl_test_helper.c -lgeom");
if ($st != 0) {
print "1..0 # SKIP error compiling test.c\n";
exit 0;
Copied: head/tools/regression/geom_gpt/gctl_test_helper.c (from r317290,
head/tools/regression/geom_gpt/test.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/regression/geom_gpt/gctl_test_helper.c Sat Apr 22 20:06:11
2017 (r317291, copy of r317290, head/tools/regression/geom_gpt/test.c)
@@ -0,0 +1,165 @@
+/*-
+ * Copyright (c) 2005, 2006 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <libgeom.h>
+
+struct retval {
+ struct retval *retval;
+ const char *param;
+ char *value;
+};
+
+struct retval *retval;
+int verbose;
+
+static void
+usage()
+{
+ fprintf(stdout, "usage: %s [-v] param[:len][=value] ...\n",
+ getprogname());
+ exit(1);
+}
+
+static int
+parse(char *arg, char **param, char **value, int *len)
+{
+ char *e, *colon, *equal;
+
+ if (*arg == '\0')
+ return (EINVAL);
+
+ colon = strchr(arg, ':');
+ equal = strchr(arg, '=');
+ if (colon == NULL && equal == NULL)
+ return (EINVAL);
+ if (colon == arg || equal == arg)
+ return (EINVAL);
+ if (colon != NULL && equal != NULL && equal < colon)
+ return (EINVAL);
+
+ if (colon != NULL)
+ *colon++ = '\0';
+ if (equal != NULL)
+ *equal++ = '\0';
+
+ *param = arg;
+ if (colon != NULL) {
+ /* Length specification. This parameter is RW. */
+ if (*colon == '\0')
+ return (EINVAL);
+ *len = strtol(colon, &e, 0);
+ if (*e != '\0')
+ return (EINVAL);
+ if (*len <= 0 || *len > PATH_MAX)
+ return (EINVAL);
+ *value = malloc(*len);
+ if (*value == NULL)
+ return (ENOMEM);
+ memset(*value, 0, *len);
+ if (equal != NULL) {
+ if (strlen(equal) >= PATH_MAX)
+ return (ENOMEM);
+ strcpy(*value, equal);
+ }
+ } else {
+ /* This parameter is RO. */
+ *len = -1;
+ if (*equal == '\0')
+ return (EINVAL);
+ *value = equal;
+ }
+
+ return (0);
+}
+
+int main(int argc, char *argv[])
+{
+ struct retval *rv;
+ struct gctl_req *req;
+ char *param, *value;
+ const char *s;
+ int c, len;
+
+ req = gctl_get_handle();
+ gctl_ro_param(req, "class", -1, "GPT");
+
+ while ((c = getopt(argc, argv, "v")) != -1) {
+ switch (c) {
+ case 'v':
+ verbose = 1;
+ break;
+ case '?':
+ default:
+ usage();
+ /* NOTREACHED */
+ break;
+ }
+ }
+
+ while (optind < argc) {
+ if (!parse(argv[optind++], ¶m, &value, &len)) {
+ if (len > 0) {
+ rv = malloc(sizeof(struct retval));
+ rv->param = param;
+ rv->value = value;
+ rv->retval = retval;
+ retval = rv;
+ gctl_rw_param(req, param, len, value);
+ } else
+ gctl_ro_param(req, param, -1, value);
+ }
+ }
+
+ if (verbose)
+ gctl_dump(req, stdout);
+
+ s = gctl_issue(req);
+ if (s == NULL) {
+ printf("PASS");
+ while (retval != NULL) {
+ rv = retval->retval;
+ printf(" %s=%s", retval->param, retval->value);
+ free(retval->value);
+ free(retval);
+ retval = rv;
+ }
+ printf("\n");
+ } else
+ printf("FAIL %s\n", s);
+
+ gctl_free(req);
+ return (0);
+}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
