Revision: 71800
http://sourceforge.net/p/brlcad/code/71800
Author: brlcad
Date: 2018-09-24 19:38:56 +0000 (Mon, 24 Sep 2018)
Log Message:
-----------
expand out all the bu_dir() tests with progress/status/diagnostic reporting,
but still having the unit return zero (i.e., off).
Modified Paths:
--------------
brlcad/trunk/src/libbu/tests/dir.c
Modified: brlcad/trunk/src/libbu/tests/dir.c
===================================================================
--- brlcad/trunk/src/libbu/tests/dir.c 2018-09-24 18:34:32 UTC (rev 71799)
+++ brlcad/trunk/src/libbu/tests/dir.c 2018-09-24 19:38:56 UTC (rev 71800)
@@ -25,14 +25,96 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#include "bio.h"
#include "bu.h"
+#define PRINT(type, left, cmp, right) bu_log("bu_dir(%s) \"%s\" " CPP_STR(cmp)
" \"%s\" ", enum2str[type], left, right)
+
+/* private mapping from enum to string */
+static const char *enum2str[BU_DIR_END+1] = {0};
+
+
+static void
+check(int test, int *count)
+{
+ if (test) {
+ bu_log("[PASSED]\n");
+ } else {
+ bu_log("[FAILED]\n");
+ (*count)++;
+ }
+}
+
+
+static void
+test_writable(bu_dir_t type, const char *ipath, int *count)
+{
+ size_t i;
+ FILE *fp;
+ char path[MAXPATHLEN] = {0};
+ char file[MAXPATHLEN] = {0};
+ const char *cpath = NULL;
+
+ PRINT(type, ipath, is writable, "?");
+
+ /* get a random file name for writable directory testing */
+ bu_strlcat(file, "bu_dir_", MAXPATHLEN);
+ srand((unsigned)(bu_gettime() % UINT_MAX));
+ for (i = 0; i < 8; i++) {
+ char randchar[2] = {0};
+ randchar[0] = 'a' + (rand() % 26);
+ bu_strlcat(file, randchar, MAXPATHLEN);
+ }
+ bu_strlcat(file, ".txt", MAXPATHLEN);
+
+ /* construct full path to test file */
+ bu_strlcat(path, ipath, MAXPATHLEN);
+ {
+ char separator[2] = {0};
+ separator[0] = BU_DIR_SEPARATOR;
+ bu_strlcat(path, separator, MAXPATHLEN);
+ }
+ bu_strlcat(path, file, MAXPATHLEN);
+
+ /* make sure nothing in the way */
+ bu_file_delete(path);
+ if (bu_file_exists(path, NULL)) {
+ bu_log("[ERROR]\nfile [%s] is in the way, could not be deleted\n",
path);
+ (*count)++;
+ return;
+ }
+
+ /* see if we can write it! */
+ fp = fopen(path, "w");
+ fclose(fp);
+ check(bu_file_exists(path, NULL), count);
+ bu_file_delete(path);
+
+ /* get and write the test file (again) */
+ cpath = bu_dir(NULL, 0, type, file, NULL);
+ PRINT(type, cpath, is writable, "?");
+ if (!BU_STR_EMPTY(cpath)) {
+ fp = fopen(cpath, "w");
+ fclose(fp);
+ }
+ check(bu_file_exists(cpath, NULL), count);
+ bu_file_delete(cpath);
+
+ /* sanity */
+ PRINT(type, path, ==, cpath);
+ check(BU_STR_EQUAL(path, cpath), count);
+
+ bu_log("tested %s\n", file);
+}
+
+
int
main(int argc, char *argv[])
{
bu_dir_t type;
+ size_t i;
int ret;
int failures = 0;
const char *cpath;
@@ -40,6 +122,24 @@
const char *currp;
char path[MAXPATHLEN] = {0};
+ /* explicit init to proof against enum reordering */
+ enum2str[BU_DIR_CURR] = CPP_STR(BU_DIR_CURR);
+ enum2str[BU_DIR_INIT] = CPP_STR(BU_DIR_INIT);
+ enum2str[BU_DIR_BIN] = CPP_STR(BU_DIR_BIN);
+ enum2str[BU_DIR_LIB] = CPP_STR(BU_DIR_LIB);
+ enum2str[BU_DIR_LIBEXEC] = CPP_STR(BU_DIR_LIBEXEC);
+ enum2str[BU_DIR_INCLUDE] = CPP_STR(BU_DIR_INCLUDE);
+ enum2str[BU_DIR_DATA] = CPP_STR(BU_DIR_DATA);
+ enum2str[BU_DIR_DOC] = CPP_STR(BU_DIR_DOC);
+ enum2str[BU_DIR_MAN] = CPP_STR(BU_DIR_MAN);
+ enum2str[BU_DIR_TEMP] = CPP_STR(BU_DIR_TEMP);
+ enum2str[BU_DIR_HOME] = CPP_STR(BU_DIR_HOME);
+ enum2str[BU_DIR_CACHE] = CPP_STR(BU_DIR_CACHE);
+ enum2str[BU_DIR_CONFIG] = CPP_STR(BU_DIR_CONFIG);
+ enum2str[BU_DIR_EXT] = CPP_STR(BU_DIR_EXT);
+ enum2str[BU_DIR_LIBEXT] = CPP_STR(BU_DIR_LIBEXT);
+ enum2str[BU_DIR_END] = CPP_STR(BU_DIR_END);
+
if (BU_STR_EQUAL(bu_path_basename(argv[0], path), "bu_test"))
argc--, argv++;
@@ -52,17 +152,17 @@
#ifdef HAVE_GETCWD
memset(path, 0, MAXPATHLEN);
currp = bu_dir(NULL, 0, BU_DIR_CURR, NULL);
- if (!getcwd(path, MAXPATHLEN)) {
+ ret = getcwd(path, MAXPATHLEN);
+ if (ret != 0) {
+ perror("ERROR, getcwd");
failures++;
- } else {
- if (!BU_STR_EQUAL(path, currp)) {
- failures++;
- }
}
+ PRINT(BU_DIR_CURR, path, ==, currp);
+ check(BU_STR_EQUAL(path, currp), &failures);
#endif
/* each directory lookup should return something */
- for (type = BU_DIR_CURR; type != BU_DIR_UNKNOWN; type++) {
+ for (type = BU_DIR_CURR; type != BU_DIR_END; type++) {
memset(path, 0, MAXPATHLEN);
if (type == BU_DIR_EXT || type == BU_DIR_LIBEXT)
@@ -69,57 +169,61 @@
continue;
bu_dir(path, MAXPATHLEN, type, NULL);
- if (BU_STR_EMPTY(path))
- failures++;
+ PRINT(type, path, !=, "");
+ check(!BU_STR_EMPTY(path), &failures);
}
/* test absolute composition */
if (bu_file_exists("/", NULL)) {
cpath = bu_dir(NULL, 0, "/", NULL);
- if (!BU_STR_EQUAL(cpath, "/"))
- failures++;
+ PRINT(BU_DIR_END, cpath, ==, "/");
+ check(BU_STR_EQUAL(cpath, "/"), &failures);
} else if (bu_file_exists("C:\\", NULL)) {
cpath = bu_dir(NULL, 0, "C:\\", NULL);
- if (!BU_STR_EQUAL(cpath, "C:\\"))
- failures++;
+ PRINT(BU_DIR_END, cpath, ==, "C:\\");
+ check(BU_STR_EQUAL(cpath, "C:\\"), &failures);
}
/* slightly more complex bindir composition */
if (bu_file_exists("/bin/sh", NULL)) {
cpath = bu_dir(NULL, 0, "/", "bin", "sh", NULL);
- if (!BU_STR_EQUAL(cpath, "/bin/sh"))
- failures++;
+ PRINT(BU_DIR_END, cpath, ==, "/bin/sh");
+ check(BU_STR_EQUAL(cpath, "/bin/sh"), &failures);
+
cpath = bu_dir(NULL, 0, "/", "bin", "sh", BU_DIR_EXT, NULL);
- if (!BU_STR_EQUAL(cpath, "/bin/sh"))
- failures++;
+ PRINT(BU_DIR_EXT, cpath, ==, "/bin/sh");
+ check(BU_STR_EQUAL(cpath, "/bin/sh"), &failures);
} else if (bu_file_exists("C:\\Windows\\System32\\cmd.exe", NULL)) {
cpath = bu_dir(NULL, 0, "C:\\", "Windows", "System32", "cmd.exe", NULL);
- if (!BU_STR_EQUAL(cpath, "C:\\Windows\\System32\\cmd.exe"))
- failures++;
+ PRINT(BU_DIR_END, cpath, ==, "C:\\Windows\\System32\\cmd.exe");
+ check(BU_STR_EQUAL(cpath, "C:\\Windows\\System32\\cmd.exe"), &failures);
+
cpath = bu_dir(NULL, 0, "C:\\", "Windows", "System32", "cmd",
BU_DIR_EXT, NULL);
- if (!BU_STR_EQUAL(cpath, "C:\\Windows\\System32\\cmd.exe"))
- failures++;
+ PRINT(BU_DIR_EXT, cpath, ==, "C:\\Windows\\System32\\cmd.exe");
+ check(BU_STR_EQUAL(cpath, "C:\\Windows\\System32\\cmd.exe"), &failures);
}
/* current dir <> init dir */
initp = bu_dir(NULL, 0, BU_DIR_INIT, NULL);
- if (!BU_STR_EQUAL(currp, initp))
- failures++;
+ PRINT(BU_DIR_INIT, currp, !empty && ==, initp);
+ check(!BU_STR_EMPTY(currp) && BU_STR_EQUAL(currp, initp), &failures);
cpath = bu_dir(NULL, 0, currp, "..", NULL);
ret = chdir(cpath);
if (ret != 0) {
+ perror("ERROR, chdir");
failures++;
}
currp = bu_dir(NULL, 0, BU_DIR_CURR, NULL);
- if (BU_STR_EQUAL(currp, initp))
- failures++;
+ PRINT(BU_DIR_CURR, currp, !empty && !=, initp);
+ check(!BU_STR_EMPTY(currp) && !BU_STR_EQUAL(currp, initp), &failures);
ret = chdir(initp);
if (ret != 0) {
+ perror("ERROR, chdir");
failures++;
}
currp = bu_dir(NULL, 0, BU_DIR_CURR, NULL);
- if (!BU_STR_EQUAL(currp, initp))
- failures++;
+ PRINT(BU_DIR_CURR, currp, !empty && ==, initp);
+ check(!BU_STR_EMPTY(currp) && BU_STR_EQUAL(currp, initp), &failures);
/* bindir */
/* TODO: need something to test, but nada installed yet */
@@ -127,19 +231,19 @@
/* libdir and library extension expansion */
cpath = bu_dir(NULL, 0, BU_DIR_LIB, NULL);
{
- size_t i;
const char *extensions[4] = {".so", ".dylib", ".dll", NULL};
- for (i = 0; i < 4; i++) {
+ for (i = 0; i < sizeof(extensions) / sizeof(extensions[0]); i++) {
snprintf(path, MAXPATHLEN, "%s/libbu%s", cpath, extensions[i]);
if (bu_file_exists(path, NULL)) {
char lpath[MAXPATHLEN] = {0};
bu_dir(lpath, MAXPATHLEN, BU_DIR_LIB, "libbu", BU_DIR_LIBEXT,
NULL);
- if (!BU_STR_EQUAL(path, lpath))
- failures++;
+ PRINT(BU_DIR_LIBEXT, path, ==, lpath);
+ check(BU_STR_EQUAL(path, lpath), &failures);
+
memset(lpath, 0, MAXPATHLEN);
+ PRINT(BU_DIR_LIBEXT, path, ==, lpath);
bu_dir(lpath, MAXPATHLEN, cpath, "libbu", BU_DIR_LIBEXT, NULL);
- if (!BU_STR_EQUAL(path, lpath))
- failures++;
+ check(BU_STR_EQUAL(path, lpath), &failures);
}
}
}
@@ -150,12 +254,13 @@
/* includedir */
memset(path, 0, MAXPATHLEN);
bu_dir(path, MAXPATHLEN, BU_DIR_INCLUDE, "conf", NULL);
- if (BU_STR_EMPTY(path))
- failures++;
+ PRINT(BU_DIR_INCLUDE, path, !=, "");
+ check(!BU_STR_EMPTY(path), &failures);
+
memset(path, 0, MAXPATHLEN);
bu_dir(path, MAXPATHLEN, BU_DIR_INCLUDE, "conf", "MAJOR", NULL);
- if (BU_STR_EMPTY(path))
- failures++;
+ PRINT(BU_DIR_INCLUDE, path, !=, "");
+ check(!BU_STR_EMPTY(path), &failures);
/* datadir */
/* TODO: need something to test, but nada installed yet */
@@ -166,39 +271,82 @@
/* mandir */
/* TODO: need something to test, but nada installed yet */
- /* tempdir */
+ /* tempdir, should be writable */
+ memset(path, 0, MAXPATHLEN);
+ bu_dir(path, MAXPATHLEN, BU_DIR_TEMP, NULL);
+ if (!BU_STR_EMPTY(path)) {
+ test_writable(BU_DIR_TEMP, path, &failures);
+ } else {
+ bu_log("ERROR: TEMP directory could not be found\n");
+ failures++;
+ }
/* homedir */
+ memset(path, 0, MAXPATHLEN);
+ bu_dir(path, MAXPATHLEN, BU_DIR_HOME, NULL);
+ if (!BU_STR_EMPTY(path)) {
+ test_writable(BU_DIR_HOME, path, &failures);
+ } else {
+ bu_log("ERROR: HOME directory could not be found\n");
+ failures++;
+ }
/* cachedir */
+ memset(path, 0, MAXPATHLEN);
+ bu_dir(path, MAXPATHLEN, BU_DIR_CACHE, NULL);
+ if (!BU_STR_EMPTY(path)) {
+ test_writable(BU_DIR_CACHE, path, &failures);
+ } else {
+ bu_log("ERROR: CACHE directory could not be found\n");
+ failures++;
+ }
/* configdir */
+ memset(path, 0, MAXPATHLEN);
+ bu_dir(path, MAXPATHLEN, BU_DIR_CONFIG, NULL);
+ if (!BU_STR_EMPTY(path)) {
+ test_writable(BU_DIR_CONFIG, path, &failures);
+ } else {
+ bu_log("ERROR: CONFIG directory could not be found\n");
+ failures++;
+ }
/* input edge cases */
- if (bu_dir(NULL, 0, NULL) != NULL)
- failures++;
- if (bu_dir(NULL, MAXPATHLEN, NULL) != NULL)
- failures++;
+ cpath = bu_dir(NULL, 0, NULL);
+ PRINT(BU_DIR_END, cpath, ==, "");
+ check((cpath == NULL), &failures);
+
+ cpath = bu_dir(NULL, MAXPATHLEN, NULL);
+ PRINT(BU_DIR_END, cpath, ==, "");
+ check((cpath == NULL), &failures);
+
memset(path, 0, MAXPATHLEN);
- if (bu_dir(path, 0, NULL) != NULL)
- failures++;
+ cpath = bu_dir(path, 0, NULL);
+ PRINT(BU_DIR_END, cpath, ==, "");
+ check((cpath == NULL), &failures);
+
memset(path, 0, MAXPATHLEN);
- if (!BU_STR_EMPTY(bu_dir(path, MAXPATHLEN, NULL)))
- failures++;
+ cpath = bu_dir(path, 1, ".", NULL);
+ PRINT(BU_DIR_END, cpath, ==, "");
+ check(BU_STR_EMPTY(cpath), &failures);
+
memset(path, 0, MAXPATHLEN);
- if (!BU_STR_EMPTY(bu_dir(path, 1, ".", NULL)))
- failures++;
+ cpath = bu_dir(path, 2, ".", NULL);
+ PRINT(BU_DIR_END, cpath, !=, "");
+ check(!BU_STR_EMPTY(cpath), &failures);
+
memset(path, 0, MAXPATHLEN);
- if (BU_STR_EMPTY(bu_dir(path, 2, ".", NULL)))
- failures++;
+ cpath = bu_dir(path, 1, "/", NULL);
+ PRINT(BU_DIR_END, cpath, ==, "");
+ check(BU_STR_EMPTY(cpath), &failures);
+
memset(path, 0, MAXPATHLEN);
- if (!BU_STR_EMPTY(bu_dir(path, 1, "/", NULL)))
- failures++;
- memset(path, 0, MAXPATHLEN);
- if (BU_STR_EMPTY(bu_dir(path, 2, "/", NULL)))
- failures++;
+ cpath = bu_dir(path, 2, "/", NULL);
+ PRINT(BU_DIR_END, cpath, !=, "");
+ check(!BU_STR_EMPTY(cpath), &failures);
return 0;
+ /* return failures; */
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
