commit - 5e5c37b59cbae92fc6e67b5dc70e8a412fa967c4
commit + 333d8d7d011bafcc0f54e1cf91df9d5f6562963e
blob - 6c47defd771e97468a534c2f3feaca47494d223f
blob + 102f83abc2377e5fc38c852f76f7a5fda6e3bb28
--- script.c
+++ script.c
@@ -363,14 +363,14 @@ eval(struct op *op)
 		break;
 
 	case OP_ASSERT:
-		if ((ret = eval(op->v.assert)) != TEST_PASSED)
+		if ((ret = eval(op->v.assert)) != EVAL_OK)
 			return ret;
                 popv(&a);
                 if (!val_trueish(&a)) {
 			printf("assertion failed: ");
 			pp_op(op->v.assert);
 			printf("\n");
-			return TEST_FAILED;
+			return EVAL_ERR;
 		}
 		break;
 
@@ -379,14 +379,14 @@ eval(struct op *op)
 
 		for (i = 0; i < op->v.funcall.argc; ++i) {
 			t = &op->v.funcall.argv[i];
-			if ((ret = eval(t)) != TEST_PASSED)
+			if ((ret = eval(t)) != EVAL_OK)
 				return ret;
 		}
 
                 proc = op->v.funcall.proc;
 		if (proc->nativefn != NULL)
 			proc->nativefn(i);
-		else if ((ret = eval(proc->body)) != TEST_PASSED)
+		else if ((ret = eval(proc->body)) != EVAL_OK)
 				return ret;
 		break;
 
@@ -403,9 +403,9 @@ eval(struct op *op)
 		break;
 
 	case OP_CMP_EQ:
-		if ((ret = eval(op->v.cmp_eq.a)) != TEST_PASSED)
+		if ((ret = eval(op->v.cmp_eq.a)) != EVAL_OK)
 			return ret;
-		if ((ret = eval(op->v.cmp_eq.b)) != TEST_PASSED)
+		if ((ret = eval(op->v.cmp_eq.b)) != EVAL_OK)
 			return ret;
 
 		popv(&b);
@@ -420,7 +420,7 @@ eval(struct op *op)
 
 	if (op->next)
 		return eval(op->next);
-	return TEST_PASSED;
+	return EVAL_OK;
 }
 
 void
@@ -565,7 +565,7 @@ static int
 builtin_dummy(int argc)
 {
 	printf("dummy! yay!\n");
-	return 0;
+	return EVAL_OK;
 }
 
 static int
@@ -600,16 +600,16 @@ main(int argc, char **argv)
 		fflush(stdout);
 
 		switch (run_test(t)) {
-		case TEST_PASSED:
+		case EVAL_OK:
 			printf("ok!\n");
 			passed++;
 			break;
-		case TEST_FAILED:
+		case EVAL_ERR:
 			failed++;
 			/* we've already printed the failure */
 			printf("\n");
 			break;
-		case TEST_SKIPPED:
+		case EVAL_SKIP:
 			printf("skipped!\n");
 			skipped++;
 			break;
blob - 0040420c663c6389250d8bc4f6e34cfe2d83d028
blob + 1f73f4a1853cc476c39d610cd266fdea399f93a7
--- script.h
+++ script.h
@@ -110,9 +110,9 @@ struct test {
 };
 
 enum {
-	TEST_PASSED,
-	TEST_FAILED,
-	TEST_SKIPPED,
+	EVAL_OK,
+	EVAL_ERR,
+	EVAL_SKIP,
 };
 
 void		 global_set(char *, struct op *);