kill default.filter and switch everything to .expect or .expectf

hphp/test/test_code_run.cpp

@@ -13951,7 +13951,7 @@ bool TestCodeRun::TestReflectionClasses() {
       "var_dump($rf->isClosure()); "
       "var_dump($rf->isGenerator()); "
       ,
-      "test/vm/reflection_isclosure.php.exp"
+      "test/vm/reflection_isclosure.php.expect"
     );
   }
 

hphp/test/verify

@@ -361,11 +361,10 @@ sub run_test
         }
     }
     ($utime, $stime, $cutime, $cstime) = times;
-    my $default_filter = "$opt_srcdir/test/vm/default.filter";
     if (-e "$opt_srcdir/$test.filter") {
-        `$command 2>&1 | $default_filter | $opt_srcdir/$test.filter > $opt_objdir/$test.out`;
+        `$command 2>&1 | $opt_srcdir/$test.filter > $opt_objdir/$test.out`;
     } else {
-        `$command 2>&1 | $default_filter > $opt_objdir/$test.out`;
+        `$command > $opt_objdir/$test.out 2>&1`;
     }
     ($utime, $stime, $tutime, $tstime) = times;
 
@@ -416,6 +415,7 @@ sub run_test
     }
     elsif (!$opt_no_exp && -e "$opt_srcdir/$test.expect")
     {
+        $diff_args = "--text -u";
         `diff $diff_args $opt_srcdir/$test.expect $opt_objdir/$test.out > $opt_objdir/$test.diff 2>&1`;
         if ($?)
         {

hphp/test/vm/FPassC-2.php.exp

@@ -1,48 +0,0 @@
-HipHop Warning: File not found: doesnotexist.php in hphp/test/vm/FPassC-2.php on line 14
-bool(false)
-NULL
-object(stdClass)#1 (0) {
-}
-object(stdClass)#2 (0) {
-}
-object(stdClass)#1 (0) {
-}
-==============================
-HipHop Strict Warning: Only variables should be passed by reference in hphp/test/vm/FPassC-2.php on line 28
-NULL
-NULL
-HipHop Strict Warning: Only variables should be passed by reference in hphp/test/vm/FPassC-2.php on line 32
-string(3) "abc"
-string(3) "abc"
-HipHop Strict Warning: Only variables should be passed by reference in hphp/test/vm/FPassC-2.php on line 36
-int(0)
-int(0)
-HipHop Strict Warning: Only variables should be passed by reference in hphp/test/vm/FPassC-2.php on line 40
-int(1)
-int(1)
-HipHop Strict Warning: Only variables should be passed by reference in hphp/test/vm/FPassC-2.php on line 44
-NULL
-NULL
-==============================
-array(1) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-int(123)
-array(1) {
-  [0]=>
-  int(1)
-}
-==============================
-NULL
-int(123)
-int(123)
-==============================
-HipHop Fatal error: Cannot pass parameter 1 by reference in hphp/test/vm/FPassC-2.php on line 78

hphp/test/vm/FPassC-2.php.expectf

@@ -0,0 +1,48 @@
+HipHop Warning: File not found: doesnotexist.php in %s on line 14
+bool(false)
+NULL
+object(stdClass)#1 (0) {
+}
+object(stdClass)#2 (0) {
+}
+object(stdClass)#1 (0) {
+}
+==============================
+HipHop Strict Warning: Only variables should be passed by reference in %s on line 28
+NULL
+NULL
+HipHop Strict Warning: Only variables should be passed by reference in %s on line 32
+string(3) "abc"
+string(3) "abc"
+HipHop Strict Warning: Only variables should be passed by reference in %s on line 36
+int(0)
+int(0)
+HipHop Strict Warning: Only variables should be passed by reference in %s on line 40
+int(1)
+int(1)
+HipHop Strict Warning: Only variables should be passed by reference in %s on line 44
+NULL
+NULL
+==============================
+array(1) {
+  [0]=>
+  &array(1) {
+    [0]=>
+    int(1)
+  }
+}
+array(1) {
+  [0]=>
+  int(1)
+}
+int(123)
+array(1) {
+  [0]=>
+  int(1)
+}
+==============================
+NULL
+int(123)
+int(123)
+==============================
+HipHop Fatal error: Cannot pass parameter 1 by reference in %s on line 78

hphp/test/vm/FPassC.php.exp

@@ -1,2 +0,0 @@
-6
-HipHop Fatal error: Cannot pass parameter 1 by reference in hphp/test/vm/FPassC.php on line 9

hphp/test/vm/FPassC.php.expectf

@@ -0,0 +1,2 @@
+6
+HipHop Fatal error: Cannot pass parameter 1 by reference in %s on line 9

hphp/test/vm/FPushObjMethod.php.exp

@@ -1,95 +0,0 @@
-Test begin
-In C::__construct()
-In C::__construct()
-In C::sMeth(): $this::
-In D::D()
-In D::D()
-In E::__construct()
-In E::E()
-In E::__construct()
-In C::__construct()
-In C::__construct()
-In D::D()
-In D::D()
-In E::__construct()
-In E::E()
-In E::__construct()
-In I::__construct()
-In I::__construct()
-In J::J()
-In D::D()
-In J::J()
-In K::__construct()
-In E::E()
-In K::K()
-In K::__construct()
-In C::__construct()
-In C::__construct()
-In C::sMeth(): $this::
-In D::D()
-In D::D()
-In E::__construct()
-In E::E()
-In E::__construct()
-In C::__construct()
-In C::__construct()
-In D::D()
-In D::D()
-In E::__construct()
-In E::E()
-In E::__construct()
-In I::__construct()
-In I::__construct()
-In J::J()
-In D::D()
-In J::J()
-In K::__construct()
-In E::E()
-In K::K()
-In K::__construct()
-=== X ===
-In anon()
-  In X::fPublic()
-In W::fW()
-  In X::fPublic()
-In X::fX()
-  In X::fPrivateX()
-  In X::fPrivate()
-  In X::fProtected()
-  In X::fPublic()
-=== Y ===
-In anon()
-  In Y::fPublic()
-In W::fW()
-  In Y::fPublic()
-In X::fX()
-  In X::fPrivateX()
-  In X::fPrivate()
-  In Y::fProtected()
-  In Y::fPublic()
-In Y::fY()
-  In Y::fPrivateY()
-  In Y::fPrivate()
-  In Y::fProtected()
-  In Y::fPublic()
-=== Z ===
-In anon()
-  In Z::fPublic()
-In W::fW()
-  In Z::fPublic()
-In X::fX()
-  In X::fPrivateX()
-  In X::fPrivate()
-  In Z::fProtected()
-  In Z::fPublic()
-In Y::fY()
-  In Y::fPrivateY()
-  In Y::fPrivate()
-  In Z::fProtected()
-  In Z::fPublic()
-In Z::fZ()
-  In Z::fPrivateZ()
-  In Z::fPrivate()
-  In Z::fProtected()
-  In Z::fPublic()
-HipHop Fatal error: Function name must be a string in hphp/test/vm/FPushObjMethod.php on line 201

hphp/test/vm/FPushObjMethod.php.expectf

@@ -0,0 +1,95 @@
+Test begin
+In C::__construct()
+In C::__construct()
+In C::sMeth(): $this::
+In D::D()
+In D::D()
+In E::__construct()
+In E::E()
+In E::__construct()
+In C::__construct()
+In C::__construct()
+In D::D()
+In D::D()
+In E::__construct()
+In E::E()
+In E::__construct()
+In I::__construct()
+In I::__construct()
+In J::J()
+In D::D()
+In J::J()
+In K::__construct()
+In E::E()
+In K::K()
+In K::__construct()
+In C::__construct()
+In C::__construct()
+In C::sMeth(): $this::
+In D::D()
+In D::D()
+In E::__construct()
+In E::E()
+In E::__construct()
+In C::__construct()
+In C::__construct()
+In D::D()
+In D::D()
+In E::__construct()
+In E::E()
+In E::__construct()
+In I::__construct()
+In I::__construct()
+In J::J()
+In D::D()
+In J::J()
+In K::__construct()
+In E::E()
+In K::K()
+In K::__construct()
+=== X ===
+In anon()
+  In X::fPublic()
+In W::fW()
+  In X::fPublic()
+In X::fX()
+  In X::fPrivateX()
+  In X::fPrivate()
+  In X::fProtected()
+  In X::fPublic()
+=== Y ===
+In anon()
+  In Y::fPublic()
+In W::fW()
+  In Y::fPublic()
+In X::fX()
+  In X::fPrivateX()
+  In X::fPrivate()
+  In Y::fProtected()
+  In Y::fPublic()
+In Y::fY()
+  In Y::fPrivateY()
+  In Y::fPrivate()
+  In Y::fProtected()
+  In Y::fPublic()
+=== Z ===
+In anon()
+  In Z::fPublic()
+In W::fW()
+  In Z::fPublic()
+In X::fX()
+  In X::fPrivateX()
+  In X::fPrivate()
+  In Z::fProtected()
+  In Z::fPublic()
+In Y::fY()
+  In Y::fPrivateY()
+  In Y::fPrivate()
+  In Z::fProtected()
+  In Z::fPublic()
+In Z::fZ()
+  In Z::fPrivateZ()
+  In Z::fPrivate()
+  In Z::fProtected()
+  In Z::fPublic()
+HipHop Fatal error: Function name must be a string in %s on line 201

hphp/test/vm/IncDecProp.php.exp

@@ -1,141 +0,0 @@
-Test begin
---- C ---
-int(1)
-int(-1)
-int(0)
-int(0)
-int(1)
-NULL
-NULL
-NULL
-C Object
-(
-    [preInc] => 1
-    [preDec] => -1
-    [postInc] => 1
-    [postDec] => -1
-    [p] => 1
-    [q] => 
-    [r] => 1
-    [s] => 
-)
---- D ---
-In D::__get(a)
-string(4) "D::b"
-In D::__get(b)
-int(43)
-int(1)
-int(-1)
-int(0)
-int(0)
-In D::__get(l)
-int(1)
-In D::__get(m)
-int(-1)
-In D::__get(n)
-int(0)
-In D::__get(o)
-int(0)
-In D::__get(p)
-int(1)
-In D::__get(q)
-NULL
-In D::__get(r)
-NULL
-In D::__get(s)
-NULL
-D Object
-(
-    [container:D:private] => Array
-        (
-            [a] => D::a
-            [b] => 42
-            [l] => 0
-            [m] => 0
-            [n] => 0
-            [o] => 0
-        )
-
-    [preInc] => 1
-    [preDec] => -1
-    [postInc] => 1
-    [postDec] => -1
-    [a] => D::b
-    [b] => 43
-    [l] => 1
-    [m] => -1
-    [n] => 1
-    [o] => -1
-    [p] => 1
-    [q] => 
-    [r] => 1
-    [s] => 
-)
---- E ---
-int(1)
-int(-1)
-int(0)
-int(0)
-In E::__get(l)
-In E::__set(l, 1)
-int(1)
-In E::__get(m)
-In E::__set(m, -1)
-int(-1)
-In E::__get(n)
-In E::__set(n, 1)
-int(0)
-In E::__get(o)
-In E::__set(o, -1)
-int(0)
-In E::__get(p)
-In E::__set(p, 1)
-int(1)
-In E::__get(q)
-In E::__set(q, )
-NULL
-In E::__get(r)
-In E::__set(r, 1)
-NULL
-In E::__get(s)
-In E::__set(s, )
-NULL
-E Object
-(
-    [container:E:private] => Array
-        (
-            [a] => E::a
-            [b] => 42
-            [l] => 1
-            [m] => -1
-            [n] => 1
-            [o] => -1
-            [p] => 1
-            [q] => 
-            [r] => 1
-            [s] => 
-        )
-
-    [preInc] => 1
-    [preDec] => -1
-    [postInc] => 1
-    [postDec] => -1
-)
---- null ---
-HipHop Warning: Creating default object from empty value in hphp/test/vm/IncDecProp.php on line 98
-int(1)
-NULL
-NULL
-NULL
-stdClass Object
-(
-    [preInc] => 1
-    [preDec] => 
-    [postInc] => 1
-    [postDec] => 
-)
---- 42 ---
-HipHop Warning: Attempt to increment/decrement property of non-object in hphp/test/vm/IncDecProp.php on line 106
-NULL
-42
-Test end

hphp/test/vm/IncDecProp.php.expectf

@@ -0,0 +1,141 @@
+Test begin
+--- C ---
+int(1)
+int(-1)
+int(0)
+int(0)
+int(1)
+NULL
+NULL
+NULL
+C Object
+(
+    [preInc] => 1
+    [preDec] => -1
+    [postInc] => 1
+    [postDec] => -1
+    [p] => 1
+    [q] => 
+    [r] => 1
+    [s] => 
+)
+--- D ---
+In D::__get(a)
+string(4) "D::b"
+In D::__get(b)
+int(43)
+int(1)
+int(-1)
+int(0)
+int(0)
+In D::__get(l)
+int(1)
+In D::__get(m)
+int(-1)
+In D::__get(n)
+int(0)
+In D::__get(o)
+int(0)
+In D::__get(p)
+int(1)
+In D::__get(q)
+NULL
+In D::__get(r)
+NULL
+In D::__get(s)
+NULL
+D Object
+(
+    [container:D:private] => Array
+        (
+            [a] => D::a
+            [b] => 42
+            [l] => 0
+            [m] => 0
+            [n] => 0
+            [o] => 0
+        )
+
+    [preInc] => 1
+    [preDec] => -1
+    [postInc] => 1
+    [postDec] => -1
+    [a] => D::b
+    [b] => 43
+    [l] => 1
+    [m] => -1
+    [n] => 1
+    [o] => -1
+    [p] => 1
+    [q] => 
+    [r] => 1
+    [s] => 
+)
+--- E ---
+int(1)
+int(-1)
+int(0)
+int(0)
+In E::__get(l)
+In E::__set(l, 1)
+int(1)
+In E::__get(m)
+In E::__set(m, -1)
+int(-1)
+In E::__get(n)
+In E::__set(n, 1)
+int(0)
+In E::__get(o)
+In E::__set(o, -1)
+int(0)
+In E::__get(p)
+In E::__set(p, 1)
+int(1)
+In E::__get(q)
+In E::__set(q, )
+NULL
+In E::__get(r)
+In E::__set(r, 1)
+NULL
+In E::__get(s)
+In E::__set(s, )
+NULL
+E Object
+(
+    [container:E:private] => Array
+        (
+            [a] => E::a
+            [b] => 42
+            [l] => 1
+            [m] => -1
+            [n] => 1
+            [o] => -1
+            [p] => 1
+            [q] => 
+            [r] => 1
+            [s] => 
+        )
+
+    [preInc] => 1
+    [preDec] => -1
+    [postInc] => 1
+    [postDec] => -1
+)
+--- null ---
+HipHop Warning: Creating default object from empty value in %s on line 98
+int(1)
+NULL
+NULL
+NULL
+stdClass Object
+(
+    [preInc] => 1
+    [preDec] => 
+    [postInc] => 1
+    [postDec] => 
+)
+--- 42 ---
+HipHop Warning: Attempt to increment/decrement property of non-object in %s on line 106
+NULL
+42
+Test end

hphp/test/vm/SetM.php.exp

@@ -1,27 +0,0 @@
-array(1) {
-  ["a"]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [2]=>
-      int(3)
-    }
-  }
-}
-HipHop Warning: Cannot use a scalar value as an array in hphp/test/vm/SetM.php on line 7
-int(4)
-HipHop Warning: Cannot use a scalar value as an array in hphp/test/vm/SetM.php on line 11
-array(1) {
-  [0]=>
-  bool(true)
-}
-array(1) {
-  [0]=>
-  string(1) "x"
-}
-HipHop Warning: Illegal string offset: -1 in hphp/test/vm/SetM.php on line 19
-string(7) "abc e g"
-int(1)
-int(1)
-HipHop Warning: Cannot use a scalar value as an array in hphp/test/vm/SetM.php on line 26
-NULL

hphp/test/vm/SetM.php.expectf

@@ -0,0 +1,27 @@
+array(1) {
+  ["a"]=>
+  array(1) {
+    [0]=>
+    array(1) {
+      [2]=>
+      int(3)
+    }
+  }
+}
+HipHop Warning: Cannot use a scalar value as an array in %s on line 7
+int(4)
+HipHop Warning: Cannot use a scalar value as an array in %s on line 11
+array(1) {
+  [0]=>
+  bool(true)
+}
+array(1) {
+  [0]=>
+  string(1) "x"
+}
+HipHop Warning: Illegal string offset: -1 in %s on line 19
+string(7) "abc e g"
+int(1)
+int(1)
+HipHop Warning: Cannot use a scalar value as an array in %s on line 26
+NULL

hphp/test/vm/SetOpProp.php.exp

@@ -1,62 +0,0 @@
-Test begin
-C Object
-(
-    [p] => 1
-    [a] => <a>
-    [b] => <b><b>
-    [q] => 1
-    [r] => hello
-)
-In D::__get(a)
-In D::__get(b)
-In D::__get(q)
-In D::__get(r)
-D Object
-(
-    [container:D:private] => Array
-        (
-            [a] => D::a
-            [b] => 42
-        )
-
-    [p] => 1
-    [a] => D::a<a>
-    [b] => 42<b><b>
-    [q] => 1
-    [r] => hello
-)
-In E::__get(a)
-In E::__set(a, E::a<a>)
-In E::__get(b)
-In E::__set(b, 42<b>)
-In E::__get(b)
-In E::__set(b, 42<b><b>)
-In E::__get(q)
-In E::__set(q, 1)
-In E::__get(r)
-In E::__set(r, hello)
-E Object
-(
-    [container:E:private] => Array
-        (
-            [a] => E::a<a>
-            [b] => 42<b><b>
-            [q] => 1
-            [r] => hello
-        )
-
-    [p] => 1
-)
-HipHop Warning: Creating default object from empty value in hphp/test/vm/SetOpProp.php on line 59
-stdClass Object
-(
-    [a] => <a>
-    [b] => <b><b>
-    [p] => 1
-    [q] => 1
-    [r] => hello
-)
-HipHop Warning: Attempt to assign property of non-object in hphp/test/vm/SetOpProp.php on line 68
-HipHop Warning: Attempt to assign property of non-object in hphp/test/vm/SetOpProp.php on line 69
-42
-Test end

hphp/test/vm/SetOpProp.php.expectf

@@ -0,0 +1,62 @@
+Test begin
+C Object
+(
+    [p] => 1
+    [a] => <a>
+    [b] => <b><b>
+    [q] => 1
+    [r] => hello
+)
+In D::__get(a)
+In D::__get(b)
+In D::__get(q)
+In D::__get(r)
+D Object
+(
+    [container:D:private] => Array
+        (
+            [a] => D::a
+            [b] => 42
+        )
+
+    [p] => 1
+    [a] => D::a<a>
+    [b] => 42<b><b>
+    [q] => 1
+    [r] => hello
+)
+In E::__get(a)
+In E::__set(a, E::a<a>)
+In E::__get(b)
+In E::__set(b, 42<b>)
+In E::__get(b)
+In E::__set(b, 42<b><b>)
+In E::__get(q)
+In E::__set(q, 1)
+In E::__get(r)
+In E::__set(r, hello)
+E Object
+(
+    [container:E:private] => Array
+        (
+            [a] => E::a<a>
+            [b] => 42<b><b>
+            [q] => 1
+            [r] => hello
+        )
+
+    [p] => 1
+)
+HipHop Warning: Creating default object from empty value in %s on line 59
+stdClass Object
+(
+    [a] => <a>
+    [b] => <b><b>
+    [p] => 1
+    [q] => 1
+    [r] => hello
+)
+HipHop Warning: Attempt to assign property of non-object in %s on line 68
+HipHop Warning: Attempt to assign property of non-object in %s on line 69
+42
+Test end

hphp/test/vm/Setprofile.php.expectf

@@ -200,7 +200,7 @@ array(3) {
         [0]=>
         array(6) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(42)
           ["function"]=>
@@ -216,7 +216,7 @@ array(3) {
         [1]=>
         array(6) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(16)
           ["function"]=>
@@ -232,7 +232,7 @@ array(3) {
         [2]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(37)
           ["function"]=>
@@ -244,7 +244,7 @@ array(3) {
         [3]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(45)
           ["function"]=>
@@ -327,7 +327,7 @@ array(3) {
         [0]=>
         array(6) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(16)
           ["function"]=>
@@ -343,7 +343,7 @@ array(3) {
         [1]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(37)
           ["function"]=>
@@ -355,7 +355,7 @@ array(3) {
         [2]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(45)
           ["function"]=>
@@ -487,7 +487,7 @@ array(3) {
       ["previous":protected]=>
       NULL
       ["file":protected]=>
-       "%s"
+      string(%d) "%s"
       ["line":protected]=>
       int(16)
       ["trace":protected]=>
@@ -495,7 +495,7 @@ array(3) {
         [0]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(37)
           ["function"]=>
@@ -507,7 +507,7 @@ array(3) {
         [1]=>
         array(4) {
           ["file"]=>
-           "%s"
+          string(%d) "%s"
           ["line"]=>
           int(45)
           ["function"]=>

hphp/test/vm/UnsetProp.php.exp

@@ -1,33 +0,0 @@
-Test begin
-object(F)#1 (2) {
-  ["foo"]=>
-  int(12)
-  ["bart"]=>
-  string(5) "snoot"
-}
-int(12)
-HipHop Notice: Undefined property: F::$foo in hphp/test/vm/UnsetProp.php on line 10
-NULL
-string(5) "snoot"
-HipHop Notice: Undefined property: F::$bart in hphp/test/vm/UnsetProp.php on line 10
-NULL
-object(F)#1 (0) {
-}
-object(C)#2 (2) {
-  ["p"]=>
-  string(4) "C::p"
-  ["q"]=>
-  NULL
-}
-In C::__unset("r")
-object(C)#2 (0) {
-}
-------------------------
-foo
-------------------------
-foo
-Test end
-string(4) "set1"
-HipHop Notice: Undefined property: c2::$declprop in hphp/test/vm/UnsetProp.php on line 68
-NULL
-string(4) "set2"

hphp/test/vm/UnsetProp.php.expectf

@@ -0,0 +1,33 @@
+Test begin
+object(F)#1 (2) {
+  ["foo"]=>
+  int(12)
+  ["bart"]=>
+  string(5) "snoot"
+}
+int(12)
+HipHop Notice: Undefined property: F::$foo in %s on line 10
+NULL
+string(5) "snoot"
+HipHop Notice: Undefined property: F::$bart in %s on line 10
+NULL
+object(F)#1 (0) {
+}
+object(C)#2 (2) {
+  ["p"]=>
+  string(4) "C::p"
+  ["q"]=>
+  NULL
+}
+In C::__unset("r")
+object(C)#2 (0) {
+}
+------------------------
+foo
+------------------------
+foo
+Test end
+string(4) "set1"
+HipHop Notice: Undefined property: c2::$declprop in %s on line 68
+NULL
+string(4) "set2"

hphp/test/vm/Xhp.php.exp

@@ -1 +0,0 @@
-HipHop Fatal error: XHP: mismatched tag: 'ul' not the same as 'li' in hphp/test/vm/Xhp.php on line 3

hphp/test/vm/Xhp.php.expectf

@@ -0,0 +1 @@
+HipHop Fatal error: XHP: mismatched tag: 'ul' not the same as 'li' in %s on line 3

hphp/test/vm/abstract_static_1.php.exp

@@ -1 +0,0 @@
-HipHop Fatal error: Cannot call abstract method Foo::who() in hphp/test/vm/abstract_static_1.php on line 8

hphp/test/vm/abstract_static_1.php.expectf

@@ -0,0 +1 @@
+HipHop Fatal error: Cannot call abstract method Foo::who() in %s on line 8

hphp/test/vm/abstract_static_2.php.exp

@@ -1 +0,0 @@
-HipHop Fatal error: Cannot call abstract method Foo::who() in hphp/test/vm/abstract_static_2.php on line 5

hphp/test/vm/abstract_static_2.php.expectf

@@ -0,0 +1 @@
+HipHop Fatal error: Cannot call abstract method Foo::who() in %s on line 5