Strengthen filepath.filter and make it run for all tests

It now handles filenames in strings that have been
var_dumped, without having to special case them. I also renamed it to
default.filter and changed verify to run it on every test. This lets us
remove a lot of symlinks that used to point to filepath.filter and
changed the expected output for a bunch of tests.

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

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/^\(object([^)]\+)\)#[0-9]\+/\1/g'
+sed -e 's/^\(object([^)]\+)\)#[0-9]\+/\1/g'

hphp/test/vm/FPassC.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/FPushClsMethod.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/FPushObjMethod.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/GetElem.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/IncDecProp.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/ $/ <-- trailing whitespace/g'
+sed -e 's/ $/ <-- trailing whitespace/g'

hphp/test/vm/SetM.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/SetOpH.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/SetOpM.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/SetOpProp.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/UnsetProp.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/^\(object([^)]\+)\)#[0-9]\+/\1/g'
+sed -e 's/^\(object([^)]\+)\)#[0-9]\+/\1/g'

hphp/test/vm/Xhp.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/abstract_static_1.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/abstract_static_2.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/array_access.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/call11.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/call12.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/call13.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cgetm_ge.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cgetm_hee.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cgetm_ne.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/class_constant_array.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/class_constants.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/closure.php.filter

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-./test/vm/filepath.filter | ./test/vm/closure.filter
+./test/vm/closure.filter

hphp/test/vm/closure_recursive_bad.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/closure_static.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsconstant_redecl1.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsconstant_redecl2.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsconstant_redecl3.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsmethod-ctx.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsmethod-trait.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/clsmethodf.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cnvDbl.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cnvInt.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cnvStr.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/constants.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/continuation_inherit.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/coverage.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf-call10.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf-call11.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf03.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf04.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf05.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf__callStatic1.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf__callStatic4.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/cuf__callStatic5.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/debug_backtrace.php.exp

@@ -2,7 +2,7 @@ array(5) {
   [0]=>
   array(6) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(9)
     ["function"]=>
@@ -18,7 +18,7 @@ array(5) {
   [1]=>
   array(7) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(15)
     ["function"]=>
@@ -50,7 +50,7 @@ array(5) {
   [2]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(20)
     ["function"]=>
@@ -62,7 +62,7 @@ array(5) {
   [3]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(29)
     ["function"]=>
@@ -74,7 +74,7 @@ array(5) {
   [4]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(34)
     ["function"]=>
@@ -88,7 +88,7 @@ array(5) {
   [0]=>
   array(6) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(9)
     ["function"]=>
@@ -123,7 +123,7 @@ array(5) {
   [2]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(20)
     ["function"]=>
@@ -135,7 +135,7 @@ array(5) {
   [3]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(29)
     ["function"]=>
@@ -147,7 +147,7 @@ array(5) {
   [4]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(34)
     ["function"]=>
@@ -161,7 +161,7 @@ array(2) {
   [0]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(32)
     ["function"]=>
@@ -173,7 +173,7 @@ array(2) {
       [1]=>
       string(63) "Use of undefined constant FakeConstant - assumed 'FakeConstant'"
       [2]=>
-      string() "hphp/test/vm/debug_backtrace.php"
+       "hphp/test/vm/debug_backtrace.php"
       [3]=>
       int(32)
       [4]=>
@@ -183,14 +183,14 @@ array(2) {
         [0]=>
         array(2) {
           ["file"]=>
-          string() "hphp/test/vm/debug_backtrace.php"
+           "hphp/test/vm/debug_backtrace.php"
           ["line"]=>
           int(32)
         }
         [1]=>
         array(4) {
           ["file"]=>
-          string() "hphp/test/vm/debug_backtrace.php"
+           "hphp/test/vm/debug_backtrace.php"
           ["line"]=>
           int(34)
           ["function"]=>
@@ -205,7 +205,7 @@ array(2) {
   [1]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace.php"
+     "hphp/test/vm/debug_backtrace.php"
     ["line"]=>
     int(34)
     ["function"]=>

hphp/test/vm/debug_backtrace_continuation.php.exp

@@ -17,7 +17,7 @@ array(3) {
   [1]=>
   array(7) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace_continuation.php"
+     "hphp/test/vm/debug_backtrace_continuation.php"
     ["line"]=>
     int(10)
     ["function"]=>
@@ -38,7 +38,7 @@ array(3) {
   [2]=>
   array(4) {
     ["file"]=>
-    string() "hphp/test/vm/debug_backtrace_continuation.php"
+     "hphp/test/vm/debug_backtrace_continuation.php"
     ["line"]=>
     int(13)
     ["function"]=>

hphp/test/vm/debug_backtrace_continuation.php.filter

@@ -1,2 +0,0 @@
-#!/bin/bash
-sed -e 's/string(.*) ".*\/hphp/string() "hphp/g'

hphp/test/vm/def_cls_line.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/default.filter

@@ -0,0 +1,2 @@
+#!/bin/bash
+sed -r -e 's,(string\([0-9]+\))? ("?)[^ ]*(hphp/[^ "(]*), \2\3,g'

hphp/test/vm/define.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/destructed_this.php.exp

@@ -2,7 +2,7 @@ array(3) {
   [0]=>
   array(7) {
     ["file"]=>
-
+     "hphp/test/vm/destructed_this.php"
     ["line"]=>
     int(8)
     ["function"]=>
@@ -21,7 +21,7 @@ array(3) {
   [1]=>
   array(6) {
     ["file"]=>
-
+     "hphp/test/vm/destructed_this.php"
     ["line"]=>
     int(18)
     ["function"]=>
@@ -37,7 +37,7 @@ array(3) {
   [2]=>
   array(4) {
     ["file"]=>
-
+     "hphp/test/vm/destructed_this.php"
     ["line"]=>
     int(20)
     ["function"]=>

hphp/test/vm/dv_ab.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_af.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ai.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_as.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ba.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_bf.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_bi.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_bs.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ca.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ci.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_i0.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ia.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_ib.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_if.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_is.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_si.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/dv_si_func.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/enormous-string.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/exception_handler.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's,\\n,\n,g'
+sed -e 's,\\n,\n,g'

hphp/test/vm/exceptions.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g' | sed -e 's/string([0-9]*)/string/g'
+sed -e 's/\\n/\n/g' | sed -e 's/string([0-9]*)/string/g'

hphp/test/vm/exceptions2.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g' | sort | uniq
+sed -e 's/\\n/\n/g' | sort | uniq

hphp/test/vm/exceptions3.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g' | sort | uniq
+sed -e 's/\\n/\n/g' | sort | uniq

hphp/test/vm/exceptions4.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g'
+sed -e 's/\\n/\n/g'

hphp/test/vm/exceptions5.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g' -e '/Destructor raised a fatal error/d' -e 's/\(.*\)line.*/\1/g' | sort -fu
+sed -e 's/\\n/\n/g' -e '/Destructor raised a fatal error/d' -e 's/\(.*\)line.*/\1/g' | sort -fu

hphp/test/vm/exceptions6.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g' -e '/Destructor raised a fatal error/d' -e 's/\(.*\)line.*/\1/g' | sort -fu
+sed -e 's/\\n/\n/g' -e '/Destructor raised a fatal error/d' -e 's/\(.*\)line.*/\1/g' | sort -fu

hphp/test/vm/fail_86pinit.php.exp

@@ -3,30 +3,30 @@ array(6) {
   [0]=>
   int(16777217)
   [1]=>
-  string() "Class undefined: Y"
+  string(18) "Class undefined: Y"
   [2]=>
-  string() hphp/test/vm/fail_86pinit.php"
+   "hphp/test/vm/fail_86pinit.php"
   [3]=>
   int(5)
   [4]=>
-  string() ""
+  string(0) ""
   [5]=>
   array(2) {
     [0]=>
     array(2) {
       ["file"]=>
-      string() hphp/test/vm/fail_86pinit.php"
+       "hphp/test/vm/fail_86pinit.php"
       ["line"]=>
       int(5)
     }
     [1]=>
     array(4) {
       ["file"]=>
-      string() hphp/test/vm/fail_86pinit.php"
+       "hphp/test/vm/fail_86pinit.php"
       ["line"]=>
       int(10)
       ["function"]=>
-      string() "test"
+      string(4) "test"
       ["args"]=>
       array(0) {
       }

hphp/test/vm/fail_86pinit.php.filter

@@ -1,2 +0,0 @@
-#!/bin/bash
-./test/vm/filepath.filter | sed -e 's%string([0-9]\+)%string()%'

hphp/test/vm/fail_86sinit.php.exp

@@ -3,30 +3,30 @@ array(6) {
   [0]=>
   int(16777217)
   [1]=>
-  string() "Class undefined: Z"
+  string(18) "Class undefined: Z"
   [2]=>
-  string() hphp/test/vm/fail_86sinit.php"
+   "hphp/test/vm/fail_86sinit.php"
   [3]=>
   int(5)
   [4]=>
-  string() ""
+  string(0) ""
   [5]=>
   array(2) {
     [0]=>
     array(2) {
       ["file"]=>
-      string() hphp/test/vm/fail_86sinit.php"
+       "hphp/test/vm/fail_86sinit.php"
       ["line"]=>
       int(5)
     }
     [1]=>
     array(4) {
       ["file"]=>
-      string() hphp/test/vm/fail_86sinit.php"
+       "hphp/test/vm/fail_86sinit.php"
       ["line"]=>
       int(10)
       ["function"]=>
-      string() "test"
+      string(4) "test"
       ["args"]=>
       array(0) {
       }

hphp/test/vm/fail_86sinit.php.filter

@@ -1,2 +0,0 @@
-#!/bin/bash
-./test/vm/filepath.filter | sed -e 's%string([0-9]\+)%string()%'

hphp/test/vm/fatality.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/fbcufa.php.filter

@@ -1,2 +1,2 @@
 #!/bin/bash
-./test/vm/filepath.filter | sed -e 's/\\n/\n/g'
+sed -e 's/\\n/\n/g'

hphp/test/vm/filepath.filter

@@ -1,2 +0,0 @@
-#!/bin/bash
-sed -e 's, [^ ]*\(hphp/[^ (]*\), \1,g'

hphp/test/vm/final_class.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/final_method.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/final_method1.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/final_method2.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/final_method3.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/final_method4.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/fsc.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/func2.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/func3.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/get_class.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/hopt-exitslow.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/hopt-string-simp.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/hopt_preparable.php.filter

@@ -1 +0,0 @@
-filepath.filter

hphp/test/vm/hopt_sprop_accessibility.php.filter

@@ -1 +0,0 @@
-filepath.filter