Changeset f034ac0

Timestamp:

May 16, 2010, 1:15:25 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c2673ab, 3f6555d

Parents:

3687413

git-author:

David Benjamin <davidben@mit.edu> (05/15/10 16:24:27)

git-committer:

David Benjamin <davidben@mit.edu> (05/16/10 01:15:25)

Message:

Actually initialize owl_global in tester.c

Fixes tests relying on variables being initialized. Better not to keep
duplicating all the owl_global code. We tell ncurses to open a fake
screen a /dev/null and run with it. Explicitly pass "xterm" as the
terminal type to reduce reliance on the running environment. (Passing
NULL defaults to getenv("TERM").)

Signed-off-by: David Benjamin <davidben@mit.edu>

File:

• tester.c (modified) (2 diffs)

tester.c

@@ -16 +16 @@
 int main(int argc, char **argv, char **env)
 {
-  owl_errqueue_init(owl_global_get_errqueue(&g));
-  owl_obarray_init(&(g.obarray));
-  g.context_stack = NULL;
-  owl_global_push_context(&g, OWL_CTX_STARTUP, NULL, NULL);
+  /* initialize a fake ncurses, detached from std{in,out} */
+  FILE *rnull = fopen("/dev/null", "r");
+  FILE *wnull = fopen("/dev/null", "w");
+  newterm("xterm", wnull, rnull);
+  /* initialize global structures */
+  owl_global_init(&g);
 
   numtests = 0;
@@ -37 +39 @@
   }
   printf("1..%d\n", numtests);
+
+  /* probably not necessary, but tear down the screen */
+  endwin();
+  fclose(rnull);
+  fclose(wnull);
+
   return(numfailures);
 }