Properly handle Skip in sub-test

datadriven.go

@@ -121,14 +121,13 @@ func runTestInternal(
 			d := &r.data
 			actual := func() string {
 				defer func() {
+					if t.Skipped() {
+						// The skip status does not propagate to the parent test
+						// automatically. If we want to catch the skip outside
+						// of the sub-test below, we need to remember it here.
+						subTestSkipped = true
+					}
 					if r := recover(); r != nil {
-						if t.Skipped() {
-							// The skip status does not propagate to the parent test
-							// automatically. If we want to catch the skip outside
-							// of the sub-test below, we need to remember it here.
-							subTestSkipped = true
-						}
-
 						fmt.Printf("\npanic during %s:\n%s\n", d.Pos, d.Input)
 						panic(r)
 					}

datadriven_test.go

@@ -73,12 +73,22 @@ xx a=b b=c c=(1,2,3)
 
 func TestSubTestSkip(t *testing.T) {
 	RunTestFromString(t, `
+skip
+----
+
+# This error should never happen.
 error
 ----
 `, func(t *testing.T, d *TestData) string {
-		// Verify that calling t.Skip() does not fail with an API error on
-		// testing.T.
-		t.Skip("woo")
+		switch d.Cmd {
+		case "skip":
+			// Verify that calling t.Skip() does not fail with an API error on
+			// testing.T.
+			t.Skip("woo")
+		case "error":
+			// The skip should mask the error afterwards.
+			t.Error("never reached")
+		}
 		return d.Expected
 	})
 }