Changeset c2673ab

Timestamp:

May 22, 2010, 10:33:30 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

81601a6

Parents:

f034ac0

git-author:

Nelson Elhage <nelhage@mit.edu> (05/19/10 00:17:47)

git-committer:

Nelson Elhage <nelhage@mit.edu> (05/22/10 22:33:30)

Message:

Initialize perl inside the tester.

File:

• tester.c (modified) (3 diffs)

tester.c

@@ -7 +7 @@
 int numtests;
 
+int owl_regtest(void);
 int owl_util_regtest(void);
 int owl_dict_regtest(void);
@@ -19 +20 @@
   FILE *rnull = fopen("/dev/null", "r");
   FILE *wnull = fopen("/dev/null", "w");
+  char *perlerr;
+  int status = 0;
   newterm("xterm", wnull, rnull);
   /* initialize global structures */
   owl_global_init(&g);
 
+  perlerr = owl_perlconfig_initperl(NULL, &argc, &argv, &env);
+  if (perlerr) {
+    endwin();
+    fprintf(stderr, "Internal perl error: %s\n", perlerr);
+    status = 1;
+    goto out;
+  }
+  owl_global_complete_setup(&g);
+
+  status = owl_regtest();
+
+ out:
+  /* probably not necessary, but tear down the screen */
+  endwin();
+  fclose(rnull);
+  fclose(wnull);
+  return status;
+}
+
+int owl_regtest(void) {
   numtests = 0;
   int numfailures=0;
@@ -40 +63 @@
   printf("1..%d\n", numtests);
 
-  /* probably not necessary, but tear down the screen */
-  endwin();
-  fclose(rnull);
-  fclose(wnull);
-
   return(numfailures);
 }