aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xruntest.rb9
-rw-r--r--testcase/backslash_in_rule_command.mk2
-rw-r--r--testcase/err_invalid_ifeq4.mk3
-rw-r--r--testcase/escaped_wildcard.mk2
-rw-r--r--testcase/multiline_arg.mk3
-rw-r--r--testcase/semi_in_var.mk4
-rw-r--r--testcase/semicolon_in_var.mk2
-rw-r--r--testcase/shell_var.mk2
-rw-r--r--testcase/target_specific_var_var_name.mk2
-rw-r--r--testcase/vpath.mk3
10 files changed, 23 insertions, 9 deletions
diff --git a/runtest.rb b/runtest.rb
index d0667fb..1fc1fc5 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -110,7 +110,14 @@ end
run_make_test = proc do |mk|
c = File.read(mk)
- expected_failure = c =~ /\A# TODO/
+ expected_failure = c =~ /\A# TODO(?:\((go|c)\))?/
+ if $1
+ if $1 == 'go' && ckati
+ expected_failure = false
+ elsif $1 == 'c' && !ckati
+ expected_failure = false
+ end
+ end
run_in_testdir(mk) do |name|
# TODO: Fix
diff --git a/testcase/backslash_in_rule_command.mk b/testcase/backslash_in_rule_command.mk
index 5185c24..570fa64 100644
--- a/testcase/backslash_in_rule_command.mk
+++ b/testcase/backslash_in_rule_command.mk
@@ -1,4 +1,4 @@
-# TODO: Fix
+# TODO(go): Fix
test:;echo foo\
bar
diff --git a/testcase/err_invalid_ifeq4.mk b/testcase/err_invalid_ifeq4.mk
index 1c12cf1..8c2f719 100644
--- a/testcase/err_invalid_ifeq4.mk
+++ b/testcase/err_invalid_ifeq4.mk
@@ -1,3 +1,4 @@
-# TODO
+# TODO(go): Fix
+
ifeq
endif
diff --git a/testcase/escaped_wildcard.mk b/testcase/escaped_wildcard.mk
index ae7864e..8935f99 100644
--- a/testcase/escaped_wildcard.mk
+++ b/testcase/escaped_wildcard.mk
@@ -1,4 +1,4 @@
-# TODO: Fix
+# TODO(go): Fix
test1:
touch foo
diff --git a/testcase/multiline_arg.mk b/testcase/multiline_arg.mk
index 1e64318..508bbee 100644
--- a/testcase/multiline_arg.mk
+++ b/testcase/multiline_arg.mk
@@ -1,3 +1,6 @@
+
+# TODO(c): For non-bach environment, implement $(SHELL).
+
SHELL:=/bin/bash
define func
diff --git a/testcase/semi_in_var.mk b/testcase/semi_in_var.mk
index 5643fbb..9a83cf5 100644
--- a/testcase/semi_in_var.mk
+++ b/testcase/semi_in_var.mk
@@ -1,5 +1,5 @@
-# TODO: Not sure how this behavior can be explained. We probably will
-# not need to support bar and baz, but we probably need foo.
+# TODO(go): Not sure how this behavior can be explained. We probably
+# will not need to support bar and baz, but we probably need foo.
ECHO=@echo $@
SEMI=;
diff --git a/testcase/semicolon_in_var.mk b/testcase/semicolon_in_var.mk
index 7df4a23..5326579 100644
--- a/testcase/semicolon_in_var.mk
+++ b/testcase/semicolon_in_var.mk
@@ -1,4 +1,4 @@
-# TODO: Fix
+# TODO(go): Fix
test: foo bar baz bazz
A:=foo: ; echo PASS
diff --git a/testcase/shell_var.mk b/testcase/shell_var.mk
index 24f4f00..ef26937 100644
--- a/testcase/shell_var.mk
+++ b/testcase/shell_var.mk
@@ -1,3 +1,5 @@
+# TODO(c): Implement SHELL
+
$(info $(SHELL))
SHELL:=/bin/echo
diff --git a/testcase/target_specific_var_var_name.mk b/testcase/target_specific_var_var_name.mk
index 89618e2..bd346b9 100644
--- a/testcase/target_specific_var_var_name.mk
+++ b/testcase/target_specific_var_var_name.mk
@@ -1,4 +1,4 @@
-# TODO: Fix. We are evaluating LHS twice.
+# TODO(go): Fix. We are evaluating LHS twice.
FOO:=BAR
test: $$(FOO) := FAIL
diff --git a/testcase/vpath.mk b/testcase/vpath.mk
index 74ff03e..74c84df 100644
--- a/testcase/vpath.mk
+++ b/testcase/vpath.mk
@@ -1,5 +1,6 @@
-# TODO: Implement vpath and VPATH and test them. It seems Android
+# TODO(go): Implement vpath and VPATH and test them. It seems Android
# actually uses it...
+# TODO(c): Not sure if C++ version passes this test.
VPATH=dir