Changeset 8633

Timestamp:

Aug 26, 2006, 10:02:50 AM (20 years ago)

Author:

eugene

Message:

adding tap tests to libohana

Location:

trunk/Ohana/src/libohana

Files:

• Makefile (modified) (5 diffs)
• include/ohana.h (modified) (1 diff)
• src/string.c (modified) (1 diff)
• test (added)
• test/.cvsignore (added)
• test/string.c (added)

trunk/Ohana/src/libohana/Makefile

@@ -6 +6 @@
 MAN     =       $(HOME)/doc
 INC     =       $(HOME)/include
+TESTDIR =       $(HOME)/test
+TESTLIB =       $(ROOT)/src/libtap/lib/$(ARCH)
+TESTINC =       $(ROOT)/src/libtap/include
 DESTBIN =       $(LBIN)
 DESTLIB =       $(LLIB)
@@ -11 +14 @@
 DESTMAN =       $(LMAN)
 
-CFLAGS  =       -I$(LINC) -D$(ARCH)
+LIBS    =       -L$(LLIB) -L$(XLIB) -lohana
+CFLAGS  =       -I$(INC) -I$(LINC) -D$(ARCH)
+TFLAGS  =       $(CFLAGS) $(LIBS) -L$(TESTLIB) -I$(TESTINC) -ltap
 
 default: install
@@ -37 +42 @@
 $(SRC)/version.$(ARCH).o
 
+TEST = \
+$(TESTDIR)/string.$(ARCH)
+
 $(OBJS): $(INCS)
 
@@ -55 +63 @@
         cp $(INC)/$* $(DESTINC)/
 
+$(TESTDIR)/%.$(ARCH) : $(DESTLIB)/libohana.a $(TESTDIR)/%.c
+        $(CC) $^ -o $@ $(TFLAGS)
+
+testcode: install $(TEST)
+
+test:
+        make testcode
+        for i in $(TEST); do $$i; done
+
 clean:
         rm -f */*~
@@ -66 +83 @@
 
 .c.$(ARCH).o:
+        echo make c
+        echo $(CFLAGS)
+        echo $*.c
+        echo $@
         $(CC) $(CFLAGS) -c $*.c -o $@
+
+.PHONY: test

trunk/Ohana/src/libohana/include/ohana.h

@@ -115 +115 @@
 int     remove_argument        PROTO((int N, int *argc, char **argv));
 void    uppercase              PROTO((char *string));
+char   *strsubs                PROTO((char *string, char *match, char *with));
 
 /* in findexec.c */

trunk/Ohana/src/libohana/src/string.c

@@ -69 +69 @@
 }
 
+// replace a single entry of 'match' in the string with 'with'
+// (quick-and-dirty regex for a common case...)
+char *strsubs (char *string, char *match, char *with) {
+
+  int N1, N2, N3;
+  char *root;
+  char *out;
+  char *ext;
+
+  if (string == NULL) return NULL;
+  if (match == NULL) return NULL;
+  if (with == NULL) return NULL;
+
+  root = strstr (string, match);
+  if (root == NULL) {
+    return (strcreate (string));
+  }
+  N1 = root - string;
+
+  N2 = strlen (with);
+
+  ext = root + strlen(match);
+  N3 = strlen (ext);
+
+  ALLOCATE (out, char *, N1 + N2 + N3 + 1);
+
+  strncpy (out, string, N1);
+  strncpy (&out[N1], with, N2);
+  strncpy (&out[N1+N2], ext, N3);
+  out[N1+N2+N3] = 0;
+
+  return out;
+}
+
+# if 0
+// replace a single entry of 'match' in the string with 'with'
+// (quick-and-dirty regex for a common case...)
+char *strrsubs (char *string, char *match, char *with) {
+
+  char *root;
+  char *out;
+
+  if (string == NULL) return NULL;
+  if (match == NULL) return NULL;
+  if (with == NULL) return NULL;
+
+  root = strstr (string, match);
+  if (root == NULL) return NULL;
+
+  ext = string + strlen (match);
+  ALLOCATE (out, char *, strlen(with) + strlen(ext) + 1);
+  strcpy (out, with);
+  strcat (out, ext);
+
+  return out;
+}
+# endif
+
 int scan_line (FILE *f, char *line) {