Merge pull request #3510 from masatake/tutil-more-test-cases

Tutil: add more test cases

Author: masatake

extra-cmds/utiltest.c

@@ -8,11 +8,47 @@
 #include "general.h"
 
 #include "acutest.h"
+#include "fname.h"
 #include "htable.h"
 #include "routines.h"
 #include <string.h>
 
-void test_htable_update(void)
+static void test_fname_absolute(void)
+{
+	char *str;
+	char *in;
+
+#define T(INPUT,OUTPUT) \
+	TEST_CHECK((in = eStrdup (INPUT), \
+				strcmp((str = canonicalizeAbsoluteFileName (in)), OUTPUT) == 0)); \
+	eFree (in); \
+	eFree (str)
+
+	T("/abc/efg/..", "/abc");
+	T("/abc/efg/hij/..", "/abc/efg");
+	T("/abc/efg/../", "/abc");
+	T("/abc/efg/./", "/abc/efg");
+	T("/abc/efg/./../.", "/abc");
+	T("/abc/..", "/");
+
+	T("..", "/");
+	T(".", "/");
+	T("a", "/a");
+	T("abc", "/abc");
+	T("", "/");
+
+	T("../a", "/a");
+	T("../abc", "/abc");
+	T("./a", "/a");
+	T("./abc", "/abc");
+	T("a/../b", "/b");
+	T("abc/../efg", "/efg");
+
+	T("..//////a", "/a");
+	T("..//..//..//a", "/a");
+}
+
+static void test_htable_update(void)
 {
 	hashTable *htable = hashTableNew (3, hashCstrhash, hashCstreq,
 									  eFree, NULL);
@@ -28,12 +64,13 @@ void test_htable_update(void)
 	hashTableDelete(htable);
 }
 
-void test_routines_strrstr(void)
+static void test_routines_strrstr(void)
 {
 	TEST_CHECK(strcmp(strrstr("abcdcdb", "cd"), "cdb") == 0);
 }
 
 TEST_LIST = {
+   { "fname/absolute",   test_fname_absolute   },
    { "htable/update",    test_htable_update    },
    { "routines/strrstr", test_routines_strrstr },
    { NULL, NULL }     /* zeroed record marking the end of the list */

main/e_msoft.h

@@ -20,7 +20,6 @@
 #define HAVE_DIRECT_H 1
 #define HAVE_STRICMP 1
 #define HAVE_STRNICMP 1
-#define HAVE_STRSTR 1
 #define HAVE_STRERROR 1
 #define HAVE__FINDFIRST 1
 #define HAVE_FINDNEXT 1

main/fname.c

@@ -134,12 +134,10 @@ extern char *canonicalizeAbsoluteFileName (char *fname)
 			fname [1] = '\0';
 			return strdup (fname);
 		}
-		{
-			char *r = xMalloc (strlen (fname) + 2, char);
-			r[0] = '/';
-			strcpy (r + 1, fname);
-			return r;
-		}
+		char *r = xMalloc (strlen (fname) + 2, char);
+		r[0] = '/';
+		strcpy (r + 1, fname);
+		return r;
 	}
 
 	*next = '\0';

main/fname.h

@@ -20,7 +20,9 @@ extern hashTable  *canonFnameCacheTableNew (void);
 extern const char *canonicalizeRelativeFileName(const char *cwd, size_t cwd_len, const char *input,
 												hashTable* cache_table);
 
-/* eFree() is for freeing the cstring returned from this function. */
+/* eFree() is for freeing the cstring returned from this function.
+ * This function may modify FNAME[].
+ */
 extern char *canonicalizeAbsoluteFileName (char *fname);
 
 #endif	/* CTAGS_MAIN_FNAME_UTIL_H */

makefiles/testing.mak

@@ -384,4 +384,4 @@ tutil: $(UTILTEST_DEP)
 	fi; \
 	\
 	builddir=$$(pwd); \
-	$$vg $$builddir/$(UTILTEST_TEST)
+	$$vg $$builddir/$(UTILTEST_TEST) -v