tests2: fix and enable 46_grep test.

minux committed 12 years ago

Commit aa255f31 parent 0a513863 files · +13 −8Browse files

Unified · Split

3 files

  * privileges were granted by DECUS.
  */
 #include <stdio.h>
+#include <stdlib.h>
 /*
  * grep
  * See below for more information.
  */
-#if 0
 char    *documentation[] = {
    "grep searches a file for a given pattern.  Execute by",
    "   grep [flags] regular_expression file_list\n",
    "       [a-z] matches alphabetics, while [z-a] never matches.",
    "The concatenation of regular expressions is a regular expression.",
    0};
-#endif
 #define LMAX    512
 #define PMAX    256
 char *cclass();
 char *pmatch();
+void store(int);
+void error(char *);
+void badpat(char *, char *, char *);
+int match(void);
 /*** Display a file name *******************************/
    /* char  *stop;          // Pattern end   */
 {
    fprintf(stderr, "-GREP-E-%s, pattern is\"%s\"\n", message, source);
-   fprintf(stderr, "-GREP-E-Stopped at byte %d, '%c'\n",
+   fprintf(stderr, "-GREP-E-Stopped at byte %ld, '%c'\n",
          stop-source, stop[-1]);
    error("?GREP-E-Bad pattern\n");
 }
 }
 /*** Match line (lbuf) with pattern (pbuf) return 1 if match ***/
-void match()
+int match()
 {
    char   *l;        /* Line pointer       */
    p = pattern;
    while ((op = *p++) != ENDPAT) {
       if (debug > 1)
-         printf("byte[%d] = 0%o, '%c', op = 0%o\n",
+         printf("byte[%ld] = 0%o, '%c', op = 0%o\n",
                l-line, *l, *l, op);
       switch(op) {

  66_macro_concat_end.test \
  67_macro_concat.test
-# 30_hanoi.test -- seg fault in the code, gcc as well
 # 34_array_assignment.test -- array assignment is not in C standard
-# 46_grep.test -- does not compile even with gcc
-SKIP = 34_array_assignment.test 46_grep.test
+SKIP = 34_array_assignment.test
 # some tests do not pass on all platforms, remove them for now
 ifeq ($(TARGETOS),Darwin)
 # Some tests might need arguments
 ARGS =
 31_args.test : ARGS = arg1 arg2 arg3 arg4 arg5
+46_grep.test : ARGS = '[^* ]*[:a:d: ]+\:\*-/: $$' 46_grep.c
 all test: $(filter-out $(SKIP),$(TESTS))

Keyboard shortcuts