Changeset e5e9888

Timestamp:

May 22, 2010, 10:37:26 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:

22e02cd

Parents:

98d7757

git-author:

Nelson Elhage <nelhage@mit.edu> (05/22/10 18:19:35)

git-committer:

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

Message:

tester: Better error handling.

* Use 'do' instead of slurping the file and eval'ing, which gives the
  right filename in error messages.
* Catch errors reported by do due to compilation failures.

File:

• tester.c (modified) (2 diffs)

tester.c

@@ -53 +53 @@
 
   if (argc > 1) {
-    char *code;
-    FILE *f;
+    ENTER;
+    SAVETMPS;
 
     if (strcmp(argv[1], "-le") == 0 && argc > 2) {
@@ -62 +62 @@
        */
       moreswitches("l");
-      code = argv[2];
+      eval_pv(argv[2], true);
     } else {
-      f = fopen(argv[1], "r");
-      if (!f) {
-        perror(argv[1]);
-        status = 1;
-        goto out;
-      }
-      code = owl_slurp(f);
       sv_setpv(get_sv("0", false), argv[1]);
+      sv_setpv(get_sv("main::test_prog", TRUE), argv[1]);
+
+      eval_pv("do $main::test_prog; die($@) if($@)", true);
     }
-
-    ENTER;
-    SAVETMPS;
-
-    eval_pv(code, true);
 
     status = 0;