diff --git a/hphp/test/vm/BindM.php b/hphp/test/quick/BindM.php
similarity index 100%
rename from hphp/test/vm/BindM.php
rename to hphp/test/quick/BindM.php
diff --git a/hphp/test/vm/BindM.php.expect b/hphp/test/quick/BindM.php.expect
similarity index 100%
rename from hphp/test/vm/BindM.php.expect
rename to hphp/test/quick/BindM.php.expect
diff --git a/hphp/test/vm/BindS.php b/hphp/test/quick/BindS.php
similarity index 100%
rename from hphp/test/vm/BindS.php
rename to hphp/test/quick/BindS.php
diff --git a/hphp/test/vm/BindS.php.expect b/hphp/test/quick/BindS.php.expect
similarity index 100%
rename from hphp/test/vm/BindS.php.expect
rename to hphp/test/quick/BindS.php.expect
diff --git a/hphp/test/vm/BindS_ref.php b/hphp/test/quick/BindS_ref.php
similarity index 100%
rename from hphp/test/vm/BindS_ref.php
rename to hphp/test/quick/BindS_ref.php
diff --git a/hphp/test/vm/BindS_ref.php.expect b/hphp/test/quick/BindS_ref.php.expect
similarity index 100%
rename from hphp/test/vm/BindS_ref.php.expect
rename to hphp/test/quick/BindS_ref.php.expect
diff --git a/hphp/test/vm/CGetG.php b/hphp/test/quick/CGetG.php
similarity index 100%
rename from hphp/test/vm/CGetG.php
rename to hphp/test/quick/CGetG.php
diff --git a/hphp/test/vm/CGetG.php.expect b/hphp/test/quick/CGetG.php.expect
similarity index 100%
rename from hphp/test/vm/CGetG.php.expect
rename to hphp/test/quick/CGetG.php.expect
diff --git a/hphp/test/vm/CGetMVar.php b/hphp/test/quick/CGetMVar.php
similarity index 100%
rename from hphp/test/vm/CGetMVar.php
rename to hphp/test/quick/CGetMVar.php
diff --git a/hphp/test/vm/CGetMVar.php.expect b/hphp/test/quick/CGetMVar.php.expect
similarity index 100%
rename from hphp/test/vm/CGetMVar.php.expect
rename to hphp/test/quick/CGetMVar.php.expect
diff --git a/hphp/test/vm/Cls.php b/hphp/test/quick/Cls.php
similarity index 100%
rename from hphp/test/vm/Cls.php
rename to hphp/test/quick/Cls.php
diff --git a/hphp/test/vm/Cls.php.expect b/hphp/test/quick/Cls.php.expect
similarity index 100%
rename from hphp/test/vm/Cls.php.expect
rename to hphp/test/quick/Cls.php.expect
diff --git a/hphp/test/vm/ClsCases.php b/hphp/test/quick/ClsCases.php
similarity index 100%
rename from hphp/test/vm/ClsCases.php
rename to hphp/test/quick/ClsCases.php
diff --git a/hphp/test/vm/ClsCases.php.expect b/hphp/test/quick/ClsCases.php.expect
similarity index 100%
rename from hphp/test/vm/ClsCases.php.expect
rename to hphp/test/quick/ClsCases.php.expect
diff --git a/hphp/test/vm/ClsCns.php b/hphp/test/quick/ClsCns.php
similarity index 100%
rename from hphp/test/vm/ClsCns.php
rename to hphp/test/quick/ClsCns.php
diff --git a/hphp/test/vm/ClsCns.php.expect b/hphp/test/quick/ClsCns.php.expect
similarity index 100%
rename from hphp/test/vm/ClsCns.php.expect
rename to hphp/test/quick/ClsCns.php.expect
diff --git a/hphp/test/vm/DefFunc.php b/hphp/test/quick/DefFunc.php
similarity index 100%
rename from hphp/test/vm/DefFunc.php
rename to hphp/test/quick/DefFunc.php
diff --git a/hphp/test/vm/DefFunc.php.expect b/hphp/test/quick/DefFunc.php.expect
similarity index 100%
rename from hphp/test/vm/DefFunc.php.expect
rename to hphp/test/quick/DefFunc.php.expect
diff --git a/hphp/test/vm/EmitOO.php b/hphp/test/quick/EmitOO.php
similarity index 100%
rename from hphp/test/vm/EmitOO.php
rename to hphp/test/quick/EmitOO.php
diff --git a/hphp/test/vm/EmitOO.php.expect b/hphp/test/quick/EmitOO.php.expect
similarity index 100%
rename from hphp/test/vm/EmitOO.php.expect
rename to hphp/test/quick/EmitOO.php.expect
diff --git a/hphp/test/vm/EmitSProp.php b/hphp/test/quick/EmitSProp.php
similarity index 100%
rename from hphp/test/vm/EmitSProp.php
rename to hphp/test/quick/EmitSProp.php
diff --git a/hphp/test/tcr/array/194.php.expect b/hphp/test/quick/EmitSProp.php.expect
similarity index 100%
rename from hphp/test/tcr/array/194.php.expect
rename to hphp/test/quick/EmitSProp.php.expect
diff --git a/hphp/test/vm/Empty.php b/hphp/test/quick/Empty.php
similarity index 100%
rename from hphp/test/vm/Empty.php
rename to hphp/test/quick/Empty.php
diff --git a/hphp/test/vm/Empty.php.expect b/hphp/test/quick/Empty.php.expect
similarity index 100%
rename from hphp/test/vm/Empty.php.expect
rename to hphp/test/quick/Empty.php.expect
diff --git a/hphp/test/vm/EmptyElem.php b/hphp/test/quick/EmptyElem.php
similarity index 100%
rename from hphp/test/vm/EmptyElem.php
rename to hphp/test/quick/EmptyElem.php
diff --git a/hphp/test/vm/EmptyElem.php.expect b/hphp/test/quick/EmptyElem.php.expect
similarity index 100%
rename from hphp/test/vm/EmptyElem.php.expect
rename to hphp/test/quick/EmptyElem.php.expect
diff --git a/hphp/test/vm/FPassC-2.php b/hphp/test/quick/FPassC-2.php
similarity index 100%
rename from hphp/test/vm/FPassC-2.php
rename to hphp/test/quick/FPassC-2.php
diff --git a/hphp/test/vm/FPassC-2.php.expectf b/hphp/test/quick/FPassC-2.php.expectf
similarity index 100%
rename from hphp/test/vm/FPassC-2.php.expectf
rename to hphp/test/quick/FPassC-2.php.expectf
diff --git a/hphp/test/vm/FPassC.php b/hphp/test/quick/FPassC.php
similarity index 100%
rename from hphp/test/vm/FPassC.php
rename to hphp/test/quick/FPassC.php
diff --git a/hphp/test/vm/FPassC.php.expectf b/hphp/test/quick/FPassC.php.expectf
similarity index 100%
rename from hphp/test/vm/FPassC.php.expectf
rename to hphp/test/quick/FPassC.php.expectf
diff --git a/hphp/test/vm/FPassM.php b/hphp/test/quick/FPassM.php
similarity index 100%
rename from hphp/test/vm/FPassM.php
rename to hphp/test/quick/FPassM.php
diff --git a/hphp/test/vm/FPassM.php.expect b/hphp/test/quick/FPassM.php.expect
similarity index 100%
rename from hphp/test/vm/FPassM.php.expect
rename to hphp/test/quick/FPassM.php.expect
diff --git a/hphp/test/vm/FPassR.php b/hphp/test/quick/FPassR.php
similarity index 100%
rename from hphp/test/vm/FPassR.php
rename to hphp/test/quick/FPassR.php
diff --git a/hphp/test/vm/FPassR.php.expect b/hphp/test/quick/FPassR.php.expect
similarity index 100%
rename from hphp/test/vm/FPassR.php.expect
rename to hphp/test/quick/FPassR.php.expect
diff --git a/hphp/test/vm/FPassS.php b/hphp/test/quick/FPassS.php
similarity index 100%
rename from hphp/test/vm/FPassS.php
rename to hphp/test/quick/FPassS.php
diff --git a/hphp/test/vm/FPassS.php.expect b/hphp/test/quick/FPassS.php.expect
similarity index 100%
rename from hphp/test/vm/FPassS.php.expect
rename to hphp/test/quick/FPassS.php.expect
diff --git a/hphp/test/vm/FPushClsMethod.php b/hphp/test/quick/FPushClsMethod.php
similarity index 100%
rename from hphp/test/vm/FPushClsMethod.php
rename to hphp/test/quick/FPushClsMethod.php
diff --git a/hphp/test/vm/FPushClsMethod.php.expect b/hphp/test/quick/FPushClsMethod.php.expect
similarity index 100%
rename from hphp/test/vm/FPushClsMethod.php.expect
rename to hphp/test/quick/FPushClsMethod.php.expect
diff --git a/hphp/test/vm/FPushClsMethodF.php b/hphp/test/quick/FPushClsMethodF.php
similarity index 100%
rename from hphp/test/vm/FPushClsMethodF.php
rename to hphp/test/quick/FPushClsMethodF.php
diff --git a/hphp/test/vm/FPushClsMethodF.php.expect b/hphp/test/quick/FPushClsMethodF.php.expect
similarity index 100%
rename from hphp/test/vm/FPushClsMethodF.php.expect
rename to hphp/test/quick/FPushClsMethodF.php.expect
diff --git a/hphp/test/vm/FPushCtor.php b/hphp/test/quick/FPushCtor.php
similarity index 100%
rename from hphp/test/vm/FPushCtor.php
rename to hphp/test/quick/FPushCtor.php
diff --git a/hphp/test/vm/FPushCtor.php.expect b/hphp/test/quick/FPushCtor.php.expect
similarity index 100%
rename from hphp/test/vm/FPushCtor.php.expect
rename to hphp/test/quick/FPushCtor.php.expect
diff --git a/hphp/test/vm/FPushObjMethod.php b/hphp/test/quick/FPushObjMethod.php
similarity index 100%
rename from hphp/test/vm/FPushObjMethod.php
rename to hphp/test/quick/FPushObjMethod.php
diff --git a/hphp/test/vm/FPushObjMethod.php.expectf b/hphp/test/quick/FPushObjMethod.php.expectf
similarity index 100%
rename from hphp/test/vm/FPushObjMethod.php.expectf
rename to hphp/test/quick/FPushObjMethod.php.expectf
diff --git a/hphp/test/vm/GByRef.php b/hphp/test/quick/GByRef.php
similarity index 100%
rename from hphp/test/vm/GByRef.php
rename to hphp/test/quick/GByRef.php
diff --git a/hphp/test/vm/GByRef.php.expect b/hphp/test/quick/GByRef.php.expect
similarity index 100%
rename from hphp/test/vm/GByRef.php.expect
rename to hphp/test/quick/GByRef.php.expect
diff --git a/hphp/test/vm/GLOBALS.php b/hphp/test/quick/GLOBALS.php
similarity index 100%
rename from hphp/test/vm/GLOBALS.php
rename to hphp/test/quick/GLOBALS.php
diff --git a/hphp/test/vm/GLOBALS.php.expect b/hphp/test/quick/GLOBALS.php.expect
similarity index 100%
rename from hphp/test/vm/GLOBALS.php.expect
rename to hphp/test/quick/GLOBALS.php.expect
diff --git a/hphp/test/vm/GetElem.php b/hphp/test/quick/GetElem.php
similarity index 100%
rename from hphp/test/vm/GetElem.php
rename to hphp/test/quick/GetElem.php
diff --git a/hphp/test/vm/GetElem.php.expect b/hphp/test/quick/GetElem.php.expect
similarity index 100%
rename from hphp/test/vm/GetElem.php.expect
rename to hphp/test/quick/GetElem.php.expect
diff --git a/hphp/test/vm/GetGbl.php b/hphp/test/quick/GetGbl.php
similarity index 100%
rename from hphp/test/vm/GetGbl.php
rename to hphp/test/quick/GetGbl.php
diff --git a/hphp/test/vm/GetGbl.php.expect b/hphp/test/quick/GetGbl.php.expect
similarity index 100%
rename from hphp/test/vm/GetGbl.php.expect
rename to hphp/test/quick/GetGbl.php.expect
diff --git a/hphp/test/vm/GetVar.php b/hphp/test/quick/GetVar.php
similarity index 100%
rename from hphp/test/vm/GetVar.php
rename to hphp/test/quick/GetVar.php
diff --git a/hphp/test/vm/GetVar.php.expect b/hphp/test/quick/GetVar.php.expect
similarity index 100%
rename from hphp/test/vm/GetVar.php.expect
rename to hphp/test/quick/GetVar.php.expect
diff --git a/hphp/test/vm/IncDecL1.php b/hphp/test/quick/IncDecL1.php
similarity index 100%
rename from hphp/test/vm/IncDecL1.php
rename to hphp/test/quick/IncDecL1.php
diff --git a/hphp/test/vm/IncDecL1.php.expect b/hphp/test/quick/IncDecL1.php.expect
similarity index 100%
rename from hphp/test/vm/IncDecL1.php.expect
rename to hphp/test/quick/IncDecL1.php.expect
diff --git a/hphp/test/vm/IncDecL2.php b/hphp/test/quick/IncDecL2.php
similarity index 100%
rename from hphp/test/vm/IncDecL2.php
rename to hphp/test/quick/IncDecL2.php
diff --git a/hphp/test/vm/IncDecL2.php.expect b/hphp/test/quick/IncDecL2.php.expect
similarity index 100%
rename from hphp/test/vm/IncDecL2.php.expect
rename to hphp/test/quick/IncDecL2.php.expect
diff --git a/hphp/test/vm/IncDecProp.php b/hphp/test/quick/IncDecProp.php
similarity index 100%
rename from hphp/test/vm/IncDecProp.php
rename to hphp/test/quick/IncDecProp.php
diff --git a/hphp/test/vm/IncDecProp.php.expectf b/hphp/test/quick/IncDecProp.php.expectf
similarity index 100%
rename from hphp/test/vm/IncDecProp.php.expectf
rename to hphp/test/quick/IncDecProp.php.expectf
diff --git a/hphp/test/vm/Isset.php b/hphp/test/quick/Isset.php
similarity index 100%
rename from hphp/test/vm/Isset.php
rename to hphp/test/quick/Isset.php
diff --git a/hphp/test/vm/Isset.php.expect b/hphp/test/quick/Isset.php.expect
similarity index 100%
rename from hphp/test/vm/Isset.php.expect
rename to hphp/test/quick/Isset.php.expect
diff --git a/hphp/test/vm/IssetElem.php b/hphp/test/quick/IssetElem.php
similarity index 100%
rename from hphp/test/vm/IssetElem.php
rename to hphp/test/quick/IssetElem.php
diff --git a/hphp/test/vm/IssetElem.php.expect b/hphp/test/quick/IssetElem.php.expect
similarity index 100%
rename from hphp/test/vm/IssetElem.php.expect
rename to hphp/test/quick/IssetElem.php.expect
diff --git a/hphp/test/vm/IssetM.php b/hphp/test/quick/IssetM.php
similarity index 100%
rename from hphp/test/vm/IssetM.php
rename to hphp/test/quick/IssetM.php
diff --git a/hphp/test/vm/IssetM.php.expect b/hphp/test/quick/IssetM.php.expect
similarity index 100%
rename from hphp/test/vm/IssetM.php.expect
rename to hphp/test/quick/IssetM.php.expect
diff --git a/hphp/test/vm/IterInitM.php b/hphp/test/quick/IterInitM.php
similarity index 100%
rename from hphp/test/vm/IterInitM.php
rename to hphp/test/quick/IterInitM.php
diff --git a/hphp/test/vm/IterInitM.php.expect b/hphp/test/quick/IterInitM.php.expect
similarity index 100%
rename from hphp/test/vm/IterInitM.php.expect
rename to hphp/test/quick/IterInitM.php.expect
diff --git a/hphp/test/vm/IterInitM_b.php b/hphp/test/quick/IterInitM_b.php
similarity index 100%
rename from hphp/test/vm/IterInitM_b.php
rename to hphp/test/quick/IterInitM_b.php
diff --git a/hphp/test/vm/IterInitM_b.php.expect b/hphp/test/quick/IterInitM_b.php.expect
similarity index 100%
rename from hphp/test/vm/IterInitM_b.php.expect
rename to hphp/test/quick/IterInitM_b.php.expect
diff --git a/hphp/test/vm/PropU.php b/hphp/test/quick/PropU.php
similarity index 100%
rename from hphp/test/vm/PropU.php
rename to hphp/test/quick/PropU.php
diff --git a/hphp/test/vm/PropU.php.expect b/hphp/test/quick/PropU.php.expect
similarity index 100%
rename from hphp/test/vm/PropU.php.expect
rename to hphp/test/quick/PropU.php.expect
diff --git a/hphp/test/vm/ReadElem.php b/hphp/test/quick/ReadElem.php
similarity index 100%
rename from hphp/test/vm/ReadElem.php
rename to hphp/test/quick/ReadElem.php
diff --git a/hphp/test/vm/ReadElem.php.expect b/hphp/test/quick/ReadElem.php.expect
similarity index 100%
rename from hphp/test/vm/ReadElem.php.expect
rename to hphp/test/quick/ReadElem.php.expect
diff --git a/hphp/test/vm/ReadVar.php b/hphp/test/quick/ReadVar.php
similarity index 100%
rename from hphp/test/vm/ReadVar.php
rename to hphp/test/quick/ReadVar.php
diff --git a/hphp/test/vm/ReadVar.php.expect b/hphp/test/quick/ReadVar.php.expect
similarity index 100%
rename from hphp/test/vm/ReadVar.php.expect
rename to hphp/test/quick/ReadVar.php.expect
diff --git a/hphp/test/vm/ReflectionClass.php b/hphp/test/quick/ReflectionClass.php
similarity index 100%
rename from hphp/test/vm/ReflectionClass.php
rename to hphp/test/quick/ReflectionClass.php
diff --git a/hphp/test/vm/ReflectionClass.php.expect b/hphp/test/quick/ReflectionClass.php.expect
similarity index 100%
rename from hphp/test/vm/ReflectionClass.php.expect
rename to hphp/test/quick/ReflectionClass.php.expect
diff --git a/hphp/test/vm/RemapMethod.php b/hphp/test/quick/RemapMethod.php
similarity index 100%
rename from hphp/test/vm/RemapMethod.php
rename to hphp/test/quick/RemapMethod.php
diff --git a/hphp/test/vm/RemapMethod.php.expect b/hphp/test/quick/RemapMethod.php.expect
similarity index 100%
rename from hphp/test/vm/RemapMethod.php.expect
rename to hphp/test/quick/RemapMethod.php.expect
diff --git a/hphp/test/vm/ReqOnce_b.php b/hphp/test/quick/ReqOnce_b.php
similarity index 100%
rename from hphp/test/vm/ReqOnce_b.php
rename to hphp/test/quick/ReqOnce_b.php
diff --git a/hphp/test/vm/SPropW.php b/hphp/test/quick/SPropW.php
similarity index 100%
rename from hphp/test/vm/SPropW.php
rename to hphp/test/quick/SPropW.php
diff --git a/hphp/test/vm/SPropW.php.expect b/hphp/test/quick/SPropW.php.expect
similarity index 100%
rename from hphp/test/vm/SPropW.php.expect
rename to hphp/test/quick/SPropW.php.expect
diff --git a/hphp/test/vm/SetM.php b/hphp/test/quick/SetM.php
similarity index 100%
rename from hphp/test/vm/SetM.php
rename to hphp/test/quick/SetM.php
diff --git a/hphp/test/vm/SetM.php.expectf b/hphp/test/quick/SetM.php.expectf
similarity index 100%
rename from hphp/test/vm/SetM.php.expectf
rename to hphp/test/quick/SetM.php.expectf
diff --git a/hphp/test/vm/SetOp.php b/hphp/test/quick/SetOp.php
similarity index 100%
rename from hphp/test/vm/SetOp.php
rename to hphp/test/quick/SetOp.php
diff --git a/hphp/test/vm/SetOp.php.expect b/hphp/test/quick/SetOp.php.expect
similarity index 100%
rename from hphp/test/vm/SetOp.php.expect
rename to hphp/test/quick/SetOp.php.expect
diff --git a/hphp/test/vm/SetOpH.php b/hphp/test/quick/SetOpH.php
similarity index 100%
rename from hphp/test/vm/SetOpH.php
rename to hphp/test/quick/SetOpH.php
diff --git a/hphp/test/vm/SetOpH.php.expectf b/hphp/test/quick/SetOpH.php.expectf
similarity index 100%
rename from hphp/test/vm/SetOpH.php.expectf
rename to hphp/test/quick/SetOpH.php.expectf
diff --git a/hphp/test/vm/SetOpM.php b/hphp/test/quick/SetOpM.php
similarity index 100%
rename from hphp/test/vm/SetOpM.php
rename to hphp/test/quick/SetOpM.php
diff --git a/hphp/test/vm/SetOpM.php.expect b/hphp/test/quick/SetOpM.php.expect
similarity index 100%
rename from hphp/test/vm/SetOpM.php.expect
rename to hphp/test/quick/SetOpM.php.expect
diff --git a/hphp/test/vm/SetOpProp.php b/hphp/test/quick/SetOpProp.php
similarity index 100%
rename from hphp/test/vm/SetOpProp.php
rename to hphp/test/quick/SetOpProp.php
diff --git a/hphp/test/vm/SetOpProp.php.expectf b/hphp/test/quick/SetOpProp.php.expectf
similarity index 100%
rename from hphp/test/vm/SetOpProp.php.expectf
rename to hphp/test/quick/SetOpProp.php.expectf
diff --git a/hphp/test/vm/SetThisProp.php b/hphp/test/quick/SetThisProp.php
similarity index 100%
rename from hphp/test/vm/SetThisProp.php
rename to hphp/test/quick/SetThisProp.php
diff --git a/hphp/test/tcr/array_assignment/511.php.expect b/hphp/test/quick/SetThisProp.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/511.php.expect
rename to hphp/test/quick/SetThisProp.php.expect
diff --git a/hphp/test/vm/Setprofile.php b/hphp/test/quick/Setprofile.php
similarity index 100%
rename from hphp/test/vm/Setprofile.php
rename to hphp/test/quick/Setprofile.php
diff --git a/hphp/test/vm/Setprofile.php.expectf b/hphp/test/quick/Setprofile.php.expectf
similarity index 100%
rename from hphp/test/vm/Setprofile.php.expectf
rename to hphp/test/quick/Setprofile.php.expectf
diff --git a/hphp/test/vm/Setprofile_generic.php b/hphp/test/quick/Setprofile_generic.php
similarity index 100%
rename from hphp/test/vm/Setprofile_generic.php
rename to hphp/test/quick/Setprofile_generic.php
diff --git a/hphp/test/vm/Setprofile_generic.php.expect b/hphp/test/quick/Setprofile_generic.php.expect
similarity index 100%
rename from hphp/test/vm/Setprofile_generic.php.expect
rename to hphp/test/quick/Setprofile_generic.php.expect
diff --git a/hphp/test/vm/Unset.php b/hphp/test/quick/Unset.php
similarity index 100%
rename from hphp/test/vm/Unset.php
rename to hphp/test/quick/Unset.php
diff --git a/hphp/test/vm/Unset.php.expect b/hphp/test/quick/Unset.php.expect
similarity index 100%
rename from hphp/test/vm/Unset.php.expect
rename to hphp/test/quick/Unset.php.expect
diff --git a/hphp/test/vm/UnsetM.php b/hphp/test/quick/UnsetM.php
similarity index 100%
rename from hphp/test/vm/UnsetM.php
rename to hphp/test/quick/UnsetM.php
diff --git a/hphp/test/vm/UnsetM.php.expect b/hphp/test/quick/UnsetM.php.expect
similarity index 100%
rename from hphp/test/vm/UnsetM.php.expect
rename to hphp/test/quick/UnsetM.php.expect
diff --git a/hphp/test/vm/UnsetProp.php b/hphp/test/quick/UnsetProp.php
similarity index 100%
rename from hphp/test/vm/UnsetProp.php
rename to hphp/test/quick/UnsetProp.php
diff --git a/hphp/test/vm/UnsetProp.php.expectf b/hphp/test/quick/UnsetProp.php.expectf
similarity index 100%
rename from hphp/test/vm/UnsetProp.php.expectf
rename to hphp/test/quick/UnsetProp.php.expectf
diff --git a/hphp/test/vm/VGetH.php b/hphp/test/quick/VGetH.php
similarity index 100%
rename from hphp/test/vm/VGetH.php
rename to hphp/test/quick/VGetH.php
diff --git a/hphp/test/vm/VGetH.php.expect b/hphp/test/quick/VGetH.php.expect
similarity index 100%
rename from hphp/test/vm/VGetH.php.expect
rename to hphp/test/quick/VGetH.php.expect
diff --git a/hphp/test/vm/VGetM.php b/hphp/test/quick/VGetM.php
similarity index 100%
rename from hphp/test/vm/VGetM.php
rename to hphp/test/quick/VGetM.php
diff --git a/hphp/test/vm/VGetM.php.expect b/hphp/test/quick/VGetM.php.expect
similarity index 100%
rename from hphp/test/vm/VGetM.php.expect
rename to hphp/test/quick/VGetM.php.expect
diff --git a/hphp/test/vm/Xhp.php b/hphp/test/quick/Xhp.php
similarity index 100%
rename from hphp/test/vm/Xhp.php
rename to hphp/test/quick/Xhp.php
diff --git a/hphp/test/vm/Xhp.php.expectf b/hphp/test/quick/Xhp.php.expectf
similarity index 100%
rename from hphp/test/vm/Xhp.php.expectf
rename to hphp/test/quick/Xhp.php.expectf
diff --git a/hphp/test/vm/__call.php b/hphp/test/quick/__call.php
similarity index 100%
rename from hphp/test/vm/__call.php
rename to hphp/test/quick/__call.php
diff --git a/hphp/test/vm/__call.php.expect b/hphp/test/quick/__call.php.expect
similarity index 100%
rename from hphp/test/vm/__call.php.expect
rename to hphp/test/quick/__call.php.expect
diff --git a/hphp/test/vm/__isset.php b/hphp/test/quick/__isset.php
similarity index 100%
rename from hphp/test/vm/__isset.php
rename to hphp/test/quick/__isset.php
diff --git a/hphp/test/vm/__isset.php.expect b/hphp/test/quick/__isset.php.expect
similarity index 100%
rename from hphp/test/vm/__isset.php.expect
rename to hphp/test/quick/__isset.php.expect
diff --git a/hphp/test/quick/_fbcufa_init.php b/hphp/test/quick/_fbcufa_init.php
new file mode 100644
index 000000000..49e6e0643
--- /dev/null
+++ b/hphp/test/quick/_fbcufa_init.php
@@ -0,0 +1,19 @@
+<?php
+echo "_fbcufa_init.php begin\n";
+function doThrow() {
+  throw new Exception("blah");
+}
+function foo($x, $y) {
+  var_dump($x, $y);
+  return 42;
+}
+class C {
+  public $blah = 123;
+  public static function bar($x) {
+    return $x * 3;
+  }
+  public function baz($x) {
+    return $x + $this->blah;
+  }
+}
+echo "_fbcufa_init.php end\n";
diff --git a/hphp/test/vm/abstract_static_1.php b/hphp/test/quick/abstract_static_1.php
similarity index 100%
rename from hphp/test/vm/abstract_static_1.php
rename to hphp/test/quick/abstract_static_1.php
diff --git a/hphp/test/vm/abstract_static_1.php.expectf b/hphp/test/quick/abstract_static_1.php.expectf
similarity index 100%
rename from hphp/test/vm/abstract_static_1.php.expectf
rename to hphp/test/quick/abstract_static_1.php.expectf
diff --git a/hphp/test/vm/abstract_static_2.php b/hphp/test/quick/abstract_static_2.php
similarity index 100%
rename from hphp/test/vm/abstract_static_2.php
rename to hphp/test/quick/abstract_static_2.php
diff --git a/hphp/test/vm/abstract_static_2.php.expectf b/hphp/test/quick/abstract_static_2.php.expectf
similarity index 100%
rename from hphp/test/vm/abstract_static_2.php.expectf
rename to hphp/test/quick/abstract_static_2.php.expectf
diff --git a/hphp/test/vm/actrec.php b/hphp/test/quick/actrec.php
similarity index 100%
rename from hphp/test/vm/actrec.php
rename to hphp/test/quick/actrec.php
diff --git a/hphp/test/vm/actrec.php.expect b/hphp/test/quick/actrec.php.expect
similarity index 100%
rename from hphp/test/vm/actrec.php.expect
rename to hphp/test/quick/actrec.php.expect
diff --git a/hphp/test/vm/alias_torture.php b/hphp/test/quick/alias_torture.php
similarity index 100%
rename from hphp/test/vm/alias_torture.php
rename to hphp/test/quick/alias_torture.php
diff --git a/hphp/test/vm/alias_torture.php.expect b/hphp/test/quick/alias_torture.php.expect
similarity index 100%
rename from hphp/test/vm/alias_torture.php.expect
rename to hphp/test/quick/alias_torture.php.expect
diff --git a/hphp/test/vm/allbranches.php b/hphp/test/quick/allbranches.php
similarity index 100%
rename from hphp/test/vm/allbranches.php
rename to hphp/test/quick/allbranches.php
diff --git a/hphp/test/vm/allbranches.php.expect b/hphp/test/quick/allbranches.php.expect
similarity index 100%
rename from hphp/test/vm/allbranches.php.expect
rename to hphp/test/quick/allbranches.php.expect
diff --git a/hphp/test/vm/apc.php b/hphp/test/quick/apc.php
similarity index 100%
rename from hphp/test/vm/apc.php
rename to hphp/test/quick/apc.php
diff --git a/hphp/test/vm/apc.php.expect b/hphp/test/quick/apc.php.expect
similarity index 100%
rename from hphp/test/vm/apc.php.expect
rename to hphp/test/quick/apc.php.expect
diff --git a/hphp/test/vm/array-ref.php b/hphp/test/quick/array-ref.php
similarity index 100%
rename from hphp/test/vm/array-ref.php
rename to hphp/test/quick/array-ref.php
diff --git a/hphp/test/vm/array-ref.php.expect b/hphp/test/quick/array-ref.php.expect
similarity index 100%
rename from hphp/test/vm/array-ref.php.expect
rename to hphp/test/quick/array-ref.php.expect
diff --git a/hphp/test/vm/array.php b/hphp/test/quick/array.php
similarity index 100%
rename from hphp/test/vm/array.php
rename to hphp/test/quick/array.php
diff --git a/hphp/test/vm/array.php.expect b/hphp/test/quick/array.php.expect
similarity index 100%
rename from hphp/test/vm/array.php.expect
rename to hphp/test/quick/array.php.expect
diff --git a/hphp/test/vm/array_access.php b/hphp/test/quick/array_access.php
similarity index 100%
rename from hphp/test/vm/array_access.php
rename to hphp/test/quick/array_access.php
diff --git a/hphp/test/vm/array_access.php.expect b/hphp/test/quick/array_access.php.expect
similarity index 100%
rename from hphp/test/vm/array_access.php.expect
rename to hphp/test/quick/array_access.php.expect
diff --git a/hphp/test/vm/array_callbacks.php b/hphp/test/quick/array_callbacks.php
similarity index 100%
rename from hphp/test/vm/array_callbacks.php
rename to hphp/test/quick/array_callbacks.php
diff --git a/hphp/test/vm/array_callbacks.php.expect b/hphp/test/quick/array_callbacks.php.expect
similarity index 100%
rename from hphp/test/vm/array_callbacks.php.expect
rename to hphp/test/quick/array_callbacks.php.expect
diff --git a/hphp/test/vm/array_cmp.php b/hphp/test/quick/array_cmp.php
similarity index 100%
rename from hphp/test/vm/array_cmp.php
rename to hphp/test/quick/array_cmp.php
diff --git a/hphp/test/vm/array_cmp.php.expect b/hphp/test/quick/array_cmp.php.expect
similarity index 100%
rename from hphp/test/vm/array_cmp.php.expect
rename to hphp/test/quick/array_cmp.php.expect
diff --git a/hphp/test/vm/array_helper_reenter.php b/hphp/test/quick/array_helper_reenter.php
similarity index 100%
rename from hphp/test/vm/array_helper_reenter.php
rename to hphp/test/quick/array_helper_reenter.php
diff --git a/hphp/test/vm/array_helper_reenter.php.expect b/hphp/test/quick/array_helper_reenter.php.expect
similarity index 100%
rename from hphp/test/vm/array_helper_reenter.php.expect
rename to hphp/test/quick/array_helper_reenter.php.expect
diff --git a/hphp/test/vm/array_misc.php b/hphp/test/quick/array_misc.php
similarity index 100%
rename from hphp/test/vm/array_misc.php
rename to hphp/test/quick/array_misc.php
diff --git a/hphp/test/vm/array_misc.php.expect b/hphp/test/quick/array_misc.php.expect
similarity index 100%
rename from hphp/test/vm/array_misc.php.expect
rename to hphp/test/quick/array_misc.php.expect
diff --git a/hphp/test/vm/array_pos.php b/hphp/test/quick/array_pos.php
similarity index 100%
rename from hphp/test/vm/array_pos.php
rename to hphp/test/quick/array_pos.php
diff --git a/hphp/test/vm/array_pos.php.expect b/hphp/test/quick/array_pos.php.expect
similarity index 100%
rename from hphp/test/vm/array_pos.php.expect
rename to hphp/test/quick/array_pos.php.expect
diff --git a/hphp/test/vm/array_string_key.php b/hphp/test/quick/array_string_key.php
similarity index 100%
rename from hphp/test/vm/array_string_key.php
rename to hphp/test/quick/array_string_key.php
diff --git a/hphp/test/vm/array_string_key.php.expect b/hphp/test/quick/array_string_key.php.expect
similarity index 100%
rename from hphp/test/vm/array_string_key.php.expect
rename to hphp/test/quick/array_string_key.php.expect
diff --git a/hphp/test/vm/array_tuple.php b/hphp/test/quick/array_tuple.php
similarity index 100%
rename from hphp/test/vm/array_tuple.php
rename to hphp/test/quick/array_tuple.php
diff --git a/hphp/test/vm/array_tuple.php.expect b/hphp/test/quick/array_tuple.php.expect
similarity index 100%
rename from hphp/test/vm/array_tuple.php.expect
rename to hphp/test/quick/array_tuple.php.expect
diff --git a/hphp/test/vm/arraypairref.php b/hphp/test/quick/arraypairref.php
similarity index 100%
rename from hphp/test/vm/arraypairref.php
rename to hphp/test/quick/arraypairref.php
diff --git a/hphp/test/vm/arraypairref.php.expect b/hphp/test/quick/arraypairref.php.expect
similarity index 100%
rename from hphp/test/vm/arraypairref.php.expect
rename to hphp/test/quick/arraypairref.php.expect
diff --git a/hphp/test/vm/asm_array.hhas b/hphp/test/quick/asm_array.hhas
similarity index 100%
rename from hphp/test/vm/asm_array.hhas
rename to hphp/test/quick/asm_array.hhas
diff --git a/hphp/test/vm/asm_array.hhas.expect b/hphp/test/quick/asm_array.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_array.hhas.expect
rename to hphp/test/quick/asm_array.hhas.expect
diff --git a/hphp/test/vm/asm_class.hhas b/hphp/test/quick/asm_class.hhas
similarity index 100%
rename from hphp/test/vm/asm_class.hhas
rename to hphp/test/quick/asm_class.hhas
diff --git a/hphp/test/vm/asm_class.hhas.expect b/hphp/test/quick/asm_class.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_class.hhas.expect
rename to hphp/test/quick/asm_class.hhas.expect
diff --git a/hphp/test/vm/asm_dvinit.hhas b/hphp/test/quick/asm_dvinit.hhas
similarity index 100%
rename from hphp/test/vm/asm_dvinit.hhas
rename to hphp/test/quick/asm_dvinit.hhas
diff --git a/hphp/test/vm/asm_dvinit.hhas.expect b/hphp/test/quick/asm_dvinit.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_dvinit.hhas.expect
rename to hphp/test/quick/asm_dvinit.hhas.expect
diff --git a/hphp/test/vm/asm_fault.hhas b/hphp/test/quick/asm_fault.hhas
similarity index 100%
rename from hphp/test/vm/asm_fault.hhas
rename to hphp/test/quick/asm_fault.hhas
diff --git a/hphp/test/vm/asm_fault.hhas.expect b/hphp/test/quick/asm_fault.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_fault.hhas.expect
rename to hphp/test/quick/asm_fault.hhas.expect
diff --git a/hphp/test/vm/asm_fault_endings.hhas b/hphp/test/quick/asm_fault_endings.hhas
similarity index 100%
rename from hphp/test/vm/asm_fault_endings.hhas
rename to hphp/test/quick/asm_fault_endings.hhas
diff --git a/hphp/test/vm/asm_fault_endings.hhas.expect b/hphp/test/quick/asm_fault_endings.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_fault_endings.hhas.expect
rename to hphp/test/quick/asm_fault_endings.hhas.expect
diff --git a/hphp/test/vm/asm_fcall.hhas b/hphp/test/quick/asm_fcall.hhas
similarity index 100%
rename from hphp/test/vm/asm_fcall.hhas
rename to hphp/test/quick/asm_fcall.hhas
diff --git a/hphp/test/vm/asm_fcall.hhas.expect b/hphp/test/quick/asm_fcall.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_fcall.hhas.expect
rename to hphp/test/quick/asm_fcall.hhas.expect
diff --git a/hphp/test/vm/asm_jumps.hhas b/hphp/test/quick/asm_jumps.hhas
similarity index 100%
rename from hphp/test/vm/asm_jumps.hhas
rename to hphp/test/quick/asm_jumps.hhas
diff --git a/hphp/test/vm/asm_jumps.hhas.expect b/hphp/test/quick/asm_jumps.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_jumps.hhas.expect
rename to hphp/test/quick/asm_jumps.hhas.expect
diff --git a/hphp/test/vm/asm_prop_init.hhas b/hphp/test/quick/asm_prop_init.hhas
similarity index 100%
rename from hphp/test/vm/asm_prop_init.hhas
rename to hphp/test/quick/asm_prop_init.hhas
diff --git a/hphp/test/vm/asm_prop_init.hhas.expect b/hphp/test/quick/asm_prop_init.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_prop_init.hhas.expect
rename to hphp/test/quick/asm_prop_init.hhas.expect
diff --git a/hphp/test/vm/asm_reqdoc.hhas b/hphp/test/quick/asm_reqdoc.hhas
similarity index 100%
rename from hphp/test/vm/asm_reqdoc.hhas
rename to hphp/test/quick/asm_reqdoc.hhas
diff --git a/hphp/test/vm/asm_reqdoc.hhas.expect b/hphp/test/quick/asm_reqdoc.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_reqdoc.hhas.expect
rename to hphp/test/quick/asm_reqdoc.hhas.expect
diff --git a/hphp/test/vm/asm_sswitch.hhas b/hphp/test/quick/asm_sswitch.hhas
similarity index 100%
rename from hphp/test/vm/asm_sswitch.hhas
rename to hphp/test/quick/asm_sswitch.hhas
diff --git a/hphp/test/vm/asm_sswitch.hhas.expect b/hphp/test/quick/asm_sswitch.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_sswitch.hhas.expect
rename to hphp/test/quick/asm_sswitch.hhas.expect
diff --git a/hphp/test/vm/asm_sswitch_slow.hhas b/hphp/test/quick/asm_sswitch_slow.hhas
similarity index 100%
rename from hphp/test/vm/asm_sswitch_slow.hhas
rename to hphp/test/quick/asm_sswitch_slow.hhas
diff --git a/hphp/test/vm/asm_sswitch_slow.hhas.expect b/hphp/test/quick/asm_sswitch_slow.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_sswitch_slow.hhas.expect
rename to hphp/test/quick/asm_sswitch_slow.hhas.expect
diff --git a/hphp/test/vm/asm_stack_depth_and_jmp.hhas b/hphp/test/quick/asm_stack_depth_and_jmp.hhas
similarity index 100%
rename from hphp/test/vm/asm_stack_depth_and_jmp.hhas
rename to hphp/test/quick/asm_stack_depth_and_jmp.hhas
diff --git a/hphp/test/vm/asm_stack_depth_and_jmp.hhas.expect b/hphp/test/quick/asm_stack_depth_and_jmp.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_stack_depth_and_jmp.hhas.expect
rename to hphp/test/quick/asm_stack_depth_and_jmp.hhas.expect
diff --git a/hphp/test/vm/asm_switch.hhas b/hphp/test/quick/asm_switch.hhas
similarity index 100%
rename from hphp/test/vm/asm_switch.hhas
rename to hphp/test/quick/asm_switch.hhas
diff --git a/hphp/test/vm/asm_switch.hhas.expect b/hphp/test/quick/asm_switch.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_switch.hhas.expect
rename to hphp/test/quick/asm_switch.hhas.expect
diff --git a/hphp/test/vm/asm_trait.hhas b/hphp/test/quick/asm_trait.hhas
similarity index 100%
rename from hphp/test/vm/asm_trait.hhas
rename to hphp/test/quick/asm_trait.hhas
diff --git a/hphp/test/vm/asm_trait.hhas.expect b/hphp/test/quick/asm_trait.hhas.expect
similarity index 100%
rename from hphp/test/vm/asm_trait.hhas.expect
rename to hphp/test/quick/asm_trait.hhas.expect
diff --git a/hphp/test/vm/autoload.php b/hphp/test/quick/autoload.php
similarity index 100%
rename from hphp/test/vm/autoload.php
rename to hphp/test/quick/autoload.php
diff --git a/hphp/test/vm/autoload.php.expect b/hphp/test/quick/autoload.php.expect
similarity index 100%
rename from hphp/test/vm/autoload.php.expect
rename to hphp/test/quick/autoload.php.expect
diff --git a/hphp/test/vm/autoload2.php b/hphp/test/quick/autoload2.php
similarity index 100%
rename from hphp/test/vm/autoload2.php
rename to hphp/test/quick/autoload2.php
diff --git a/hphp/test/vm/autoload2.php.expect b/hphp/test/quick/autoload2.php.expect
similarity index 100%
rename from hphp/test/vm/autoload2.php.expect
rename to hphp/test/quick/autoload2.php.expect
diff --git a/hphp/test/vm/autoload3.php b/hphp/test/quick/autoload3.php
similarity index 100%
rename from hphp/test/vm/autoload3.php
rename to hphp/test/quick/autoload3.php
diff --git a/hphp/test/vm/autoload3.php.expect b/hphp/test/quick/autoload3.php.expect
similarity index 100%
rename from hphp/test/vm/autoload3.php.expect
rename to hphp/test/quick/autoload3.php.expect
diff --git a/hphp/test/vm/autoload4.php b/hphp/test/quick/autoload4.php
similarity index 100%
rename from hphp/test/vm/autoload4.php
rename to hphp/test/quick/autoload4.php
diff --git a/hphp/test/vm/autoload4.php.expect b/hphp/test/quick/autoload4.php.expect
similarity index 100%
rename from hphp/test/vm/autoload4.php.expect
rename to hphp/test/quick/autoload4.php.expect
diff --git a/hphp/test/vm/autoload5.php b/hphp/test/quick/autoload5.php
similarity index 100%
rename from hphp/test/vm/autoload5.php
rename to hphp/test/quick/autoload5.php
diff --git a/hphp/test/vm/autoload6.php b/hphp/test/quick/autoload6.php
similarity index 100%
rename from hphp/test/vm/autoload6.php
rename to hphp/test/quick/autoload6.php
diff --git a/hphp/test/vm/autoload6.php.expect b/hphp/test/quick/autoload6.php.expect
similarity index 100%
rename from hphp/test/vm/autoload6.php.expect
rename to hphp/test/quick/autoload6.php.expect
diff --git a/hphp/test/vm/backtick.php b/hphp/test/quick/backtick.php
similarity index 100%
rename from hphp/test/vm/backtick.php
rename to hphp/test/quick/backtick.php
diff --git a/hphp/test/vm/backtick.php.expect b/hphp/test/quick/backtick.php.expect
similarity index 100%
rename from hphp/test/vm/backtick.php.expect
rename to hphp/test/quick/backtick.php.expect
diff --git a/hphp/test/vm/backup_cycle_collector.php b/hphp/test/quick/backup_cycle_collector.php
similarity index 100%
rename from hphp/test/vm/backup_cycle_collector.php
rename to hphp/test/quick/backup_cycle_collector.php
diff --git a/hphp/test/vm/backup_cycle_collector.php.expect b/hphp/test/quick/backup_cycle_collector.php.expect
similarity index 100%
rename from hphp/test/vm/backup_cycle_collector.php.expect
rename to hphp/test/quick/backup_cycle_collector.php.expect
diff --git a/hphp/test/vm/bitop_types.php b/hphp/test/quick/bitop_types.php
similarity index 100%
rename from hphp/test/vm/bitop_types.php
rename to hphp/test/quick/bitop_types.php
diff --git a/hphp/test/vm/bitop_types.php.expect b/hphp/test/quick/bitop_types.php.expect
similarity index 100%
rename from hphp/test/vm/bitop_types.php.expect
rename to hphp/test/quick/bitop_types.php.expect
diff --git a/hphp/test/vm/bitwise.php b/hphp/test/quick/bitwise.php
similarity index 100%
rename from hphp/test/vm/bitwise.php
rename to hphp/test/quick/bitwise.php
diff --git a/hphp/test/vm/bitwise.php.expect b/hphp/test/quick/bitwise.php.expect
similarity index 100%
rename from hphp/test/vm/bitwise.php.expect
rename to hphp/test/quick/bitwise.php.expect
diff --git a/hphp/test/vm/bool_types.php b/hphp/test/quick/bool_types.php
similarity index 100%
rename from hphp/test/vm/bool_types.php
rename to hphp/test/quick/bool_types.php
diff --git a/hphp/test/vm/bool_types.php.expect b/hphp/test/quick/bool_types.php.expect
similarity index 100%
rename from hphp/test/vm/bool_types.php.expect
rename to hphp/test/quick/bool_types.php.expect
diff --git a/hphp/test/vm/boxed_classref.php b/hphp/test/quick/boxed_classref.php
similarity index 100%
rename from hphp/test/vm/boxed_classref.php
rename to hphp/test/quick/boxed_classref.php
diff --git a/hphp/test/vm/boxed_classref.php.expect b/hphp/test/quick/boxed_classref.php.expect
similarity index 100%
rename from hphp/test/vm/boxed_classref.php.expect
rename to hphp/test/quick/boxed_classref.php.expect
diff --git a/hphp/test/vm/boxed_static_string.php b/hphp/test/quick/boxed_static_string.php
similarity index 100%
rename from hphp/test/vm/boxed_static_string.php
rename to hphp/test/quick/boxed_static_string.php
diff --git a/hphp/test/vm/boxed_static_string.php.expectf b/hphp/test/quick/boxed_static_string.php.expectf
similarity index 100%
rename from hphp/test/vm/boxed_static_string.php.expectf
rename to hphp/test/quick/boxed_static_string.php.expectf
diff --git a/hphp/test/vm/builtin_call.php b/hphp/test/quick/builtin_call.php
similarity index 100%
rename from hphp/test/vm/builtin_call.php
rename to hphp/test/quick/builtin_call.php
diff --git a/hphp/test/vm/builtin_call.php.expect b/hphp/test/quick/builtin_call.php.expect
similarity index 100%
rename from hphp/test/vm/builtin_call.php.expect
rename to hphp/test/quick/builtin_call.php.expect
diff --git a/hphp/test/vm/builtin_recurse.php b/hphp/test/quick/builtin_recurse.php
similarity index 100%
rename from hphp/test/vm/builtin_recurse.php
rename to hphp/test/quick/builtin_recurse.php
diff --git a/hphp/test/vm/builtin_recurse.php.expect b/hphp/test/quick/builtin_recurse.php.expect
similarity index 100%
rename from hphp/test/vm/builtin_recurse.php.expect
rename to hphp/test/quick/builtin_recurse.php.expect
diff --git a/hphp/test/vm/byref.php b/hphp/test/quick/byref.php
similarity index 100%
rename from hphp/test/vm/byref.php
rename to hphp/test/quick/byref.php
diff --git a/hphp/test/vm/byref.php.expect b/hphp/test/quick/byref.php.expect
similarity index 100%
rename from hphp/test/vm/byref.php.expect
rename to hphp/test/quick/byref.php.expect
diff --git a/hphp/test/vm/byref2.php b/hphp/test/quick/byref2.php
similarity index 100%
rename from hphp/test/vm/byref2.php
rename to hphp/test/quick/byref2.php
diff --git a/hphp/test/vm/byref2.php.expect b/hphp/test/quick/byref2.php.expect
similarity index 100%
rename from hphp/test/vm/byref2.php.expect
rename to hphp/test/quick/byref2.php.expect
diff --git a/hphp/test/vm/call10.php b/hphp/test/quick/call10.php
similarity index 100%
rename from hphp/test/vm/call10.php
rename to hphp/test/quick/call10.php
diff --git a/hphp/test/vm/call10.php.expect b/hphp/test/quick/call10.php.expect
similarity index 100%
rename from hphp/test/vm/call10.php.expect
rename to hphp/test/quick/call10.php.expect
diff --git a/hphp/test/vm/call11.php b/hphp/test/quick/call11.php
similarity index 100%
rename from hphp/test/vm/call11.php
rename to hphp/test/quick/call11.php
diff --git a/hphp/test/vm/call11.php.expectf b/hphp/test/quick/call11.php.expectf
similarity index 100%
rename from hphp/test/vm/call11.php.expectf
rename to hphp/test/quick/call11.php.expectf
diff --git a/hphp/test/vm/call12.php b/hphp/test/quick/call12.php
similarity index 100%
rename from hphp/test/vm/call12.php
rename to hphp/test/quick/call12.php
diff --git a/hphp/test/vm/call12.php.expectf b/hphp/test/quick/call12.php.expectf
similarity index 100%
rename from hphp/test/vm/call12.php.expectf
rename to hphp/test/quick/call12.php.expectf
diff --git a/hphp/test/vm/call13.php b/hphp/test/quick/call13.php
similarity index 100%
rename from hphp/test/vm/call13.php
rename to hphp/test/quick/call13.php
diff --git a/hphp/test/vm/call13.php.expectf b/hphp/test/quick/call13.php.expectf
similarity index 100%
rename from hphp/test/vm/call13.php.expectf
rename to hphp/test/quick/call13.php.expectf
diff --git a/hphp/test/vm/call14.php b/hphp/test/quick/call14.php
similarity index 100%
rename from hphp/test/vm/call14.php
rename to hphp/test/quick/call14.php
diff --git a/hphp/test/vm/call14.php.expect b/hphp/test/quick/call14.php.expect
similarity index 100%
rename from hphp/test/vm/call14.php.expect
rename to hphp/test/quick/call14.php.expect
diff --git a/hphp/test/vm/callable.php b/hphp/test/quick/callable.php
similarity index 100%
rename from hphp/test/vm/callable.php
rename to hphp/test/quick/callable.php
diff --git a/hphp/test/vm/callable.php.expect b/hphp/test/quick/callable.php.expect
similarity index 100%
rename from hphp/test/vm/callable.php.expect
rename to hphp/test/quick/callable.php.expect
diff --git a/hphp/test/vm/catch-order.php b/hphp/test/quick/catch-order.php
similarity index 100%
rename from hphp/test/vm/catch-order.php
rename to hphp/test/quick/catch-order.php
diff --git a/hphp/test/vm/catch-order.php.expect b/hphp/test/quick/catch-order.php.expect
similarity index 100%
rename from hphp/test/vm/catch-order.php.expect
rename to hphp/test/quick/catch-order.php.expect
diff --git a/hphp/test/vm/cgetm_ge.php b/hphp/test/quick/cgetm_ge.php
similarity index 100%
rename from hphp/test/vm/cgetm_ge.php
rename to hphp/test/quick/cgetm_ge.php
diff --git a/hphp/test/vm/cgetm_ge.php.expectf b/hphp/test/quick/cgetm_ge.php.expectf
similarity index 100%
rename from hphp/test/vm/cgetm_ge.php.expectf
rename to hphp/test/quick/cgetm_ge.php.expectf
diff --git a/hphp/test/vm/cgetm_hee.php b/hphp/test/quick/cgetm_hee.php
similarity index 100%
rename from hphp/test/vm/cgetm_hee.php
rename to hphp/test/quick/cgetm_hee.php
diff --git a/hphp/test/vm/cgetm_hee.php.expectf b/hphp/test/quick/cgetm_hee.php.expectf
similarity index 100%
rename from hphp/test/vm/cgetm_hee.php.expectf
rename to hphp/test/quick/cgetm_hee.php.expectf
diff --git a/hphp/test/vm/cgetm_ne.php b/hphp/test/quick/cgetm_ne.php
similarity index 100%
rename from hphp/test/vm/cgetm_ne.php
rename to hphp/test/quick/cgetm_ne.php
diff --git a/hphp/test/vm/cgetm_ne.php.expectf b/hphp/test/quick/cgetm_ne.php.expectf
similarity index 100%
rename from hphp/test/vm/cgetm_ne.php.expectf
rename to hphp/test/quick/cgetm_ne.php.expectf
diff --git a/hphp/test/vm/cgetm_retbase.php b/hphp/test/quick/cgetm_retbase.php
similarity index 100%
rename from hphp/test/vm/cgetm_retbase.php
rename to hphp/test/quick/cgetm_retbase.php
diff --git a/hphp/test/vm/cgetm_retbase.php.expect b/hphp/test/quick/cgetm_retbase.php.expect
similarity index 100%
rename from hphp/test/vm/cgetm_retbase.php.expect
rename to hphp/test/quick/cgetm_retbase.php.expect
diff --git a/hphp/test/vm/class_constant_array.php b/hphp/test/quick/class_constant_array.php
similarity index 100%
rename from hphp/test/vm/class_constant_array.php
rename to hphp/test/quick/class_constant_array.php
diff --git a/hphp/test/vm/class_constant_array.php.expectf b/hphp/test/quick/class_constant_array.php.expectf
similarity index 100%
rename from hphp/test/vm/class_constant_array.php.expectf
rename to hphp/test/quick/class_constant_array.php.expectf
diff --git a/hphp/test/vm/class_constants.php b/hphp/test/quick/class_constants.php
similarity index 100%
rename from hphp/test/vm/class_constants.php
rename to hphp/test/quick/class_constants.php
diff --git a/hphp/test/vm/class_constants.php.expectf b/hphp/test/quick/class_constants.php.expectf
similarity index 100%
rename from hphp/test/vm/class_constants.php.expectf
rename to hphp/test/quick/class_constants.php.expectf
diff --git a/hphp/test/vm/class_implements.php b/hphp/test/quick/class_implements.php
similarity index 100%
rename from hphp/test/vm/class_implements.php
rename to hphp/test/quick/class_implements.php
diff --git a/hphp/test/vm/class_implements.php.expect b/hphp/test/quick/class_implements.php.expect
similarity index 100%
rename from hphp/test/vm/class_implements.php.expect
rename to hphp/test/quick/class_implements.php.expect
diff --git a/hphp/test/vm/class_interface_trait_exists.php b/hphp/test/quick/class_interface_trait_exists.php
similarity index 100%
rename from hphp/test/vm/class_interface_trait_exists.php
rename to hphp/test/quick/class_interface_trait_exists.php
diff --git a/hphp/test/vm/class_interface_trait_exists.php.expect b/hphp/test/quick/class_interface_trait_exists.php.expect
similarity index 100%
rename from hphp/test/vm/class_interface_trait_exists.php.expect
rename to hphp/test/quick/class_interface_trait_exists.php.expect
diff --git a/hphp/test/vm/clone.php b/hphp/test/quick/clone.php
similarity index 100%
rename from hphp/test/vm/clone.php
rename to hphp/test/quick/clone.php
diff --git a/hphp/test/vm/clone.php.expect b/hphp/test/quick/clone.php.expect
similarity index 100%
rename from hphp/test/vm/clone.php.expect
rename to hphp/test/quick/clone.php.expect
diff --git a/hphp/test/vm/closure.php b/hphp/test/quick/closure.php
similarity index 100%
rename from hphp/test/vm/closure.php
rename to hphp/test/quick/closure.php
diff --git a/hphp/test/vm/closure.php.expectf b/hphp/test/quick/closure.php.expectf
similarity index 100%
rename from hphp/test/vm/closure.php.expectf
rename to hphp/test/quick/closure.php.expectf
diff --git a/hphp/test/vm/closure_class.php b/hphp/test/quick/closure_class.php
similarity index 100%
rename from hphp/test/vm/closure_class.php
rename to hphp/test/quick/closure_class.php
diff --git a/hphp/test/vm/closure_class.php.expect b/hphp/test/quick/closure_class.php.expect
similarity index 100%
rename from hphp/test/vm/closure_class.php.expect
rename to hphp/test/quick/closure_class.php.expect
diff --git a/hphp/test/vm/closure_clone.php b/hphp/test/quick/closure_clone.php
similarity index 100%
rename from hphp/test/vm/closure_clone.php
rename to hphp/test/quick/closure_clone.php
diff --git a/hphp/test/vm/closure_clone.php.expect b/hphp/test/quick/closure_clone.php.expect
similarity index 100%
rename from hphp/test/vm/closure_clone.php.expect
rename to hphp/test/quick/closure_clone.php.expect
diff --git a/hphp/test/vm/closure_clone_2.php b/hphp/test/quick/closure_clone_2.php
similarity index 100%
rename from hphp/test/vm/closure_clone_2.php
rename to hphp/test/quick/closure_clone_2.php
diff --git a/hphp/test/vm/closure_clone_2.php.expect b/hphp/test/quick/closure_clone_2.php.expect
similarity index 100%
rename from hphp/test/vm/closure_clone_2.php.expect
rename to hphp/test/quick/closure_clone_2.php.expect
diff --git a/hphp/test/vm/closure_func_get_arg.php b/hphp/test/quick/closure_func_get_arg.php
similarity index 100%
rename from hphp/test/vm/closure_func_get_arg.php
rename to hphp/test/quick/closure_func_get_arg.php
diff --git a/hphp/test/vm/closure_func_get_arg.php.expect b/hphp/test/quick/closure_func_get_arg.php.expect
similarity index 100%
rename from hphp/test/vm/closure_func_get_arg.php.expect
rename to hphp/test/quick/closure_func_get_arg.php.expect
diff --git a/hphp/test/vm/closure_gen_scope.php b/hphp/test/quick/closure_gen_scope.php
similarity index 100%
rename from hphp/test/vm/closure_gen_scope.php
rename to hphp/test/quick/closure_gen_scope.php
diff --git a/hphp/test/vm/closure_gen_scope.php.expect b/hphp/test/quick/closure_gen_scope.php.expect
similarity index 100%
rename from hphp/test/vm/closure_gen_scope.php.expect
rename to hphp/test/quick/closure_gen_scope.php.expect
diff --git a/hphp/test/vm/closure_get_class.php b/hphp/test/quick/closure_get_class.php
similarity index 100%
rename from hphp/test/vm/closure_get_class.php
rename to hphp/test/quick/closure_get_class.php
diff --git a/hphp/test/vm/closure_get_class.php.expect b/hphp/test/quick/closure_get_class.php.expect
similarity index 100%
rename from hphp/test/vm/closure_get_class.php.expect
rename to hphp/test/quick/closure_get_class.php.expect
diff --git a/hphp/test/vm/closure_in_generator.php b/hphp/test/quick/closure_in_generator.php
similarity index 100%
rename from hphp/test/vm/closure_in_generator.php
rename to hphp/test/quick/closure_in_generator.php
diff --git a/hphp/test/vm/closure_in_generator.php.expect b/hphp/test/quick/closure_in_generator.php.expect
similarity index 100%
rename from hphp/test/vm/closure_in_generator.php.expect
rename to hphp/test/quick/closure_in_generator.php.expect
diff --git a/hphp/test/vm/closure_in_generator2.php b/hphp/test/quick/closure_in_generator2.php
similarity index 100%
rename from hphp/test/vm/closure_in_generator2.php
rename to hphp/test/quick/closure_in_generator2.php
diff --git a/hphp/test/vm/closure_in_generator2.php.expect b/hphp/test/quick/closure_in_generator2.php.expect
similarity index 100%
rename from hphp/test/vm/closure_in_generator2.php.expect
rename to hphp/test/quick/closure_in_generator2.php.expect
diff --git a/hphp/test/vm/closure_private.php b/hphp/test/quick/closure_private.php
similarity index 100%
rename from hphp/test/vm/closure_private.php
rename to hphp/test/quick/closure_private.php
diff --git a/hphp/test/vm/closure_private.php.expect b/hphp/test/quick/closure_private.php.expect
similarity index 100%
rename from hphp/test/vm/closure_private.php.expect
rename to hphp/test/quick/closure_private.php.expect
diff --git a/hphp/test/vm/closure_recursive.php b/hphp/test/quick/closure_recursive.php
similarity index 100%
rename from hphp/test/vm/closure_recursive.php
rename to hphp/test/quick/closure_recursive.php
diff --git a/hphp/test/vm/closure_recursive.php.expect b/hphp/test/quick/closure_recursive.php.expect
similarity index 100%
rename from hphp/test/vm/closure_recursive.php.expect
rename to hphp/test/quick/closure_recursive.php.expect
diff --git a/hphp/test/vm/closure_recursive_bad.php b/hphp/test/quick/closure_recursive_bad.php
similarity index 100%
rename from hphp/test/vm/closure_recursive_bad.php
rename to hphp/test/quick/closure_recursive_bad.php
diff --git a/hphp/test/vm/closure_recursive_bad.php.expectf b/hphp/test/quick/closure_recursive_bad.php.expectf
similarity index 100%
rename from hphp/test/vm/closure_recursive_bad.php.expectf
rename to hphp/test/quick/closure_recursive_bad.php.expectf
diff --git a/hphp/test/vm/closure_static.php b/hphp/test/quick/closure_static.php
similarity index 100%
rename from hphp/test/vm/closure_static.php
rename to hphp/test/quick/closure_static.php
diff --git a/hphp/test/vm/closure_static.php.expectf b/hphp/test/quick/closure_static.php.expectf
similarity index 100%
rename from hphp/test/vm/closure_static.php.expectf
rename to hphp/test/quick/closure_static.php.expectf
diff --git a/hphp/test/vm/clsconstant_redecl1.php b/hphp/test/quick/clsconstant_redecl1.php
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl1.php
rename to hphp/test/quick/clsconstant_redecl1.php
diff --git a/hphp/test/vm/clsconstant_redecl1.php.expectf b/hphp/test/quick/clsconstant_redecl1.php.expectf
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl1.php.expectf
rename to hphp/test/quick/clsconstant_redecl1.php.expectf
diff --git a/hphp/test/vm/clsconstant_redecl2.php b/hphp/test/quick/clsconstant_redecl2.php
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl2.php
rename to hphp/test/quick/clsconstant_redecl2.php
diff --git a/hphp/test/vm/clsconstant_redecl2.php.expectf b/hphp/test/quick/clsconstant_redecl2.php.expectf
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl2.php.expectf
rename to hphp/test/quick/clsconstant_redecl2.php.expectf
diff --git a/hphp/test/vm/clsconstant_redecl3.php b/hphp/test/quick/clsconstant_redecl3.php
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl3.php
rename to hphp/test/quick/clsconstant_redecl3.php
diff --git a/hphp/test/vm/clsconstant_redecl3.php.expectf b/hphp/test/quick/clsconstant_redecl3.php.expectf
similarity index 100%
rename from hphp/test/vm/clsconstant_redecl3.php.expectf
rename to hphp/test/quick/clsconstant_redecl3.php.expectf
diff --git a/hphp/test/vm/clsmethod-ctx.php b/hphp/test/quick/clsmethod-ctx.php
similarity index 100%
rename from hphp/test/vm/clsmethod-ctx.php
rename to hphp/test/quick/clsmethod-ctx.php
diff --git a/hphp/test/vm/clsmethod-ctx.php.expectf b/hphp/test/quick/clsmethod-ctx.php.expectf
similarity index 100%
rename from hphp/test/vm/clsmethod-ctx.php.expectf
rename to hphp/test/quick/clsmethod-ctx.php.expectf
diff --git a/hphp/test/vm/clsmethod-trait.php b/hphp/test/quick/clsmethod-trait.php
similarity index 100%
rename from hphp/test/vm/clsmethod-trait.php
rename to hphp/test/quick/clsmethod-trait.php
diff --git a/hphp/test/vm/clsmethod-trait.php.expectf b/hphp/test/quick/clsmethod-trait.php.expectf
similarity index 100%
rename from hphp/test/vm/clsmethod-trait.php.expectf
rename to hphp/test/quick/clsmethod-trait.php.expectf
diff --git a/hphp/test/vm/clsmethodf.php b/hphp/test/quick/clsmethodf.php
similarity index 100%
rename from hphp/test/vm/clsmethodf.php
rename to hphp/test/quick/clsmethodf.php
diff --git a/hphp/test/vm/clsmethodf.php.expectf b/hphp/test/quick/clsmethodf.php.expectf
similarity index 100%
rename from hphp/test/vm/clsmethodf.php.expectf
rename to hphp/test/quick/clsmethodf.php.expectf
diff --git a/hphp/test/vm/cmp.php b/hphp/test/quick/cmp.php
similarity index 100%
rename from hphp/test/vm/cmp.php
rename to hphp/test/quick/cmp.php
diff --git a/hphp/test/vm/cmp.php.expect b/hphp/test/quick/cmp.php.expect
similarity index 100%
rename from hphp/test/vm/cmp.php.expect
rename to hphp/test/quick/cmp.php.expect
diff --git a/hphp/test/vm/cnvArr.php b/hphp/test/quick/cnvArr.php
similarity index 100%
rename from hphp/test/vm/cnvArr.php
rename to hphp/test/quick/cnvArr.php
diff --git a/hphp/test/vm/cnvArr.php.expect b/hphp/test/quick/cnvArr.php.expect
similarity index 100%
rename from hphp/test/vm/cnvArr.php.expect
rename to hphp/test/quick/cnvArr.php.expect
diff --git a/hphp/test/vm/cnvBool.php b/hphp/test/quick/cnvBool.php
similarity index 100%
rename from hphp/test/vm/cnvBool.php
rename to hphp/test/quick/cnvBool.php
diff --git a/hphp/test/vm/cnvBool.php.expect b/hphp/test/quick/cnvBool.php.expect
similarity index 100%
rename from hphp/test/vm/cnvBool.php.expect
rename to hphp/test/quick/cnvBool.php.expect
diff --git a/hphp/test/vm/cnvDbl.php b/hphp/test/quick/cnvDbl.php
similarity index 100%
rename from hphp/test/vm/cnvDbl.php
rename to hphp/test/quick/cnvDbl.php
diff --git a/hphp/test/vm/cnvDbl.php.expectf b/hphp/test/quick/cnvDbl.php.expectf
similarity index 100%
rename from hphp/test/vm/cnvDbl.php.expectf
rename to hphp/test/quick/cnvDbl.php.expectf
diff --git a/hphp/test/vm/cnvInt.php b/hphp/test/quick/cnvInt.php
similarity index 100%
rename from hphp/test/vm/cnvInt.php
rename to hphp/test/quick/cnvInt.php
diff --git a/hphp/test/vm/cnvInt.php.expectf b/hphp/test/quick/cnvInt.php.expectf
similarity index 100%
rename from hphp/test/vm/cnvInt.php.expectf
rename to hphp/test/quick/cnvInt.php.expectf
diff --git a/hphp/test/vm/cnvObj.php b/hphp/test/quick/cnvObj.php
similarity index 100%
rename from hphp/test/vm/cnvObj.php
rename to hphp/test/quick/cnvObj.php
diff --git a/hphp/test/vm/cnvObj.php.expect b/hphp/test/quick/cnvObj.php.expect
similarity index 100%
rename from hphp/test/vm/cnvObj.php.expect
rename to hphp/test/quick/cnvObj.php.expect
diff --git a/hphp/test/vm/cnvStr.php b/hphp/test/quick/cnvStr.php
similarity index 100%
rename from hphp/test/vm/cnvStr.php
rename to hphp/test/quick/cnvStr.php
diff --git a/hphp/test/vm/cnvStr.php.expectf b/hphp/test/quick/cnvStr.php.expectf
similarity index 100%
rename from hphp/test/vm/cnvStr.php.expectf
rename to hphp/test/quick/cnvStr.php.expectf
diff --git a/hphp/test/vm/collection-initializer.php b/hphp/test/quick/collection-initializer.php
similarity index 100%
rename from hphp/test/vm/collection-initializer.php
rename to hphp/test/quick/collection-initializer.php
diff --git a/hphp/test/vm/collection-initializer.php.expect b/hphp/test/quick/collection-initializer.php.expect
similarity index 100%
rename from hphp/test/vm/collection-initializer.php.expect
rename to hphp/test/quick/collection-initializer.php.expect
diff --git a/hphp/test/vm/compact.php b/hphp/test/quick/compact.php
similarity index 100%
rename from hphp/test/vm/compact.php
rename to hphp/test/quick/compact.php
diff --git a/hphp/test/vm/compact.php.expect b/hphp/test/quick/compact.php.expect
similarity index 100%
rename from hphp/test/vm/compact.php.expect
rename to hphp/test/quick/compact.php.expect
diff --git a/hphp/test/vm/concat.php b/hphp/test/quick/concat.php
similarity index 100%
rename from hphp/test/vm/concat.php
rename to hphp/test/quick/concat.php
diff --git a/hphp/test/vm/concat.php.expect b/hphp/test/quick/concat.php.expect
similarity index 100%
rename from hphp/test/vm/concat.php.expect
rename to hphp/test/quick/concat.php.expect
diff --git a/hphp/test/quick/condinfinite.php b/hphp/test/quick/condinfinite.php
new file mode 100644
index 000000000..094eca817
--- /dev/null
+++ b/hphp/test/quick/condinfinite.php
@@ -0,0 +1,16 @@
+<?php
+
+function main() {
+  if(true) {
+    for(; ;) {
+      for(; ;) { }
+    }
+  } else {
+    for(; ;) {
+      for(; ;) { }
+    }
+  }
+
+}
+main();
+
diff --git a/hphp/test/quick/condinfinite2.php b/hphp/test/quick/condinfinite2.php
new file mode 100644
index 000000000..48babd6db
--- /dev/null
+++ b/hphp/test/quick/condinfinite2.php
@@ -0,0 +1,9 @@
+<?php
+
+function main() {
+  for($i = 0; $i < 10;) {
+    if(true) {
+      $i++;
+    }
+  }
+}
diff --git a/hphp/test/vm/constIntToString.php b/hphp/test/quick/constIntToString.php
similarity index 100%
rename from hphp/test/vm/constIntToString.php
rename to hphp/test/quick/constIntToString.php
diff --git a/hphp/test/vm/constIntToString.php.expect b/hphp/test/quick/constIntToString.php.expect
similarity index 100%
rename from hphp/test/vm/constIntToString.php.expect
rename to hphp/test/quick/constIntToString.php.expect
diff --git a/hphp/test/vm/const_cflow.php b/hphp/test/quick/const_cflow.php
similarity index 100%
rename from hphp/test/vm/const_cflow.php
rename to hphp/test/quick/const_cflow.php
diff --git a/hphp/test/vm/const_cflow.php.expect b/hphp/test/quick/const_cflow.php.expect
similarity index 100%
rename from hphp/test/vm/const_cflow.php.expect
rename to hphp/test/quick/const_cflow.php.expect
diff --git a/hphp/test/vm/constants.php b/hphp/test/quick/constants.php
similarity index 100%
rename from hphp/test/vm/constants.php
rename to hphp/test/quick/constants.php
diff --git a/hphp/test/vm/constants.php.expectf b/hphp/test/quick/constants.php.expectf
similarity index 100%
rename from hphp/test/vm/constants.php.expectf
rename to hphp/test/quick/constants.php.expectf
diff --git a/hphp/test/vm/continuation-funcname.php b/hphp/test/quick/continuation-funcname.php
similarity index 100%
rename from hphp/test/vm/continuation-funcname.php
rename to hphp/test/quick/continuation-funcname.php
diff --git a/hphp/test/vm/continuation-funcname.php.expect b/hphp/test/quick/continuation-funcname.php.expect
similarity index 100%
rename from hphp/test/vm/continuation-funcname.php.expect
rename to hphp/test/quick/continuation-funcname.php.expect
diff --git a/hphp/test/vm/continuation_inherit.php b/hphp/test/quick/continuation_inherit.php
similarity index 100%
rename from hphp/test/vm/continuation_inherit.php
rename to hphp/test/quick/continuation_inherit.php
diff --git a/hphp/test/vm/continuation_inherit.php.expectf b/hphp/test/quick/continuation_inherit.php.expectf
similarity index 100%
rename from hphp/test/vm/continuation_inherit.php.expectf
rename to hphp/test/quick/continuation_inherit.php.expectf
diff --git a/hphp/test/vm/continue.php b/hphp/test/quick/continue.php
similarity index 100%
rename from hphp/test/vm/continue.php
rename to hphp/test/quick/continue.php
diff --git a/hphp/test/vm/continue.php.expect b/hphp/test/quick/continue.php.expect
similarity index 100%
rename from hphp/test/vm/continue.php.expect
rename to hphp/test/quick/continue.php.expect
diff --git a/hphp/test/vm/countable.php b/hphp/test/quick/countable.php
similarity index 100%
rename from hphp/test/vm/countable.php
rename to hphp/test/quick/countable.php
diff --git a/hphp/test/vm/countable.php.expect b/hphp/test/quick/countable.php.expect
similarity index 100%
rename from hphp/test/vm/countable.php.expect
rename to hphp/test/quick/countable.php.expect
diff --git a/hphp/test/vm/coverage.php b/hphp/test/quick/coverage.php
similarity index 100%
rename from hphp/test/vm/coverage.php
rename to hphp/test/quick/coverage.php
diff --git a/hphp/test/vm/coverage.php.expectf b/hphp/test/quick/coverage.php.expectf
similarity index 100%
rename from hphp/test/vm/coverage.php.expectf
rename to hphp/test/quick/coverage.php.expectf
diff --git a/hphp/test/vm/create_function.php b/hphp/test/quick/create_function.php
similarity index 100%
rename from hphp/test/vm/create_function.php
rename to hphp/test/quick/create_function.php
diff --git a/hphp/test/vm/create_function.php.expect b/hphp/test/quick/create_function.php.expect
similarity index 100%
rename from hphp/test/vm/create_function.php.expect
rename to hphp/test/quick/create_function.php.expect
diff --git a/hphp/test/vm/crossUnitRefs.php b/hphp/test/quick/crossUnitRefs.php
similarity index 100%
rename from hphp/test/vm/crossUnitRefs.php
rename to hphp/test/quick/crossUnitRefs.php
diff --git a/hphp/test/vm/crossUnitRefs.php.expect b/hphp/test/quick/crossUnitRefs.php.expect
similarity index 100%
rename from hphp/test/vm/crossUnitRefs.php.expect
rename to hphp/test/quick/crossUnitRefs.php.expect
diff --git a/hphp/test/vm/crossUnitRefsInc.php b/hphp/test/quick/crossUnitRefsInc.php
similarity index 100%
rename from hphp/test/vm/crossUnitRefsInc.php
rename to hphp/test/quick/crossUnitRefsInc.php
diff --git a/hphp/test/tcr/array_assignment/512.php.expect b/hphp/test/quick/crossUnitRefsInc.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/512.php.expect
rename to hphp/test/quick/crossUnitRefsInc.php.expect
diff --git a/hphp/test/vm/cuf-call10.php b/hphp/test/quick/cuf-call10.php
similarity index 100%
rename from hphp/test/vm/cuf-call10.php
rename to hphp/test/quick/cuf-call10.php
diff --git a/hphp/test/vm/cuf-call10.php.expectf b/hphp/test/quick/cuf-call10.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf-call10.php.expectf
rename to hphp/test/quick/cuf-call10.php.expectf
diff --git a/hphp/test/vm/cuf-call11.php b/hphp/test/quick/cuf-call11.php
similarity index 100%
rename from hphp/test/vm/cuf-call11.php
rename to hphp/test/quick/cuf-call11.php
diff --git a/hphp/test/vm/cuf-call11.php.expectf b/hphp/test/quick/cuf-call11.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf-call11.php.expectf
rename to hphp/test/quick/cuf-call11.php.expectf
diff --git a/hphp/test/vm/cuf.php b/hphp/test/quick/cuf.php
similarity index 100%
rename from hphp/test/vm/cuf.php
rename to hphp/test/quick/cuf.php
diff --git a/hphp/test/vm/cuf.php.expectf b/hphp/test/quick/cuf.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf.php.expectf
rename to hphp/test/quick/cuf.php.expectf
diff --git a/hphp/test/vm/cuf01.php b/hphp/test/quick/cuf01.php
similarity index 100%
rename from hphp/test/vm/cuf01.php
rename to hphp/test/quick/cuf01.php
diff --git a/hphp/test/vm/cuf01.php.expect b/hphp/test/quick/cuf01.php.expect
similarity index 100%
rename from hphp/test/vm/cuf01.php.expect
rename to hphp/test/quick/cuf01.php.expect
diff --git a/hphp/test/vm/cuf02.php b/hphp/test/quick/cuf02.php
similarity index 100%
rename from hphp/test/vm/cuf02.php
rename to hphp/test/quick/cuf02.php
diff --git a/hphp/test/vm/cuf02.php.expect b/hphp/test/quick/cuf02.php.expect
similarity index 100%
rename from hphp/test/vm/cuf02.php.expect
rename to hphp/test/quick/cuf02.php.expect
diff --git a/hphp/test/vm/cuf03.php b/hphp/test/quick/cuf03.php
similarity index 100%
rename from hphp/test/vm/cuf03.php
rename to hphp/test/quick/cuf03.php
diff --git a/hphp/test/vm/cuf03.php.expectf b/hphp/test/quick/cuf03.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf03.php.expectf
rename to hphp/test/quick/cuf03.php.expectf
diff --git a/hphp/test/vm/cuf04.php b/hphp/test/quick/cuf04.php
similarity index 100%
rename from hphp/test/vm/cuf04.php
rename to hphp/test/quick/cuf04.php
diff --git a/hphp/test/vm/cuf04.php.expectf b/hphp/test/quick/cuf04.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf04.php.expectf
rename to hphp/test/quick/cuf04.php.expectf
diff --git a/hphp/test/vm/cuf05.php b/hphp/test/quick/cuf05.php
similarity index 100%
rename from hphp/test/vm/cuf05.php
rename to hphp/test/quick/cuf05.php
diff --git a/hphp/test/vm/cuf05.php.expectf b/hphp/test/quick/cuf05.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf05.php.expectf
rename to hphp/test/quick/cuf05.php.expectf
diff --git a/hphp/test/vm/cuf06.php b/hphp/test/quick/cuf06.php
similarity index 100%
rename from hphp/test/vm/cuf06.php
rename to hphp/test/quick/cuf06.php
diff --git a/hphp/test/vm/cuf06.php.expect b/hphp/test/quick/cuf06.php.expect
similarity index 100%
rename from hphp/test/vm/cuf06.php.expect
rename to hphp/test/quick/cuf06.php.expect
diff --git a/hphp/test/vm/cuf07.php b/hphp/test/quick/cuf07.php
similarity index 100%
rename from hphp/test/vm/cuf07.php
rename to hphp/test/quick/cuf07.php
diff --git a/hphp/test/vm/cuf07.php.expect b/hphp/test/quick/cuf07.php.expect
similarity index 100%
rename from hphp/test/vm/cuf07.php.expect
rename to hphp/test/quick/cuf07.php.expect
diff --git a/hphp/test/vm/cuf__callStatic1.php b/hphp/test/quick/cuf__callStatic1.php
similarity index 100%
rename from hphp/test/vm/cuf__callStatic1.php
rename to hphp/test/quick/cuf__callStatic1.php
diff --git a/hphp/test/vm/cuf__callStatic1.php.expectf b/hphp/test/quick/cuf__callStatic1.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf__callStatic1.php.expectf
rename to hphp/test/quick/cuf__callStatic1.php.expectf
diff --git a/hphp/test/vm/cuf__callStatic2.php b/hphp/test/quick/cuf__callStatic2.php
similarity index 100%
rename from hphp/test/vm/cuf__callStatic2.php
rename to hphp/test/quick/cuf__callStatic2.php
diff --git a/hphp/test/vm/cuf__callStatic2.php.expect b/hphp/test/quick/cuf__callStatic2.php.expect
similarity index 100%
rename from hphp/test/vm/cuf__callStatic2.php.expect
rename to hphp/test/quick/cuf__callStatic2.php.expect
diff --git a/hphp/test/vm/cuf__callStatic3.php b/hphp/test/quick/cuf__callStatic3.php
similarity index 100%
rename from hphp/test/vm/cuf__callStatic3.php
rename to hphp/test/quick/cuf__callStatic3.php
diff --git a/hphp/test/vm/cuf__callStatic3.php.expect b/hphp/test/quick/cuf__callStatic3.php.expect
similarity index 100%
rename from hphp/test/vm/cuf__callStatic3.php.expect
rename to hphp/test/quick/cuf__callStatic3.php.expect
diff --git a/hphp/test/vm/cuf__callStatic4.php b/hphp/test/quick/cuf__callStatic4.php
similarity index 100%
rename from hphp/test/vm/cuf__callStatic4.php
rename to hphp/test/quick/cuf__callStatic4.php
diff --git a/hphp/test/vm/cuf__callStatic4.php.expectf b/hphp/test/quick/cuf__callStatic4.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf__callStatic4.php.expectf
rename to hphp/test/quick/cuf__callStatic4.php.expectf
diff --git a/hphp/test/vm/cuf__callStatic5.php b/hphp/test/quick/cuf__callStatic5.php
similarity index 100%
rename from hphp/test/vm/cuf__callStatic5.php
rename to hphp/test/quick/cuf__callStatic5.php
diff --git a/hphp/test/vm/cuf__callStatic5.php.expectf b/hphp/test/quick/cuf__callStatic5.php.expectf
similarity index 100%
rename from hphp/test/vm/cuf__callStatic5.php.expectf
rename to hphp/test/quick/cuf__callStatic5.php.expectf
diff --git a/hphp/test/vm/datetime.php b/hphp/test/quick/datetime.php
similarity index 100%
rename from hphp/test/vm/datetime.php
rename to hphp/test/quick/datetime.php
diff --git a/hphp/test/vm/datetime.php.expect b/hphp/test/quick/datetime.php.expect
similarity index 100%
rename from hphp/test/vm/datetime.php.expect
rename to hphp/test/quick/datetime.php.expect
diff --git a/hphp/test/vm/debug_backtrace.php b/hphp/test/quick/debug_backtrace.php
similarity index 100%
rename from hphp/test/vm/debug_backtrace.php
rename to hphp/test/quick/debug_backtrace.php
diff --git a/hphp/test/vm/debug_backtrace.php.expectf b/hphp/test/quick/debug_backtrace.php.expectf
similarity index 100%
rename from hphp/test/vm/debug_backtrace.php.expectf
rename to hphp/test/quick/debug_backtrace.php.expectf
diff --git a/hphp/test/vm/debug_backtrace_continuation.php b/hphp/test/quick/debug_backtrace_continuation.php
similarity index 100%
rename from hphp/test/vm/debug_backtrace_continuation.php
rename to hphp/test/quick/debug_backtrace_continuation.php
diff --git a/hphp/test/vm/debug_backtrace_continuation.php.expectf b/hphp/test/quick/debug_backtrace_continuation.php.expectf
similarity index 100%
rename from hphp/test/vm/debug_backtrace_continuation.php.expectf
rename to hphp/test/quick/debug_backtrace_continuation.php.expectf
diff --git a/hphp/test/vm/dec-minint.php b/hphp/test/quick/dec-minint.php
similarity index 100%
rename from hphp/test/vm/dec-minint.php
rename to hphp/test/quick/dec-minint.php
diff --git a/hphp/test/vm/dec-minint.php.expect b/hphp/test/quick/dec-minint.php.expect
similarity index 100%
rename from hphp/test/vm/dec-minint.php.expect
rename to hphp/test/quick/dec-minint.php.expect
diff --git a/hphp/test/vm/decrefstack1.php b/hphp/test/quick/decrefstack1.php
similarity index 100%
rename from hphp/test/vm/decrefstack1.php
rename to hphp/test/quick/decrefstack1.php
diff --git a/hphp/test/vm/decrefstack1.php.expect b/hphp/test/quick/decrefstack1.php.expect
similarity index 100%
rename from hphp/test/vm/decrefstack1.php.expect
rename to hphp/test/quick/decrefstack1.php.expect
diff --git a/hphp/test/vm/def_cls_line.php b/hphp/test/quick/def_cls_line.php
similarity index 100%
rename from hphp/test/vm/def_cls_line.php
rename to hphp/test/quick/def_cls_line.php
diff --git a/hphp/test/vm/def_cls_line.php.expectf b/hphp/test/quick/def_cls_line.php.expectf
similarity index 100%
rename from hphp/test/vm/def_cls_line.php.expectf
rename to hphp/test/quick/def_cls_line.php.expectf
diff --git a/hphp/test/vm/defaultVals.php b/hphp/test/quick/defaultVals.php
similarity index 100%
rename from hphp/test/vm/defaultVals.php
rename to hphp/test/quick/defaultVals.php
diff --git a/hphp/test/vm/defaultVals.php.expect b/hphp/test/quick/defaultVals.php.expect
similarity index 100%
rename from hphp/test/vm/defaultVals.php.expect
rename to hphp/test/quick/defaultVals.php.expect
diff --git a/hphp/test/vm/define.php b/hphp/test/quick/define.php
similarity index 100%
rename from hphp/test/vm/define.php
rename to hphp/test/quick/define.php
diff --git a/hphp/test/vm/define.php.expectf b/hphp/test/quick/define.php.expectf
similarity index 100%
rename from hphp/test/vm/define.php.expectf
rename to hphp/test/quick/define.php.expectf
diff --git a/hphp/test/quick/define_b.php b/hphp/test/quick/define_b.php
new file mode 100644
index 000000000..a9645619a
--- /dev/null
+++ b/hphp/test/quick/define_b.php
@@ -0,0 +1,10 @@
+<?php
+
+print "=== Enter define_b.php ===\n";
+
+define('BAZ', "baz_b");
+
+var_dump(FOO);
+var_dump(BAZ);
+
+print "=== Leave define_b.php ===\n";
diff --git a/hphp/test/vm/destruct.php b/hphp/test/quick/destruct.php
similarity index 100%
rename from hphp/test/vm/destruct.php
rename to hphp/test/quick/destruct.php
diff --git a/hphp/test/vm/destruct.php.expect b/hphp/test/quick/destruct.php.expect
similarity index 100%
rename from hphp/test/vm/destruct.php.expect
rename to hphp/test/quick/destruct.php.expect
diff --git a/hphp/test/vm/destructed_this.php b/hphp/test/quick/destructed_this.php
similarity index 100%
rename from hphp/test/vm/destructed_this.php
rename to hphp/test/quick/destructed_this.php
diff --git a/hphp/test/vm/destructed_this.php.expectf b/hphp/test/quick/destructed_this.php.expectf
similarity index 100%
rename from hphp/test/vm/destructed_this.php.expectf
rename to hphp/test/quick/destructed_this.php.expectf
diff --git a/hphp/test/vm/do-while-continue.php b/hphp/test/quick/do-while-continue.php
similarity index 100%
rename from hphp/test/vm/do-while-continue.php
rename to hphp/test/quick/do-while-continue.php
diff --git a/hphp/test/vm/do-while-continue.php.expect b/hphp/test/quick/do-while-continue.php.expect
similarity index 100%
rename from hphp/test/vm/do-while-continue.php.expect
rename to hphp/test/quick/do-while-continue.php.expect
diff --git a/hphp/test/vm/doublejump.php b/hphp/test/quick/doublejump.php
similarity index 100%
rename from hphp/test/vm/doublejump.php
rename to hphp/test/quick/doublejump.php
diff --git a/hphp/test/tcr/array_cse/544.php.expect b/hphp/test/quick/doublejump.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/544.php.expect
rename to hphp/test/quick/doublejump.php.expect
diff --git a/hphp/test/vm/dtor-on-arr.php b/hphp/test/quick/dtor-on-arr.php
similarity index 100%
rename from hphp/test/vm/dtor-on-arr.php
rename to hphp/test/quick/dtor-on-arr.php
diff --git a/hphp/test/vm/dtor-on-arr.php.expect b/hphp/test/quick/dtor-on-arr.php.expect
similarity index 100%
rename from hphp/test/vm/dtor-on-arr.php.expect
rename to hphp/test/quick/dtor-on-arr.php.expect
diff --git a/hphp/test/vm/dv.php b/hphp/test/quick/dv.php
similarity index 100%
rename from hphp/test/vm/dv.php
rename to hphp/test/quick/dv.php
diff --git a/hphp/test/vm/dv.php.expect b/hphp/test/quick/dv.php.expect
similarity index 100%
rename from hphp/test/vm/dv.php.expect
rename to hphp/test/quick/dv.php.expect
diff --git a/hphp/test/vm/dv_ab.php b/hphp/test/quick/dv_ab.php
similarity index 100%
rename from hphp/test/vm/dv_ab.php
rename to hphp/test/quick/dv_ab.php
diff --git a/hphp/test/vm/dv_ab.php.expectf b/hphp/test/quick/dv_ab.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ab.php.expectf
rename to hphp/test/quick/dv_ab.php.expectf
diff --git a/hphp/test/vm/dv_af.php b/hphp/test/quick/dv_af.php
similarity index 100%
rename from hphp/test/vm/dv_af.php
rename to hphp/test/quick/dv_af.php
diff --git a/hphp/test/vm/dv_af.php.expectf b/hphp/test/quick/dv_af.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_af.php.expectf
rename to hphp/test/quick/dv_af.php.expectf
diff --git a/hphp/test/vm/dv_ai.php b/hphp/test/quick/dv_ai.php
similarity index 100%
rename from hphp/test/vm/dv_ai.php
rename to hphp/test/quick/dv_ai.php
diff --git a/hphp/test/vm/dv_ai.php.expectf b/hphp/test/quick/dv_ai.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ai.php.expectf
rename to hphp/test/quick/dv_ai.php.expectf
diff --git a/hphp/test/vm/dv_as.php b/hphp/test/quick/dv_as.php
similarity index 100%
rename from hphp/test/vm/dv_as.php
rename to hphp/test/quick/dv_as.php
diff --git a/hphp/test/vm/dv_as.php.expectf b/hphp/test/quick/dv_as.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_as.php.expectf
rename to hphp/test/quick/dv_as.php.expectf
diff --git a/hphp/test/vm/dv_ba.php b/hphp/test/quick/dv_ba.php
similarity index 100%
rename from hphp/test/vm/dv_ba.php
rename to hphp/test/quick/dv_ba.php
diff --git a/hphp/test/vm/dv_ba.php.expectf b/hphp/test/quick/dv_ba.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ba.php.expectf
rename to hphp/test/quick/dv_ba.php.expectf
diff --git a/hphp/test/vm/dv_bf.php b/hphp/test/quick/dv_bf.php
similarity index 100%
rename from hphp/test/vm/dv_bf.php
rename to hphp/test/quick/dv_bf.php
diff --git a/hphp/test/vm/dv_bf.php.expectf b/hphp/test/quick/dv_bf.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_bf.php.expectf
rename to hphp/test/quick/dv_bf.php.expectf
diff --git a/hphp/test/vm/dv_bi.php b/hphp/test/quick/dv_bi.php
similarity index 100%
rename from hphp/test/vm/dv_bi.php
rename to hphp/test/quick/dv_bi.php
diff --git a/hphp/test/vm/dv_bi.php.expectf b/hphp/test/quick/dv_bi.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_bi.php.expectf
rename to hphp/test/quick/dv_bi.php.expectf
diff --git a/hphp/test/vm/dv_bs.php b/hphp/test/quick/dv_bs.php
similarity index 100%
rename from hphp/test/vm/dv_bs.php
rename to hphp/test/quick/dv_bs.php
diff --git a/hphp/test/vm/dv_bs.php.expectf b/hphp/test/quick/dv_bs.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_bs.php.expectf
rename to hphp/test/quick/dv_bs.php.expectf
diff --git a/hphp/test/vm/dv_ca.php b/hphp/test/quick/dv_ca.php
similarity index 100%
rename from hphp/test/vm/dv_ca.php
rename to hphp/test/quick/dv_ca.php
diff --git a/hphp/test/vm/dv_ca.php.expectf b/hphp/test/quick/dv_ca.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ca.php.expectf
rename to hphp/test/quick/dv_ca.php.expectf
diff --git a/hphp/test/vm/dv_ci.php b/hphp/test/quick/dv_ci.php
similarity index 100%
rename from hphp/test/vm/dv_ci.php
rename to hphp/test/quick/dv_ci.php
diff --git a/hphp/test/vm/dv_ci.php.expectf b/hphp/test/quick/dv_ci.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ci.php.expectf
rename to hphp/test/quick/dv_ci.php.expectf
diff --git a/hphp/test/vm/dv_i0.php b/hphp/test/quick/dv_i0.php
similarity index 100%
rename from hphp/test/vm/dv_i0.php
rename to hphp/test/quick/dv_i0.php
diff --git a/hphp/test/vm/dv_i0.php.expectf b/hphp/test/quick/dv_i0.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_i0.php.expectf
rename to hphp/test/quick/dv_i0.php.expectf
diff --git a/hphp/test/vm/dv_ia.php b/hphp/test/quick/dv_ia.php
similarity index 100%
rename from hphp/test/vm/dv_ia.php
rename to hphp/test/quick/dv_ia.php
diff --git a/hphp/test/vm/dv_ia.php.expectf b/hphp/test/quick/dv_ia.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ia.php.expectf
rename to hphp/test/quick/dv_ia.php.expectf
diff --git a/hphp/test/vm/dv_ib.php b/hphp/test/quick/dv_ib.php
similarity index 100%
rename from hphp/test/vm/dv_ib.php
rename to hphp/test/quick/dv_ib.php
diff --git a/hphp/test/vm/dv_ib.php.expectf b/hphp/test/quick/dv_ib.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_ib.php.expectf
rename to hphp/test/quick/dv_ib.php.expectf
diff --git a/hphp/test/vm/dv_if.php b/hphp/test/quick/dv_if.php
similarity index 100%
rename from hphp/test/vm/dv_if.php
rename to hphp/test/quick/dv_if.php
diff --git a/hphp/test/vm/dv_if.php.expectf b/hphp/test/quick/dv_if.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_if.php.expectf
rename to hphp/test/quick/dv_if.php.expectf
diff --git a/hphp/test/vm/dv_is.php b/hphp/test/quick/dv_is.php
similarity index 100%
rename from hphp/test/vm/dv_is.php
rename to hphp/test/quick/dv_is.php
diff --git a/hphp/test/vm/dv_is.php.expectf b/hphp/test/quick/dv_is.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_is.php.expectf
rename to hphp/test/quick/dv_is.php.expectf
diff --git a/hphp/test/vm/dv_si.php b/hphp/test/quick/dv_si.php
similarity index 100%
rename from hphp/test/vm/dv_si.php
rename to hphp/test/quick/dv_si.php
diff --git a/hphp/test/vm/dv_si.php.expectf b/hphp/test/quick/dv_si.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_si.php.expectf
rename to hphp/test/quick/dv_si.php.expectf
diff --git a/hphp/test/vm/dv_si_func.php b/hphp/test/quick/dv_si_func.php
similarity index 100%
rename from hphp/test/vm/dv_si_func.php
rename to hphp/test/quick/dv_si_func.php
diff --git a/hphp/test/vm/dv_si_func.php.expectf b/hphp/test/quick/dv_si_func.php.expectf
similarity index 100%
rename from hphp/test/vm/dv_si_func.php.expectf
rename to hphp/test/quick/dv_si_func.php.expectf
diff --git a/hphp/test/vm/echo.php b/hphp/test/quick/echo.php
similarity index 100%
rename from hphp/test/vm/echo.php
rename to hphp/test/quick/echo.php
diff --git a/hphp/test/vm/echo.php.expect b/hphp/test/quick/echo.php.expect
similarity index 100%
rename from hphp/test/vm/echo.php.expect
rename to hphp/test/quick/echo.php.expect
diff --git a/hphp/test/vm/encapslist.php b/hphp/test/quick/encapslist.php
similarity index 100%
rename from hphp/test/vm/encapslist.php
rename to hphp/test/quick/encapslist.php
diff --git a/hphp/test/vm/encapslist.php.expect b/hphp/test/quick/encapslist.php.expect
similarity index 100%
rename from hphp/test/vm/encapslist.php.expect
rename to hphp/test/quick/encapslist.php.expect
diff --git a/hphp/test/vm/end_bb_on_popc.php b/hphp/test/quick/end_bb_on_popc.php
similarity index 100%
rename from hphp/test/vm/end_bb_on_popc.php
rename to hphp/test/quick/end_bb_on_popc.php
diff --git a/hphp/test/vm/end_bb_on_popc.php.expect b/hphp/test/quick/end_bb_on_popc.php.expect
similarity index 100%
rename from hphp/test/vm/end_bb_on_popc.php.expect
rename to hphp/test/quick/end_bb_on_popc.php.expect
diff --git a/hphp/test/vm/enormous-string.php b/hphp/test/quick/enormous-string.php
similarity index 100%
rename from hphp/test/vm/enormous-string.php
rename to hphp/test/quick/enormous-string.php
diff --git a/hphp/test/vm/enormous-string.php.expectf b/hphp/test/quick/enormous-string.php.expectf
similarity index 100%
rename from hphp/test/vm/enormous-string.php.expectf
rename to hphp/test/quick/enormous-string.php.expectf
diff --git a/hphp/test/vm/eq_int_str.php b/hphp/test/quick/eq_int_str.php
similarity index 100%
rename from hphp/test/vm/eq_int_str.php
rename to hphp/test/quick/eq_int_str.php
diff --git a/hphp/test/vm/eq_int_str.php.expect b/hphp/test/quick/eq_int_str.php.expect
similarity index 100%
rename from hphp/test/vm/eq_int_str.php.expect
rename to hphp/test/quick/eq_int_str.php.expect
diff --git a/hphp/test/vm/eval.php b/hphp/test/quick/eval.php
similarity index 100%
rename from hphp/test/vm/eval.php
rename to hphp/test/quick/eval.php
diff --git a/hphp/test/vm/eval.php.expect b/hphp/test/quick/eval.php.expect
similarity index 100%
rename from hphp/test/vm/eval.php.expect
rename to hphp/test/quick/eval.php.expect
diff --git a/hphp/test/vm/exception_bug_1351681.php b/hphp/test/quick/exception_bug_1351681.php
similarity index 100%
rename from hphp/test/vm/exception_bug_1351681.php
rename to hphp/test/quick/exception_bug_1351681.php
diff --git a/hphp/test/vm/exception_bug_1351681.php.expect b/hphp/test/quick/exception_bug_1351681.php.expect
similarity index 100%
rename from hphp/test/vm/exception_bug_1351681.php.expect
rename to hphp/test/quick/exception_bug_1351681.php.expect
diff --git a/hphp/test/vm/exception_bug_2080454.php b/hphp/test/quick/exception_bug_2080454.php
similarity index 100%
rename from hphp/test/vm/exception_bug_2080454.php
rename to hphp/test/quick/exception_bug_2080454.php
diff --git a/hphp/test/vm/exception_bug_2080454.php.expect b/hphp/test/quick/exception_bug_2080454.php.expect
similarity index 100%
rename from hphp/test/vm/exception_bug_2080454.php.expect
rename to hphp/test/quick/exception_bug_2080454.php.expect
diff --git a/hphp/test/vm/exception_bug_more.php b/hphp/test/quick/exception_bug_more.php
similarity index 100%
rename from hphp/test/vm/exception_bug_more.php
rename to hphp/test/quick/exception_bug_more.php
diff --git a/hphp/test/vm/exception_bug_more.php.expect b/hphp/test/quick/exception_bug_more.php.expect
similarity index 100%
rename from hphp/test/vm/exception_bug_more.php.expect
rename to hphp/test/quick/exception_bug_more.php.expect
diff --git a/hphp/test/vm/exception_handler.php b/hphp/test/quick/exception_handler.php
similarity index 100%
rename from hphp/test/vm/exception_handler.php
rename to hphp/test/quick/exception_handler.php
diff --git a/hphp/test/vm/exception_handler.php.expectf b/hphp/test/quick/exception_handler.php.expectf
similarity index 100%
rename from hphp/test/vm/exception_handler.php.expectf
rename to hphp/test/quick/exception_handler.php.expectf
diff --git a/hphp/test/vm/exception_many_locals.php b/hphp/test/quick/exception_many_locals.php
similarity index 100%
rename from hphp/test/vm/exception_many_locals.php
rename to hphp/test/quick/exception_many_locals.php
diff --git a/hphp/test/vm/exception_many_locals.php.expect b/hphp/test/quick/exception_many_locals.php.expect
similarity index 100%
rename from hphp/test/vm/exception_many_locals.php.expect
rename to hphp/test/quick/exception_many_locals.php.expect
diff --git a/hphp/test/vm/exceptions.php b/hphp/test/quick/exceptions.php
similarity index 100%
rename from hphp/test/vm/exceptions.php
rename to hphp/test/quick/exceptions.php
diff --git a/hphp/test/vm/exceptions.php.expectf b/hphp/test/quick/exceptions.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions.php.expectf
rename to hphp/test/quick/exceptions.php.expectf
diff --git a/hphp/test/vm/exceptions2.php b/hphp/test/quick/exceptions2.php
similarity index 100%
rename from hphp/test/vm/exceptions2.php
rename to hphp/test/quick/exceptions2.php
diff --git a/hphp/test/vm/exceptions2.php.expectf b/hphp/test/quick/exceptions2.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions2.php.expectf
rename to hphp/test/quick/exceptions2.php.expectf
diff --git a/hphp/test/vm/exceptions3.php b/hphp/test/quick/exceptions3.php
similarity index 100%
rename from hphp/test/vm/exceptions3.php
rename to hphp/test/quick/exceptions3.php
diff --git a/hphp/test/vm/exceptions3.php.expectf b/hphp/test/quick/exceptions3.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions3.php.expectf
rename to hphp/test/quick/exceptions3.php.expectf
diff --git a/hphp/test/vm/exceptions4.php b/hphp/test/quick/exceptions4.php
similarity index 100%
rename from hphp/test/vm/exceptions4.php
rename to hphp/test/quick/exceptions4.php
diff --git a/hphp/test/vm/exceptions4.php.expectf b/hphp/test/quick/exceptions4.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions4.php.expectf
rename to hphp/test/quick/exceptions4.php.expectf
diff --git a/hphp/test/vm/exceptions5.php b/hphp/test/quick/exceptions5.php
similarity index 100%
rename from hphp/test/vm/exceptions5.php
rename to hphp/test/quick/exceptions5.php
diff --git a/hphp/test/vm/exceptions5.php.expectf b/hphp/test/quick/exceptions5.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions5.php.expectf
rename to hphp/test/quick/exceptions5.php.expectf
diff --git a/hphp/test/vm/exceptions6.php b/hphp/test/quick/exceptions6.php
similarity index 100%
rename from hphp/test/vm/exceptions6.php
rename to hphp/test/quick/exceptions6.php
diff --git a/hphp/test/vm/exceptions6.php.expectf b/hphp/test/quick/exceptions6.php.expectf
similarity index 100%
rename from hphp/test/vm/exceptions6.php.expectf
rename to hphp/test/quick/exceptions6.php.expectf
diff --git a/hphp/test/vm/exceptions7.php b/hphp/test/quick/exceptions7.php
similarity index 100%
rename from hphp/test/vm/exceptions7.php
rename to hphp/test/quick/exceptions7.php
diff --git a/hphp/test/vm/exceptions7.php.expect b/hphp/test/quick/exceptions7.php.expect
similarity index 100%
rename from hphp/test/vm/exceptions7.php.expect
rename to hphp/test/quick/exceptions7.php.expect
diff --git a/hphp/test/vm/exceptions8.php b/hphp/test/quick/exceptions8.php
similarity index 100%
rename from hphp/test/vm/exceptions8.php
rename to hphp/test/quick/exceptions8.php
diff --git a/hphp/test/vm/exceptions8.php.expect b/hphp/test/quick/exceptions8.php.expect
similarity index 100%
rename from hphp/test/vm/exceptions8.php.expect
rename to hphp/test/quick/exceptions8.php.expect
diff --git a/hphp/test/vm/exit.php b/hphp/test/quick/exit.php
similarity index 100%
rename from hphp/test/vm/exit.php
rename to hphp/test/quick/exit.php
diff --git a/hphp/test/tcr/array_init/246.php.expect b/hphp/test/quick/exit.php.expect
similarity index 100%
rename from hphp/test/tcr/array_init/246.php.expect
rename to hphp/test/quick/exit.php.expect
diff --git a/hphp/test/vm/ext.php b/hphp/test/quick/ext.php
similarity index 100%
rename from hphp/test/vm/ext.php
rename to hphp/test/quick/ext.php
diff --git a/hphp/test/vm/ext.php.expect b/hphp/test/quick/ext.php.expect
similarity index 100%
rename from hphp/test/vm/ext.php.expect
rename to hphp/test/quick/ext.php.expect
diff --git a/hphp/test/vm/extclscns.php b/hphp/test/quick/extclscns.php
similarity index 100%
rename from hphp/test/vm/extclscns.php
rename to hphp/test/quick/extclscns.php
diff --git a/hphp/test/vm/extclscns.php.expect b/hphp/test/quick/extclscns.php.expect
similarity index 100%
rename from hphp/test/vm/extclscns.php.expect
rename to hphp/test/quick/extclscns.php.expect
diff --git a/hphp/test/vm/extension_null_check.php b/hphp/test/quick/extension_null_check.php
similarity index 100%
rename from hphp/test/vm/extension_null_check.php
rename to hphp/test/quick/extension_null_check.php
diff --git a/hphp/test/vm/extension_null_check.php.expect b/hphp/test/quick/extension_null_check.php.expect
similarity index 100%
rename from hphp/test/vm/extension_null_check.php.expect
rename to hphp/test/quick/extension_null_check.php.expect
diff --git a/hphp/test/vm/extract.php b/hphp/test/quick/extract.php
similarity index 100%
rename from hphp/test/vm/extract.php
rename to hphp/test/quick/extract.php
diff --git a/hphp/test/vm/extract.php.expect b/hphp/test/quick/extract.php.expect
similarity index 100%
rename from hphp/test/vm/extract.php.expect
rename to hphp/test/quick/extract.php.expect
diff --git a/hphp/test/vm/fail_86pinit.php b/hphp/test/quick/fail_86pinit.php
similarity index 100%
rename from hphp/test/vm/fail_86pinit.php
rename to hphp/test/quick/fail_86pinit.php
diff --git a/hphp/test/vm/fail_86pinit.php.expectf b/hphp/test/quick/fail_86pinit.php.expectf
similarity index 100%
rename from hphp/test/vm/fail_86pinit.php.expectf
rename to hphp/test/quick/fail_86pinit.php.expectf
diff --git a/hphp/test/vm/fail_86sinit.php b/hphp/test/quick/fail_86sinit.php
similarity index 100%
rename from hphp/test/vm/fail_86sinit.php
rename to hphp/test/quick/fail_86sinit.php
diff --git a/hphp/test/vm/fail_86sinit.php.expectf b/hphp/test/quick/fail_86sinit.php.expectf
similarity index 100%
rename from hphp/test/vm/fail_86sinit.php.expectf
rename to hphp/test/quick/fail_86sinit.php.expectf
diff --git a/hphp/test/vm/fatality.php b/hphp/test/quick/fatality.php
similarity index 100%
rename from hphp/test/vm/fatality.php
rename to hphp/test/quick/fatality.php
diff --git a/hphp/test/vm/fatality.php.expectf b/hphp/test/quick/fatality.php.expectf
similarity index 100%
rename from hphp/test/vm/fatality.php.expectf
rename to hphp/test/quick/fatality.php.expectf
diff --git a/hphp/test/vm/fb_dbt.php b/hphp/test/quick/fb_dbt.php
similarity index 100%
rename from hphp/test/vm/fb_dbt.php
rename to hphp/test/quick/fb_dbt.php
diff --git a/hphp/test/vm/fb_dbt.php.expect b/hphp/test/quick/fb_dbt.php.expect
similarity index 100%
rename from hphp/test/vm/fb_dbt.php.expect
rename to hphp/test/quick/fb_dbt.php.expect
diff --git a/hphp/test/vm/fb_intercept.php b/hphp/test/quick/fb_intercept.php
similarity index 100%
rename from hphp/test/vm/fb_intercept.php
rename to hphp/test/quick/fb_intercept.php
diff --git a/hphp/test/vm/fb_intercept.php.expect b/hphp/test/quick/fb_intercept.php.expect
similarity index 100%
rename from hphp/test/vm/fb_intercept.php.expect
rename to hphp/test/quick/fb_intercept.php.expect
diff --git a/hphp/test/vm/fbcufa.php b/hphp/test/quick/fbcufa.php
similarity index 100%
rename from hphp/test/vm/fbcufa.php
rename to hphp/test/quick/fbcufa.php
diff --git a/hphp/test/vm/fbcufa.php.expectf b/hphp/test/quick/fbcufa.php.expectf
similarity index 100%
rename from hphp/test/vm/fbcufa.php.expectf
rename to hphp/test/quick/fbcufa.php.expectf
diff --git a/hphp/test/vm/fib_gen.php b/hphp/test/quick/fib_gen.php
similarity index 100%
rename from hphp/test/vm/fib_gen.php
rename to hphp/test/quick/fib_gen.php
diff --git a/hphp/test/vm/fib_gen.php.expect b/hphp/test/quick/fib_gen.php.expect
similarity index 100%
rename from hphp/test/vm/fib_gen.php.expect
rename to hphp/test/quick/fib_gen.php.expect
diff --git a/hphp/test/vm/file_read.php b/hphp/test/quick/file_read.php
similarity index 100%
rename from hphp/test/vm/file_read.php
rename to hphp/test/quick/file_read.php
diff --git a/hphp/test/vm/file_read.php.expect b/hphp/test/quick/file_read.php.expect
similarity index 100%
rename from hphp/test/vm/file_read.php.expect
rename to hphp/test/quick/file_read.php.expect
diff --git a/hphp/test/vm/file_rw.php b/hphp/test/quick/file_rw.php
similarity index 100%
rename from hphp/test/vm/file_rw.php
rename to hphp/test/quick/file_rw.php
diff --git a/hphp/test/vm/file_rw.php.expect b/hphp/test/quick/file_rw.php.expect
similarity index 100%
rename from hphp/test/vm/file_rw.php.expect
rename to hphp/test/quick/file_rw.php.expect
diff --git a/hphp/test/vm/filter.remove_in b/hphp/test/quick/filter.remove_in
similarity index 100%
rename from hphp/test/vm/filter.remove_in
rename to hphp/test/quick/filter.remove_in
diff --git a/hphp/test/vm/final_class.php b/hphp/test/quick/final_class.php
similarity index 100%
rename from hphp/test/vm/final_class.php
rename to hphp/test/quick/final_class.php
diff --git a/hphp/test/vm/final_class.php.expectf b/hphp/test/quick/final_class.php.expectf
similarity index 100%
rename from hphp/test/vm/final_class.php.expectf
rename to hphp/test/quick/final_class.php.expectf
diff --git a/hphp/test/vm/final_method.php b/hphp/test/quick/final_method.php
similarity index 100%
rename from hphp/test/vm/final_method.php
rename to hphp/test/quick/final_method.php
diff --git a/hphp/test/vm/final_method.php.expectf b/hphp/test/quick/final_method.php.expectf
similarity index 100%
rename from hphp/test/vm/final_method.php.expectf
rename to hphp/test/quick/final_method.php.expectf
diff --git a/hphp/test/vm/final_method1.php b/hphp/test/quick/final_method1.php
similarity index 100%
rename from hphp/test/vm/final_method1.php
rename to hphp/test/quick/final_method1.php
diff --git a/hphp/test/vm/final_method1.php.expectf b/hphp/test/quick/final_method1.php.expectf
similarity index 100%
rename from hphp/test/vm/final_method1.php.expectf
rename to hphp/test/quick/final_method1.php.expectf
diff --git a/hphp/test/vm/final_method2.php b/hphp/test/quick/final_method2.php
similarity index 100%
rename from hphp/test/vm/final_method2.php
rename to hphp/test/quick/final_method2.php
diff --git a/hphp/test/vm/final_method2.php.expectf b/hphp/test/quick/final_method2.php.expectf
similarity index 100%
rename from hphp/test/vm/final_method2.php.expectf
rename to hphp/test/quick/final_method2.php.expectf
diff --git a/hphp/test/vm/final_method3.php b/hphp/test/quick/final_method3.php
similarity index 100%
rename from hphp/test/vm/final_method3.php
rename to hphp/test/quick/final_method3.php
diff --git a/hphp/test/vm/final_method3.php.expectf b/hphp/test/quick/final_method3.php.expectf
similarity index 100%
rename from hphp/test/vm/final_method3.php.expectf
rename to hphp/test/quick/final_method3.php.expectf
diff --git a/hphp/test/vm/final_method4.php b/hphp/test/quick/final_method4.php
similarity index 100%
rename from hphp/test/vm/final_method4.php
rename to hphp/test/quick/final_method4.php
diff --git a/hphp/test/vm/final_method4.php.expectf b/hphp/test/quick/final_method4.php.expectf
similarity index 100%
rename from hphp/test/vm/final_method4.php.expectf
rename to hphp/test/quick/final_method4.php.expectf
diff --git a/hphp/test/vm/floatcmp.php b/hphp/test/quick/floatcmp.php
similarity index 100%
rename from hphp/test/vm/floatcmp.php
rename to hphp/test/quick/floatcmp.php
diff --git a/hphp/test/vm/floatcmp.php.expect b/hphp/test/quick/floatcmp.php.expect
similarity index 100%
rename from hphp/test/vm/floatcmp.php.expect
rename to hphp/test/quick/floatcmp.php.expect
diff --git a/hphp/test/vm/floateq.php b/hphp/test/quick/floateq.php
similarity index 100%
rename from hphp/test/vm/floateq.php
rename to hphp/test/quick/floateq.php
diff --git a/hphp/test/vm/floateq.php.expect b/hphp/test/quick/floateq.php.expect
similarity index 100%
rename from hphp/test/vm/floateq.php.expect
rename to hphp/test/quick/floateq.php.expect
diff --git a/hphp/test/vm/flow.php b/hphp/test/quick/flow.php
similarity index 100%
rename from hphp/test/vm/flow.php
rename to hphp/test/quick/flow.php
diff --git a/hphp/test/vm/flow.php.expect b/hphp/test/quick/flow.php.expect
similarity index 100%
rename from hphp/test/vm/flow.php.expect
rename to hphp/test/quick/flow.php.expect
diff --git a/hphp/test/vm/foreach-sharedmap.php b/hphp/test/quick/foreach-sharedmap.php
similarity index 100%
rename from hphp/test/vm/foreach-sharedmap.php
rename to hphp/test/quick/foreach-sharedmap.php
diff --git a/hphp/test/vm/foreach-sharedmap.php.expect b/hphp/test/quick/foreach-sharedmap.php.expect
similarity index 100%
rename from hphp/test/vm/foreach-sharedmap.php.expect
rename to hphp/test/quick/foreach-sharedmap.php.expect
diff --git a/hphp/test/vm/foreach.php b/hphp/test/quick/foreach.php
similarity index 100%
rename from hphp/test/vm/foreach.php
rename to hphp/test/quick/foreach.php
diff --git a/hphp/test/vm/foreach.php.expect b/hphp/test/quick/foreach.php.expect
similarity index 100%
rename from hphp/test/vm/foreach.php.expect
rename to hphp/test/quick/foreach.php.expect
diff --git a/hphp/test/vm/fsc.php b/hphp/test/quick/fsc.php
similarity index 100%
rename from hphp/test/vm/fsc.php
rename to hphp/test/quick/fsc.php
diff --git a/hphp/test/vm/fsc.php.expectf b/hphp/test/quick/fsc.php.expectf
similarity index 100%
rename from hphp/test/vm/fsc.php.expectf
rename to hphp/test/quick/fsc.php.expectf
diff --git a/hphp/test/vm/fsc01.php b/hphp/test/quick/fsc01.php
similarity index 100%
rename from hphp/test/vm/fsc01.php
rename to hphp/test/quick/fsc01.php
diff --git a/hphp/test/vm/fsc01.php.expect b/hphp/test/quick/fsc01.php.expect
similarity index 100%
rename from hphp/test/vm/fsc01.php.expect
rename to hphp/test/quick/fsc01.php.expect
diff --git a/hphp/test/vm/fsc02.php b/hphp/test/quick/fsc02.php
similarity index 100%
rename from hphp/test/vm/fsc02.php
rename to hphp/test/quick/fsc02.php
diff --git a/hphp/test/vm/fsc02.php.expect b/hphp/test/quick/fsc02.php.expect
similarity index 100%
rename from hphp/test/vm/fsc02.php.expect
rename to hphp/test/quick/fsc02.php.expect
diff --git a/hphp/test/vm/func.php b/hphp/test/quick/func.php
similarity index 100%
rename from hphp/test/vm/func.php
rename to hphp/test/quick/func.php
diff --git a/hphp/test/vm/func.php.expect b/hphp/test/quick/func.php.expect
similarity index 100%
rename from hphp/test/vm/func.php.expect
rename to hphp/test/quick/func.php.expect
diff --git a/hphp/test/vm/func2.php b/hphp/test/quick/func2.php
similarity index 100%
rename from hphp/test/vm/func2.php
rename to hphp/test/quick/func2.php
diff --git a/hphp/test/vm/func2.php.expectf b/hphp/test/quick/func2.php.expectf
similarity index 100%
rename from hphp/test/vm/func2.php.expectf
rename to hphp/test/quick/func2.php.expectf
diff --git a/hphp/test/vm/func3.php b/hphp/test/quick/func3.php
similarity index 100%
rename from hphp/test/vm/func3.php
rename to hphp/test/quick/func3.php
diff --git a/hphp/test/vm/func3.php.expectf b/hphp/test/quick/func3.php.expectf
similarity index 100%
rename from hphp/test/vm/func3.php.expectf
rename to hphp/test/quick/func3.php.expectf
diff --git a/hphp/test/vm/func_get_args.php b/hphp/test/quick/func_get_args.php
similarity index 100%
rename from hphp/test/vm/func_get_args.php
rename to hphp/test/quick/func_get_args.php
diff --git a/hphp/test/vm/func_get_args.php.expect b/hphp/test/quick/func_get_args.php.expect
similarity index 100%
rename from hphp/test/vm/func_get_args.php.expect
rename to hphp/test/quick/func_get_args.php.expect
diff --git a/hphp/test/vm/function-static-init.php b/hphp/test/quick/function-static-init.php
similarity index 100%
rename from hphp/test/vm/function-static-init.php
rename to hphp/test/quick/function-static-init.php
diff --git a/hphp/test/vm/function-static-init.php.expect b/hphp/test/quick/function-static-init.php.expect
similarity index 100%
rename from hphp/test/vm/function-static-init.php.expect
rename to hphp/test/quick/function-static-init.php.expect
diff --git a/hphp/test/vm/fwd.php b/hphp/test/quick/fwd.php
similarity index 100%
rename from hphp/test/vm/fwd.php
rename to hphp/test/quick/fwd.php
diff --git a/hphp/test/vm/fwd.php.expect b/hphp/test/quick/fwd.php.expect
similarity index 100%
rename from hphp/test/vm/fwd.php.expect
rename to hphp/test/quick/fwd.php.expect
diff --git a/hphp/test/vm/gcd.php b/hphp/test/quick/gcd.php
similarity index 100%
rename from hphp/test/vm/gcd.php
rename to hphp/test/quick/gcd.php
diff --git a/hphp/test/vm/gcd.php.expect b/hphp/test/quick/gcd.php.expect
similarity index 100%
rename from hphp/test/vm/gcd.php.expect
rename to hphp/test/quick/gcd.php.expect
diff --git a/hphp/test/vm/gcv.php b/hphp/test/quick/gcv.php
similarity index 100%
rename from hphp/test/vm/gcv.php
rename to hphp/test/quick/gcv.php
diff --git a/hphp/test/vm/gcv.php.expect b/hphp/test/quick/gcv.php.expect
similarity index 100%
rename from hphp/test/vm/gcv.php.expect
rename to hphp/test/quick/gcv.php.expect
diff --git a/hphp/test/vm/generator_method.php b/hphp/test/quick/generator_method.php
similarity index 100%
rename from hphp/test/vm/generator_method.php
rename to hphp/test/quick/generator_method.php
diff --git a/hphp/test/vm/generator_method.php.expect b/hphp/test/quick/generator_method.php.expect
similarity index 100%
rename from hphp/test/vm/generator_method.php.expect
rename to hphp/test/quick/generator_method.php.expect
diff --git a/hphp/test/vm/generator_vars.php b/hphp/test/quick/generator_vars.php
similarity index 100%
rename from hphp/test/vm/generator_vars.php
rename to hphp/test/quick/generator_vars.php
diff --git a/hphp/test/vm/generator_vars.php.expect b/hphp/test/quick/generator_vars.php.expect
similarity index 100%
rename from hphp/test/vm/generator_vars.php.expect
rename to hphp/test/quick/generator_vars.php.expect
diff --git a/hphp/test/vm/get_called_class.php b/hphp/test/quick/get_called_class.php
similarity index 100%
rename from hphp/test/vm/get_called_class.php
rename to hphp/test/quick/get_called_class.php
diff --git a/hphp/test/vm/get_called_class.php.expect b/hphp/test/quick/get_called_class.php.expect
similarity index 100%
rename from hphp/test/vm/get_called_class.php.expect
rename to hphp/test/quick/get_called_class.php.expect
diff --git a/hphp/test/vm/get_class.php b/hphp/test/quick/get_class.php
similarity index 100%
rename from hphp/test/vm/get_class.php
rename to hphp/test/quick/get_class.php
diff --git a/hphp/test/vm/get_class.php.expectf b/hphp/test/quick/get_class.php.expectf
similarity index 100%
rename from hphp/test/vm/get_class.php.expectf
rename to hphp/test/quick/get_class.php.expectf
diff --git a/hphp/test/vm/get_class_constants.php b/hphp/test/quick/get_class_constants.php
similarity index 100%
rename from hphp/test/vm/get_class_constants.php
rename to hphp/test/quick/get_class_constants.php
diff --git a/hphp/test/vm/get_class_constants.php.expect b/hphp/test/quick/get_class_constants.php.expect
similarity index 100%
rename from hphp/test/vm/get_class_constants.php.expect
rename to hphp/test/quick/get_class_constants.php.expect
diff --git a/hphp/test/vm/get_defined_vars.php b/hphp/test/quick/get_defined_vars.php
similarity index 100%
rename from hphp/test/vm/get_defined_vars.php
rename to hphp/test/quick/get_defined_vars.php
diff --git a/hphp/test/vm/get_defined_vars.php.expect b/hphp/test/quick/get_defined_vars.php.expect
similarity index 100%
rename from hphp/test/vm/get_defined_vars.php.expect
rename to hphp/test/quick/get_defined_vars.php.expect
diff --git a/hphp/test/vm/giant-class.php b/hphp/test/quick/giant-class.php
similarity index 100%
rename from hphp/test/vm/giant-class.php
rename to hphp/test/quick/giant-class.php
diff --git a/hphp/test/vm/giant-class.php.expect b/hphp/test/quick/giant-class.php.expect
similarity index 100%
rename from hphp/test/vm/giant-class.php.expect
rename to hphp/test/quick/giant-class.php.expect
diff --git a/hphp/test/quick/global_addelem.php b/hphp/test/quick/global_addelem.php
new file mode 100644
index 000000000..ae2603b5f
--- /dev/null
+++ b/hphp/test/quick/global_addelem.php
@@ -0,0 +1,7 @@
+<?php
+
+// Test the case that a $GLOBAL set has a W element first---we need to make
+// sure the emitter uses a vector instruction instead of trying to do SetS.
+
+function f() { $GLOBALS[] = 1; }
+f();
diff --git a/hphp/test/vm/global_addelem.php.expectf b/hphp/test/quick/global_addelem.php.expectf
similarity index 100%
rename from hphp/test/vm/global_addelem.php.expectf
rename to hphp/test/quick/global_addelem.php.expectf
diff --git a/hphp/test/vm/global_dequeue_pop.php b/hphp/test/quick/global_dequeue_pop.php
similarity index 100%
rename from hphp/test/vm/global_dequeue_pop.php
rename to hphp/test/quick/global_dequeue_pop.php
diff --git a/hphp/test/vm/global_dequeue_pop.php.expect b/hphp/test/quick/global_dequeue_pop.php.expect
similarity index 100%
rename from hphp/test/vm/global_dequeue_pop.php.expect
rename to hphp/test/quick/global_dequeue_pop.php.expect
diff --git a/hphp/test/vm/guards1.php b/hphp/test/quick/guards1.php
similarity index 100%
rename from hphp/test/vm/guards1.php
rename to hphp/test/quick/guards1.php
diff --git a/hphp/test/vm/guards1.php.expect b/hphp/test/quick/guards1.php.expect
similarity index 100%
rename from hphp/test/vm/guards1.php.expect
rename to hphp/test/quick/guards1.php.expect
diff --git a/hphp/test/vm/hello.php b/hphp/test/quick/hello.php
similarity index 100%
rename from hphp/test/vm/hello.php
rename to hphp/test/quick/hello.php
diff --git a/hphp/test/vm/hello.php.expect b/hphp/test/quick/hello.php.expect
similarity index 100%
rename from hphp/test/vm/hello.php.expect
rename to hphp/test/quick/hello.php.expect
diff --git a/hphp/test/vm/hhir_cgetm_exceptions.php b/hphp/test/quick/hhir_cgetm_exceptions.php
similarity index 100%
rename from hphp/test/vm/hhir_cgetm_exceptions.php
rename to hphp/test/quick/hhir_cgetm_exceptions.php
diff --git a/hphp/test/vm/hhir_cgetm_exceptions.php.expect b/hphp/test/quick/hhir_cgetm_exceptions.php.expect
similarity index 100%
rename from hphp/test/vm/hhir_cgetm_exceptions.php.expect
rename to hphp/test/quick/hhir_cgetm_exceptions.php.expect
diff --git a/hphp/test/vm/hhir_eq_stack.php b/hphp/test/quick/hhir_eq_stack.php
similarity index 100%
rename from hphp/test/vm/hhir_eq_stack.php
rename to hphp/test/quick/hhir_eq_stack.php
diff --git a/hphp/test/vm/hhir_eq_stack.php.expect b/hphp/test/quick/hhir_eq_stack.php.expect
similarity index 100%
rename from hphp/test/vm/hhir_eq_stack.php.expect
rename to hphp/test/quick/hhir_eq_stack.php.expect
diff --git a/hphp/test/vm/hhir_nonconst_null.php b/hphp/test/quick/hhir_nonconst_null.php
similarity index 100%
rename from hphp/test/vm/hhir_nonconst_null.php
rename to hphp/test/quick/hhir_nonconst_null.php
diff --git a/hphp/test/vm/hhir_nonconst_null.php.expect b/hphp/test/quick/hhir_nonconst_null.php.expect
similarity index 100%
rename from hphp/test/vm/hhir_nonconst_null.php.expect
rename to hphp/test/quick/hhir_nonconst_null.php.expect
diff --git a/hphp/test/vm/hoistable_a.php b/hphp/test/quick/hoistable_a.php
similarity index 100%
rename from hphp/test/vm/hoistable_a.php
rename to hphp/test/quick/hoistable_a.php
diff --git a/hphp/test/vm/hoistable_a.php.expect b/hphp/test/quick/hoistable_a.php.expect
similarity index 100%
rename from hphp/test/vm/hoistable_a.php.expect
rename to hphp/test/quick/hoistable_a.php.expect
diff --git a/hphp/test/vm/hoistable_b.php b/hphp/test/quick/hoistable_b.php
similarity index 100%
rename from hphp/test/vm/hoistable_b.php
rename to hphp/test/quick/hoistable_b.php
diff --git a/hphp/test/vm/hoistable_b.php.expect b/hphp/test/quick/hoistable_b.php.expect
similarity index 100%
rename from hphp/test/vm/hoistable_b.php.expect
rename to hphp/test/quick/hoistable_b.php.expect
diff --git a/hphp/test/vm/hoistable_c.php b/hphp/test/quick/hoistable_c.php
similarity index 100%
rename from hphp/test/vm/hoistable_c.php
rename to hphp/test/quick/hoistable_c.php
diff --git a/hphp/test/vm/hoistable_d.php b/hphp/test/quick/hoistable_d.php
similarity index 100%
rename from hphp/test/vm/hoistable_d.php
rename to hphp/test/quick/hoistable_d.php
diff --git a/hphp/test/vm/hoistable_d.php.expect b/hphp/test/quick/hoistable_d.php.expect
similarity index 100%
rename from hphp/test/vm/hoistable_d.php.expect
rename to hphp/test/quick/hoistable_d.php.expect
diff --git a/hphp/test/vm/hoistable_e.php b/hphp/test/quick/hoistable_e.php
similarity index 100%
rename from hphp/test/vm/hoistable_e.php
rename to hphp/test/quick/hoistable_e.php
diff --git a/hphp/test/vm/hopt-add1.php b/hphp/test/quick/hopt-add1.php
similarity index 100%
rename from hphp/test/vm/hopt-add1.php
rename to hphp/test/quick/hopt-add1.php
diff --git a/hphp/test/vm/hopt-add1.php.expect b/hphp/test/quick/hopt-add1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-add1.php.expect
rename to hphp/test/quick/hopt-add1.php.expect
diff --git a/hphp/test/vm/hopt-add2.php b/hphp/test/quick/hopt-add2.php
similarity index 100%
rename from hphp/test/vm/hopt-add2.php
rename to hphp/test/quick/hopt-add2.php
diff --git a/hphp/test/vm/hopt-add2.php.expect b/hphp/test/quick/hopt-add2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-add2.php.expect
rename to hphp/test/quick/hopt-add2.php.expect
diff --git a/hphp/test/vm/hopt-add3.php b/hphp/test/quick/hopt-add3.php
similarity index 100%
rename from hphp/test/vm/hopt-add3.php
rename to hphp/test/quick/hopt-add3.php
diff --git a/hphp/test/vm/hopt-add3.php.expect b/hphp/test/quick/hopt-add3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-add3.php.expect
rename to hphp/test/quick/hopt-add3.php.expect
diff --git a/hphp/test/vm/hopt-and-simp.php b/hphp/test/quick/hopt-and-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-and-simp.php
rename to hphp/test/quick/hopt-and-simp.php
diff --git a/hphp/test/vm/hopt-and-simp.php.expect b/hphp/test/quick/hopt-and-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-and-simp.php.expect
rename to hphp/test/quick/hopt-and-simp.php.expect
diff --git a/hphp/test/vm/hopt-arg-alias.php b/hphp/test/quick/hopt-arg-alias.php
similarity index 100%
rename from hphp/test/vm/hopt-arg-alias.php
rename to hphp/test/quick/hopt-arg-alias.php
diff --git a/hphp/test/vm/hopt-arg-alias.php.expect b/hphp/test/quick/hopt-arg-alias.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-arg-alias.php.expect
rename to hphp/test/quick/hopt-arg-alias.php.expect
diff --git a/hphp/test/vm/hopt-arg-alias2.php b/hphp/test/quick/hopt-arg-alias2.php
similarity index 100%
rename from hphp/test/vm/hopt-arg-alias2.php
rename to hphp/test/quick/hopt-arg-alias2.php
diff --git a/hphp/test/vm/hopt-arg-alias2.php.expect b/hphp/test/quick/hopt-arg-alias2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-arg-alias2.php.expect
rename to hphp/test/quick/hopt-arg-alias2.php.expect
diff --git a/hphp/test/vm/hopt-cjump.php b/hphp/test/quick/hopt-cjump.php
similarity index 100%
rename from hphp/test/vm/hopt-cjump.php
rename to hphp/test/quick/hopt-cjump.php
diff --git a/hphp/test/vm/hopt-cjump.php.expect b/hphp/test/quick/hopt-cjump.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-cjump.php.expect
rename to hphp/test/quick/hopt-cjump.php.expect
diff --git a/hphp/test/vm/hopt-cmp1.php b/hphp/test/quick/hopt-cmp1.php
similarity index 100%
rename from hphp/test/vm/hopt-cmp1.php
rename to hphp/test/quick/hopt-cmp1.php
diff --git a/hphp/test/vm/hopt-cmp1.php.expect b/hphp/test/quick/hopt-cmp1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-cmp1.php.expect
rename to hphp/test/quick/hopt-cmp1.php.expect
diff --git a/hphp/test/vm/hopt-concat-simp.php b/hphp/test/quick/hopt-concat-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-concat-simp.php
rename to hphp/test/quick/hopt-concat-simp.php
diff --git a/hphp/test/vm/hopt-concat-simp.php.expect b/hphp/test/quick/hopt-concat-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-concat-simp.php.expect
rename to hphp/test/quick/hopt-concat-simp.php.expect
diff --git a/hphp/test/vm/hopt-concat.php b/hphp/test/quick/hopt-concat.php
similarity index 100%
rename from hphp/test/vm/hopt-concat.php
rename to hphp/test/quick/hopt-concat.php
diff --git a/hphp/test/vm/hopt-concat.php.expect b/hphp/test/quick/hopt-concat.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-concat.php.expect
rename to hphp/test/quick/hopt-concat.php.expect
diff --git a/hphp/test/vm/hopt-eq.php b/hphp/test/quick/hopt-eq.php
similarity index 100%
rename from hphp/test/vm/hopt-eq.php
rename to hphp/test/quick/hopt-eq.php
diff --git a/hphp/test/vm/hopt-eq.php.expect b/hphp/test/quick/hopt-eq.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-eq.php.expect
rename to hphp/test/quick/hopt-eq.php.expect
diff --git a/hphp/test/vm/hopt-eqBoolInt.php b/hphp/test/quick/hopt-eqBoolInt.php
similarity index 100%
rename from hphp/test/vm/hopt-eqBoolInt.php
rename to hphp/test/quick/hopt-eqBoolInt.php
diff --git a/hphp/test/vm/hopt-eqBoolInt.php.expect b/hphp/test/quick/hopt-eqBoolInt.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-eqBoolInt.php.expect
rename to hphp/test/quick/hopt-eqBoolInt.php.expect
diff --git a/hphp/test/vm/hopt-eqObj.php b/hphp/test/quick/hopt-eqObj.php
similarity index 100%
rename from hphp/test/vm/hopt-eqObj.php
rename to hphp/test/quick/hopt-eqObj.php
diff --git a/hphp/test/vm/hopt-eqObj.php.expect b/hphp/test/quick/hopt-eqObj.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-eqObj.php.expect
rename to hphp/test/quick/hopt-eqObj.php.expect
diff --git a/hphp/test/vm/hopt-eqResources.php b/hphp/test/quick/hopt-eqResources.php
similarity index 100%
rename from hphp/test/vm/hopt-eqResources.php
rename to hphp/test/quick/hopt-eqResources.php
diff --git a/hphp/test/vm/hopt-eqResources.php.expect b/hphp/test/quick/hopt-eqResources.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-eqResources.php.expect
rename to hphp/test/quick/hopt-eqResources.php.expect
diff --git a/hphp/test/vm/hopt-exit-ref1.php b/hphp/test/quick/hopt-exit-ref1.php
similarity index 100%
rename from hphp/test/vm/hopt-exit-ref1.php
rename to hphp/test/quick/hopt-exit-ref1.php
diff --git a/hphp/test/vm/hopt-exit-ref1.php.expect b/hphp/test/quick/hopt-exit-ref1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-exit-ref1.php.expect
rename to hphp/test/quick/hopt-exit-ref1.php.expect
diff --git a/hphp/test/vm/hopt-exitslow.php b/hphp/test/quick/hopt-exitslow.php
similarity index 100%
rename from hphp/test/vm/hopt-exitslow.php
rename to hphp/test/quick/hopt-exitslow.php
diff --git a/hphp/test/vm/hopt-exitslow.php.expectf b/hphp/test/quick/hopt-exitslow.php.expectf
similarity index 100%
rename from hphp/test/vm/hopt-exitslow.php.expectf
rename to hphp/test/quick/hopt-exitslow.php.expectf
diff --git a/hphp/test/vm/hopt-isset.php b/hphp/test/quick/hopt-isset.php
similarity index 100%
rename from hphp/test/vm/hopt-isset.php
rename to hphp/test/quick/hopt-isset.php
diff --git a/hphp/test/vm/hopt-isset.php.expect b/hphp/test/quick/hopt-isset.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-isset.php.expect
rename to hphp/test/quick/hopt-isset.php.expect
diff --git a/hphp/test/vm/hopt-juggling.php b/hphp/test/quick/hopt-juggling.php
similarity index 100%
rename from hphp/test/vm/hopt-juggling.php
rename to hphp/test/quick/hopt-juggling.php
diff --git a/hphp/test/vm/hopt-juggling.php.expect b/hphp/test/quick/hopt-juggling.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-juggling.php.expect
rename to hphp/test/quick/hopt-juggling.php.expect
diff --git a/hphp/test/vm/hopt-mul-simp.php b/hphp/test/quick/hopt-mul-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-mul-simp.php
rename to hphp/test/quick/hopt-mul-simp.php
diff --git a/hphp/test/vm/hopt-mul-simp.php.expect b/hphp/test/quick/hopt-mul-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-mul-simp.php.expect
rename to hphp/test/quick/hopt-mul-simp.php.expect
diff --git a/hphp/test/vm/hopt-mul1.php b/hphp/test/quick/hopt-mul1.php
similarity index 100%
rename from hphp/test/vm/hopt-mul1.php
rename to hphp/test/quick/hopt-mul1.php
diff --git a/hphp/test/vm/hopt-mul1.php.expect b/hphp/test/quick/hopt-mul1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-mul1.php.expect
rename to hphp/test/quick/hopt-mul1.php.expect
diff --git a/hphp/test/vm/hopt-mul2.php b/hphp/test/quick/hopt-mul2.php
similarity index 100%
rename from hphp/test/vm/hopt-mul2.php
rename to hphp/test/quick/hopt-mul2.php
diff --git a/hphp/test/vm/hopt-mul2.php.expect b/hphp/test/quick/hopt-mul2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-mul2.php.expect
rename to hphp/test/quick/hopt-mul2.php.expect
diff --git a/hphp/test/vm/hopt-mul3.php b/hphp/test/quick/hopt-mul3.php
similarity index 100%
rename from hphp/test/vm/hopt-mul3.php
rename to hphp/test/quick/hopt-mul3.php
diff --git a/hphp/test/vm/hopt-mul3.php.expect b/hphp/test/quick/hopt-mul3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-mul3.php.expect
rename to hphp/test/quick/hopt-mul3.php.expect
diff --git a/hphp/test/vm/hopt-or-simp.php b/hphp/test/quick/hopt-or-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-or-simp.php
rename to hphp/test/quick/hopt-or-simp.php
diff --git a/hphp/test/vm/hopt-or-simp.php.expect b/hphp/test/quick/hopt-or-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-or-simp.php.expect
rename to hphp/test/quick/hopt-or-simp.php.expect
diff --git a/hphp/test/vm/hopt-partial-dse.php b/hphp/test/quick/hopt-partial-dse.php
similarity index 100%
rename from hphp/test/vm/hopt-partial-dse.php
rename to hphp/test/quick/hopt-partial-dse.php
diff --git a/hphp/test/vm/hopt-partial-dse.php.expect b/hphp/test/quick/hopt-partial-dse.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-partial-dse.php.expect
rename to hphp/test/quick/hopt-partial-dse.php.expect
diff --git a/hphp/test/vm/hopt-pre-coloring-2.php b/hphp/test/quick/hopt-pre-coloring-2.php
similarity index 100%
rename from hphp/test/vm/hopt-pre-coloring-2.php
rename to hphp/test/quick/hopt-pre-coloring-2.php
diff --git a/hphp/test/vm/hopt-pre-coloring-2.php.expect b/hphp/test/quick/hopt-pre-coloring-2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-pre-coloring-2.php.expect
rename to hphp/test/quick/hopt-pre-coloring-2.php.expect
diff --git a/hphp/test/vm/hopt-pre-coloring.php b/hphp/test/quick/hopt-pre-coloring.php
similarity index 100%
rename from hphp/test/vm/hopt-pre-coloring.php
rename to hphp/test/quick/hopt-pre-coloring.php
diff --git a/hphp/test/vm/hopt-pre-coloring.php.expect b/hphp/test/quick/hopt-pre-coloring.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-pre-coloring.php.expect
rename to hphp/test/quick/hopt-pre-coloring.php.expect
diff --git a/hphp/test/vm/hopt-ref-alias.php b/hphp/test/quick/hopt-ref-alias.php
similarity index 100%
rename from hphp/test/vm/hopt-ref-alias.php
rename to hphp/test/quick/hopt-ref-alias.php
diff --git a/hphp/test/vm/hopt-ref-alias.php.expect b/hphp/test/quick/hopt-ref-alias.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ref-alias.php.expect
rename to hphp/test/quick/hopt-ref-alias.php.expect
diff --git a/hphp/test/vm/hopt-ref-arg.php b/hphp/test/quick/hopt-ref-arg.php
similarity index 100%
rename from hphp/test/vm/hopt-ref-arg.php
rename to hphp/test/quick/hopt-ref-arg.php
diff --git a/hphp/test/vm/hopt-ref-arg.php.expect b/hphp/test/quick/hopt-ref-arg.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ref-arg.php.expect
rename to hphp/test/quick/hopt-ref-arg.php.expect
diff --git a/hphp/test/vm/hopt-ref-medium.php b/hphp/test/quick/hopt-ref-medium.php
similarity index 100%
rename from hphp/test/vm/hopt-ref-medium.php
rename to hphp/test/quick/hopt-ref-medium.php
diff --git a/hphp/test/vm/hopt-ref-medium.php.expect b/hphp/test/quick/hopt-ref-medium.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ref-medium.php.expect
rename to hphp/test/quick/hopt-ref-medium.php.expect
diff --git a/hphp/test/vm/hopt-ref-obj.php b/hphp/test/quick/hopt-ref-obj.php
similarity index 100%
rename from hphp/test/vm/hopt-ref-obj.php
rename to hphp/test/quick/hopt-ref-obj.php
diff --git a/hphp/test/vm/hopt-ref-obj.php.expect b/hphp/test/quick/hopt-ref-obj.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ref-obj.php.expect
rename to hphp/test/quick/hopt-ref-obj.php.expect
diff --git a/hphp/test/vm/hopt-ref-simple.php b/hphp/test/quick/hopt-ref-simple.php
similarity index 100%
rename from hphp/test/vm/hopt-ref-simple.php
rename to hphp/test/quick/hopt-ref-simple.php
diff --git a/hphp/test/vm/hopt-ref-simple.php.expect b/hphp/test/quick/hopt-ref-simple.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ref-simple.php.expect
rename to hphp/test/quick/hopt-ref-simple.php.expect
diff --git a/hphp/test/vm/hopt-refs1.php b/hphp/test/quick/hopt-refs1.php
similarity index 100%
rename from hphp/test/vm/hopt-refs1.php
rename to hphp/test/quick/hopt-refs1.php
diff --git a/hphp/test/vm/hopt-refs1.php.expect b/hphp/test/quick/hopt-refs1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-refs1.php.expect
rename to hphp/test/quick/hopt-refs1.php.expect
diff --git a/hphp/test/vm/hopt-reg-spill.php b/hphp/test/quick/hopt-reg-spill.php
similarity index 100%
rename from hphp/test/vm/hopt-reg-spill.php
rename to hphp/test/quick/hopt-reg-spill.php
diff --git a/hphp/test/vm/hopt-reg-spill.php.expect b/hphp/test/quick/hopt-reg-spill.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-reg-spill.php.expect
rename to hphp/test/quick/hopt-reg-spill.php.expect
diff --git a/hphp/test/vm/hopt-ret1.php b/hphp/test/quick/hopt-ret1.php
similarity index 100%
rename from hphp/test/vm/hopt-ret1.php
rename to hphp/test/quick/hopt-ret1.php
diff --git a/hphp/test/vm/hopt-ret1.php.expect b/hphp/test/quick/hopt-ret1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret1.php.expect
rename to hphp/test/quick/hopt-ret1.php.expect
diff --git a/hphp/test/vm/hopt-ret10.php b/hphp/test/quick/hopt-ret10.php
similarity index 100%
rename from hphp/test/vm/hopt-ret10.php
rename to hphp/test/quick/hopt-ret10.php
diff --git a/hphp/test/vm/hopt-ret10.php.expect b/hphp/test/quick/hopt-ret10.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret10.php.expect
rename to hphp/test/quick/hopt-ret10.php.expect
diff --git a/hphp/test/vm/hopt-ret2.php b/hphp/test/quick/hopt-ret2.php
similarity index 100%
rename from hphp/test/vm/hopt-ret2.php
rename to hphp/test/quick/hopt-ret2.php
diff --git a/hphp/test/vm/hopt-ret2.php.expect b/hphp/test/quick/hopt-ret2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret2.php.expect
rename to hphp/test/quick/hopt-ret2.php.expect
diff --git a/hphp/test/vm/hopt-ret3.php b/hphp/test/quick/hopt-ret3.php
similarity index 100%
rename from hphp/test/vm/hopt-ret3.php
rename to hphp/test/quick/hopt-ret3.php
diff --git a/hphp/test/vm/hopt-ret3.php.expect b/hphp/test/quick/hopt-ret3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret3.php.expect
rename to hphp/test/quick/hopt-ret3.php.expect
diff --git a/hphp/test/vm/hopt-ret4.php b/hphp/test/quick/hopt-ret4.php
similarity index 100%
rename from hphp/test/vm/hopt-ret4.php
rename to hphp/test/quick/hopt-ret4.php
diff --git a/hphp/test/vm/hopt-ret4.php.expect b/hphp/test/quick/hopt-ret4.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret4.php.expect
rename to hphp/test/quick/hopt-ret4.php.expect
diff --git a/hphp/test/vm/hopt-ret5.php b/hphp/test/quick/hopt-ret5.php
similarity index 100%
rename from hphp/test/vm/hopt-ret5.php
rename to hphp/test/quick/hopt-ret5.php
diff --git a/hphp/test/vm/hopt-ret5.php.expect b/hphp/test/quick/hopt-ret5.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret5.php.expect
rename to hphp/test/quick/hopt-ret5.php.expect
diff --git a/hphp/test/vm/hopt-ret6.php b/hphp/test/quick/hopt-ret6.php
similarity index 100%
rename from hphp/test/vm/hopt-ret6.php
rename to hphp/test/quick/hopt-ret6.php
diff --git a/hphp/test/vm/hopt-ret6.php.expect b/hphp/test/quick/hopt-ret6.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret6.php.expect
rename to hphp/test/quick/hopt-ret6.php.expect
diff --git a/hphp/test/vm/hopt-ret7.php b/hphp/test/quick/hopt-ret7.php
similarity index 100%
rename from hphp/test/vm/hopt-ret7.php
rename to hphp/test/quick/hopt-ret7.php
diff --git a/hphp/test/vm/hopt-ret7.php.expect b/hphp/test/quick/hopt-ret7.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret7.php.expect
rename to hphp/test/quick/hopt-ret7.php.expect
diff --git a/hphp/test/vm/hopt-ret8.php b/hphp/test/quick/hopt-ret8.php
similarity index 100%
rename from hphp/test/vm/hopt-ret8.php
rename to hphp/test/quick/hopt-ret8.php
diff --git a/hphp/test/vm/hopt-ret8.php.expect b/hphp/test/quick/hopt-ret8.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret8.php.expect
rename to hphp/test/quick/hopt-ret8.php.expect
diff --git a/hphp/test/vm/hopt-ret9.php b/hphp/test/quick/hopt-ret9.php
similarity index 100%
rename from hphp/test/vm/hopt-ret9.php
rename to hphp/test/quick/hopt-ret9.php
diff --git a/hphp/test/vm/hopt-ret9.php.expect b/hphp/test/quick/hopt-ret9.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-ret9.php.expect
rename to hphp/test/quick/hopt-ret9.php.expect
diff --git a/hphp/test/vm/hopt-same-simp.php b/hphp/test/quick/hopt-same-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-same-simp.php
rename to hphp/test/quick/hopt-same-simp.php
diff --git a/hphp/test/vm/hopt-same-simp.php.expect b/hphp/test/quick/hopt-same-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-same-simp.php.expect
rename to hphp/test/quick/hopt-same-simp.php.expect
diff --git a/hphp/test/vm/hopt-simp-rare.php b/hphp/test/quick/hopt-simp-rare.php
similarity index 100%
rename from hphp/test/vm/hopt-simp-rare.php
rename to hphp/test/quick/hopt-simp-rare.php
diff --git a/hphp/test/vm/hopt-simp-rare.php.expect b/hphp/test/quick/hopt-simp-rare.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-simp-rare.php.expect
rename to hphp/test/quick/hopt-simp-rare.php.expect
diff --git a/hphp/test/vm/hopt-simp.php b/hphp/test/quick/hopt-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-simp.php
rename to hphp/test/quick/hopt-simp.php
diff --git a/hphp/test/vm/hopt-simp.php.expect b/hphp/test/quick/hopt-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-simp.php.expect
rename to hphp/test/quick/hopt-simp.php.expect
diff --git a/hphp/test/vm/hopt-static.php b/hphp/test/quick/hopt-static.php
similarity index 100%
rename from hphp/test/vm/hopt-static.php
rename to hphp/test/quick/hopt-static.php
diff --git a/hphp/test/vm/hopt-static.php.expect b/hphp/test/quick/hopt-static.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-static.php.expect
rename to hphp/test/quick/hopt-static.php.expect
diff --git a/hphp/test/vm/hopt-stref1.php b/hphp/test/quick/hopt-stref1.php
similarity index 100%
rename from hphp/test/vm/hopt-stref1.php
rename to hphp/test/quick/hopt-stref1.php
diff --git a/hphp/test/vm/hopt-stref1.php.expect b/hphp/test/quick/hopt-stref1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-stref1.php.expect
rename to hphp/test/quick/hopt-stref1.php.expect
diff --git a/hphp/test/vm/hopt-stref2.php b/hphp/test/quick/hopt-stref2.php
similarity index 100%
rename from hphp/test/vm/hopt-stref2.php
rename to hphp/test/quick/hopt-stref2.php
diff --git a/hphp/test/vm/hopt-stref2.php.expect b/hphp/test/quick/hopt-stref2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-stref2.php.expect
rename to hphp/test/quick/hopt-stref2.php.expect
diff --git a/hphp/test/vm/hopt-string-simp.php b/hphp/test/quick/hopt-string-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-string-simp.php
rename to hphp/test/quick/hopt-string-simp.php
diff --git a/hphp/test/vm/hopt-string-simp.php.expectf b/hphp/test/quick/hopt-string-simp.php.expectf
similarity index 100%
rename from hphp/test/vm/hopt-string-simp.php.expectf
rename to hphp/test/quick/hopt-string-simp.php.expectf
diff --git a/hphp/test/vm/hopt-sub-simp.php b/hphp/test/quick/hopt-sub-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-sub-simp.php
rename to hphp/test/quick/hopt-sub-simp.php
diff --git a/hphp/test/vm/hopt-sub-simp.php.expect b/hphp/test/quick/hopt-sub-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub-simp.php.expect
rename to hphp/test/quick/hopt-sub-simp.php.expect
diff --git a/hphp/test/vm/hopt-sub1.php b/hphp/test/quick/hopt-sub1.php
similarity index 100%
rename from hphp/test/vm/hopt-sub1.php
rename to hphp/test/quick/hopt-sub1.php
diff --git a/hphp/test/vm/hopt-sub1.php.expect b/hphp/test/quick/hopt-sub1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub1.php.expect
rename to hphp/test/quick/hopt-sub1.php.expect
diff --git a/hphp/test/vm/hopt-sub2.php b/hphp/test/quick/hopt-sub2.php
similarity index 100%
rename from hphp/test/vm/hopt-sub2.php
rename to hphp/test/quick/hopt-sub2.php
diff --git a/hphp/test/vm/hopt-sub2.php.expect b/hphp/test/quick/hopt-sub2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub2.php.expect
rename to hphp/test/quick/hopt-sub2.php.expect
diff --git a/hphp/test/vm/hopt-sub3.php b/hphp/test/quick/hopt-sub3.php
similarity index 100%
rename from hphp/test/vm/hopt-sub3.php
rename to hphp/test/quick/hopt-sub3.php
diff --git a/hphp/test/vm/hopt-sub3.php.expect b/hphp/test/quick/hopt-sub3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub3.php.expect
rename to hphp/test/quick/hopt-sub3.php.expect
diff --git a/hphp/test/vm/hopt-sub4.php b/hphp/test/quick/hopt-sub4.php
similarity index 100%
rename from hphp/test/vm/hopt-sub4.php
rename to hphp/test/quick/hopt-sub4.php
diff --git a/hphp/test/vm/hopt-sub4.php.expect b/hphp/test/quick/hopt-sub4.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub4.php.expect
rename to hphp/test/quick/hopt-sub4.php.expect
diff --git a/hphp/test/vm/hopt-sub5.php b/hphp/test/quick/hopt-sub5.php
similarity index 100%
rename from hphp/test/vm/hopt-sub5.php
rename to hphp/test/quick/hopt-sub5.php
diff --git a/hphp/test/vm/hopt-sub5.php.expect b/hphp/test/quick/hopt-sub5.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-sub5.php.expect
rename to hphp/test/quick/hopt-sub5.php.expect
diff --git a/hphp/test/vm/hopt-test-sub.php b/hphp/test/quick/hopt-test-sub.php
similarity index 100%
rename from hphp/test/vm/hopt-test-sub.php
rename to hphp/test/quick/hopt-test-sub.php
diff --git a/hphp/test/vm/hopt-test-sub.php.expect b/hphp/test/quick/hopt-test-sub.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-test-sub.php.expect
rename to hphp/test/quick/hopt-test-sub.php.expect
diff --git a/hphp/test/vm/hopt-translator_unwind.hhas b/hphp/test/quick/hopt-translator_unwind.hhas
similarity index 100%
rename from hphp/test/vm/hopt-translator_unwind.hhas
rename to hphp/test/quick/hopt-translator_unwind.hhas
diff --git a/hphp/test/vm/hopt-translator_unwind.hhas.expect b/hphp/test/quick/hopt-translator_unwind.hhas.expect
similarity index 100%
rename from hphp/test/vm/hopt-translator_unwind.hhas.expect
rename to hphp/test/quick/hopt-translator_unwind.hhas.expect
diff --git a/hphp/test/vm/hopt-true3.php b/hphp/test/quick/hopt-true3.php
similarity index 100%
rename from hphp/test/vm/hopt-true3.php
rename to hphp/test/quick/hopt-true3.php
diff --git a/hphp/test/vm/hopt-true3.php.expect b/hphp/test/quick/hopt-true3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-true3.php.expect
rename to hphp/test/quick/hopt-true3.php.expect
diff --git a/hphp/test/vm/hopt-true4.php b/hphp/test/quick/hopt-true4.php
similarity index 100%
rename from hphp/test/vm/hopt-true4.php
rename to hphp/test/quick/hopt-true4.php
diff --git a/hphp/test/vm/hopt-true4.php.expect b/hphp/test/quick/hopt-true4.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-true4.php.expect
rename to hphp/test/quick/hopt-true4.php.expect
diff --git a/hphp/test/vm/hopt-type-mutate1.php b/hphp/test/quick/hopt-type-mutate1.php
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate1.php
rename to hphp/test/quick/hopt-type-mutate1.php
diff --git a/hphp/test/vm/hopt-type-mutate1.php.expect b/hphp/test/quick/hopt-type-mutate1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate1.php.expect
rename to hphp/test/quick/hopt-type-mutate1.php.expect
diff --git a/hphp/test/vm/hopt-type-mutate2.php b/hphp/test/quick/hopt-type-mutate2.php
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate2.php
rename to hphp/test/quick/hopt-type-mutate2.php
diff --git a/hphp/test/vm/hopt-type-mutate2.php.expect b/hphp/test/quick/hopt-type-mutate2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate2.php.expect
rename to hphp/test/quick/hopt-type-mutate2.php.expect
diff --git a/hphp/test/vm/hopt-type-mutate3.php b/hphp/test/quick/hopt-type-mutate3.php
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate3.php
rename to hphp/test/quick/hopt-type-mutate3.php
diff --git a/hphp/test/vm/hopt-type-mutate3.php.expect b/hphp/test/quick/hopt-type-mutate3.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-type-mutate3.php.expect
rename to hphp/test/quick/hopt-type-mutate3.php.expect
diff --git a/hphp/test/vm/hopt-xor-simp.php b/hphp/test/quick/hopt-xor-simp.php
similarity index 100%
rename from hphp/test/vm/hopt-xor-simp.php
rename to hphp/test/quick/hopt-xor-simp.php
diff --git a/hphp/test/vm/hopt-xor-simp.php.expect b/hphp/test/quick/hopt-xor-simp.php.expect
similarity index 100%
rename from hphp/test/vm/hopt-xor-simp.php.expect
rename to hphp/test/quick/hopt-xor-simp.php.expect
diff --git a/hphp/test/vm/hopt_array.php b/hphp/test/quick/hopt_array.php
similarity index 100%
rename from hphp/test/vm/hopt_array.php
rename to hphp/test/quick/hopt_array.php
diff --git a/hphp/test/vm/hopt_array.php.expect b/hphp/test/quick/hopt_array.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_array.php.expect
rename to hphp/test/quick/hopt_array.php.expect
diff --git a/hphp/test/vm/hopt_bitops.php b/hphp/test/quick/hopt_bitops.php
similarity index 100%
rename from hphp/test/vm/hopt_bitops.php
rename to hphp/test/quick/hopt_bitops.php
diff --git a/hphp/test/vm/hopt_bitops.php.expect b/hphp/test/quick/hopt_bitops.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_bitops.php.expect
rename to hphp/test/quick/hopt_bitops.php.expect
diff --git a/hphp/test/vm/hopt_cgetm.php b/hphp/test/quick/hopt_cgetm.php
similarity index 100%
rename from hphp/test/vm/hopt_cgetm.php
rename to hphp/test/quick/hopt_cgetm.php
diff --git a/hphp/test/vm/hopt_cgetm.php.expect b/hphp/test/quick/hopt_cgetm.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_cgetm.php.expect
rename to hphp/test/quick/hopt_cgetm.php.expect
diff --git a/hphp/test/vm/hopt_fpi.php b/hphp/test/quick/hopt_fpi.php
similarity index 100%
rename from hphp/test/vm/hopt_fpi.php
rename to hphp/test/quick/hopt_fpi.php
diff --git a/hphp/test/vm/hopt_fpi.php.expect b/hphp/test/quick/hopt_fpi.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_fpi.php.expect
rename to hphp/test/quick/hopt_fpi.php.expect
diff --git a/hphp/test/vm/hopt_late_jcc_to_jmp.php b/hphp/test/quick/hopt_late_jcc_to_jmp.php
similarity index 100%
rename from hphp/test/vm/hopt_late_jcc_to_jmp.php
rename to hphp/test/quick/hopt_late_jcc_to_jmp.php
diff --git a/hphp/test/tcr/array_offset/418.php.expect b/hphp/test/quick/hopt_late_jcc_to_jmp.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/418.php.expect
rename to hphp/test/quick/hopt_late_jcc_to_jmp.php.expect
diff --git a/hphp/test/vm/hopt_methodcall1.php b/hphp/test/quick/hopt_methodcall1.php
similarity index 100%
rename from hphp/test/vm/hopt_methodcall1.php
rename to hphp/test/quick/hopt_methodcall1.php
diff --git a/hphp/test/vm/hopt_methodcall1.php.expect b/hphp/test/quick/hopt_methodcall1.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_methodcall1.php.expect
rename to hphp/test/quick/hopt_methodcall1.php.expect
diff --git a/hphp/test/vm/hopt_methodcall2.php b/hphp/test/quick/hopt_methodcall2.php
similarity index 100%
rename from hphp/test/vm/hopt_methodcall2.php
rename to hphp/test/quick/hopt_methodcall2.php
diff --git a/hphp/test/vm/hopt_methodcall2.php.expect b/hphp/test/quick/hopt_methodcall2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_methodcall2.php.expect
rename to hphp/test/quick/hopt_methodcall2.php.expect
diff --git a/hphp/test/vm/hopt_preparable.php b/hphp/test/quick/hopt_preparable.php
similarity index 100%
rename from hphp/test/vm/hopt_preparable.php
rename to hphp/test/quick/hopt_preparable.php
diff --git a/hphp/test/vm/hopt_preparable.php.expect b/hphp/test/quick/hopt_preparable.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_preparable.php.expect
rename to hphp/test/quick/hopt_preparable.php.expect
diff --git a/hphp/test/vm/hopt_sprop_accessibility.php b/hphp/test/quick/hopt_sprop_accessibility.php
similarity index 100%
rename from hphp/test/vm/hopt_sprop_accessibility.php
rename to hphp/test/quick/hopt_sprop_accessibility.php
diff --git a/hphp/test/vm/hopt_sprop_accessibility.php.expectf b/hphp/test/quick/hopt_sprop_accessibility.php.expectf
similarity index 100%
rename from hphp/test/vm/hopt_sprop_accessibility.php.expectf
rename to hphp/test/quick/hopt_sprop_accessibility.php.expectf
diff --git a/hphp/test/vm/hopt_sprop_accessibility2.php b/hphp/test/quick/hopt_sprop_accessibility2.php
similarity index 100%
rename from hphp/test/vm/hopt_sprop_accessibility2.php
rename to hphp/test/quick/hopt_sprop_accessibility2.php
diff --git a/hphp/test/vm/hopt_sprop_accessibility2.php.expect b/hphp/test/quick/hopt_sprop_accessibility2.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_sprop_accessibility2.php.expect
rename to hphp/test/quick/hopt_sprop_accessibility2.php.expect
diff --git a/hphp/test/vm/hopt_static_call.php b/hphp/test/quick/hopt_static_call.php
similarity index 100%
rename from hphp/test/vm/hopt_static_call.php
rename to hphp/test/quick/hopt_static_call.php
diff --git a/hphp/test/vm/hopt_static_call.php.expect b/hphp/test/quick/hopt_static_call.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_static_call.php.expect
rename to hphp/test/quick/hopt_static_call.php.expect
diff --git a/hphp/test/vm/hopt_static_call0.php b/hphp/test/quick/hopt_static_call0.php
similarity index 100%
rename from hphp/test/vm/hopt_static_call0.php
rename to hphp/test/quick/hopt_static_call0.php
diff --git a/hphp/test/vm/hopt_static_call0.php.expect b/hphp/test/quick/hopt_static_call0.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_static_call0.php.expect
rename to hphp/test/quick/hopt_static_call0.php.expect
diff --git a/hphp/test/vm/hopt_varenv.php b/hphp/test/quick/hopt_varenv.php
similarity index 100%
rename from hphp/test/vm/hopt_varenv.php
rename to hphp/test/quick/hopt_varenv.php
diff --git a/hphp/test/vm/hopt_varenv.php.expectf b/hphp/test/quick/hopt_varenv.php.expectf
similarity index 100%
rename from hphp/test/vm/hopt_varenv.php.expectf
rename to hphp/test/quick/hopt_varenv.php.expectf
diff --git a/hphp/test/vm/hopt_vgeth.php b/hphp/test/quick/hopt_vgeth.php
similarity index 100%
rename from hphp/test/vm/hopt_vgeth.php
rename to hphp/test/quick/hopt_vgeth.php
diff --git a/hphp/test/vm/hopt_vgeth.php.expect b/hphp/test/quick/hopt_vgeth.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_vgeth.php.expect
rename to hphp/test/quick/hopt_vgeth.php.expect
diff --git a/hphp/test/vm/hopt_vgetm.php b/hphp/test/quick/hopt_vgetm.php
similarity index 100%
rename from hphp/test/vm/hopt_vgetm.php
rename to hphp/test/quick/hopt_vgetm.php
diff --git a/hphp/test/vm/hopt_vgetm.php.expect b/hphp/test/quick/hopt_vgetm.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_vgetm.php.expect
rename to hphp/test/quick/hopt_vgetm.php.expect
diff --git a/hphp/test/vm/idn-uts46-basic.php b/hphp/test/quick/idn-uts46-basic.php
similarity index 100%
rename from hphp/test/vm/idn-uts46-basic.php
rename to hphp/test/quick/idn-uts46-basic.php
diff --git a/hphp/test/vm/idn-uts46-basic.php.expect b/hphp/test/quick/idn-uts46-basic.php.expect
similarity index 100%
rename from hphp/test/vm/idn-uts46-basic.php.expect
rename to hphp/test/quick/idn-uts46-basic.php.expect
diff --git a/hphp/test/vm/idn-uts46-errors.php b/hphp/test/quick/idn-uts46-errors.php
similarity index 100%
rename from hphp/test/vm/idn-uts46-errors.php
rename to hphp/test/quick/idn-uts46-errors.php
diff --git a/hphp/test/vm/idn-uts46-errors.php.expectf b/hphp/test/quick/idn-uts46-errors.php.expectf
similarity index 100%
rename from hphp/test/vm/idn-uts46-errors.php.expectf
rename to hphp/test/quick/idn-uts46-errors.php.expectf
diff --git a/hphp/test/vm/idx.php b/hphp/test/quick/idx.php
similarity index 100%
rename from hphp/test/vm/idx.php
rename to hphp/test/quick/idx.php
diff --git a/hphp/test/vm/idx.php.expect b/hphp/test/quick/idx.php.expect
similarity index 100%
rename from hphp/test/vm/idx.php.expect
rename to hphp/test/quick/idx.php.expect
diff --git a/hphp/test/vm/impl_abstract_ctor.php b/hphp/test/quick/impl_abstract_ctor.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_ctor.php
rename to hphp/test/quick/impl_abstract_ctor.php
diff --git a/hphp/test/vm/impl_abstract_ctor.php.expect b/hphp/test/quick/impl_abstract_ctor.php.expect
similarity index 100%
rename from hphp/test/vm/impl_abstract_ctor.php.expect
rename to hphp/test/quick/impl_abstract_ctor.php.expect
diff --git a/hphp/test/vm/impl_abstract_default_vals.php b/hphp/test/quick/impl_abstract_default_vals.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_default_vals.php
rename to hphp/test/quick/impl_abstract_default_vals.php
diff --git a/hphp/test/vm/impl_abstract_default_vals.php.expect b/hphp/test/quick/impl_abstract_default_vals.php.expect
similarity index 100%
rename from hphp/test/vm/impl_abstract_default_vals.php.expect
rename to hphp/test/quick/impl_abstract_default_vals.php.expect
diff --git a/hphp/test/vm/impl_abstract_dv_2a.php b/hphp/test/quick/impl_abstract_dv_2a.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_2a.php
rename to hphp/test/quick/impl_abstract_dv_2a.php
diff --git a/hphp/test/vm/impl_abstract_dv_2a.php.expectf b/hphp/test/quick/impl_abstract_dv_2a.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_2a.php.expectf
rename to hphp/test/quick/impl_abstract_dv_2a.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_3a.php b/hphp/test/quick/impl_abstract_dv_3a.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_3a.php
rename to hphp/test/quick/impl_abstract_dv_3a.php
diff --git a/hphp/test/vm/impl_abstract_dv_3a.php.expectf b/hphp/test/quick/impl_abstract_dv_3a.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_3a.php.expectf
rename to hphp/test/quick/impl_abstract_dv_3a.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_as.php b/hphp/test/quick/impl_abstract_dv_as.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_as.php
rename to hphp/test/quick/impl_abstract_dv_as.php
diff --git a/hphp/test/vm/impl_abstract_dv_as.php.expectf b/hphp/test/quick/impl_abstract_dv_as.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_as.php.expectf
rename to hphp/test/quick/impl_abstract_dv_as.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_b_Bool.php b/hphp/test/quick/impl_abstract_dv_b_Bool.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_b_Bool.php
rename to hphp/test/quick/impl_abstract_dv_b_Bool.php
diff --git a/hphp/test/vm/impl_abstract_dv_b_Bool.php.expectf b/hphp/test/quick/impl_abstract_dv_b_Bool.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_b_Bool.php.expectf
rename to hphp/test/quick/impl_abstract_dv_b_Bool.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_b_boolean.php b/hphp/test/quick/impl_abstract_dv_b_boolean.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_b_boolean.php
rename to hphp/test/quick/impl_abstract_dv_b_boolean.php
diff --git a/hphp/test/vm/impl_abstract_dv_b_boolean.php.expectf b/hphp/test/quick/impl_abstract_dv_b_boolean.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_b_boolean.php.expectf
rename to hphp/test/quick/impl_abstract_dv_b_boolean.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_i_Int.php b/hphp/test/quick/impl_abstract_dv_i_Int.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_i_Int.php
rename to hphp/test/quick/impl_abstract_dv_i_Int.php
diff --git a/hphp/test/vm/impl_abstract_dv_i_Int.php.expectf b/hphp/test/quick/impl_abstract_dv_i_Int.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_i_Int.php.expectf
rename to hphp/test/quick/impl_abstract_dv_i_Int.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_i_integer.php b/hphp/test/quick/impl_abstract_dv_i_integer.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_i_integer.php
rename to hphp/test/quick/impl_abstract_dv_i_integer.php
diff --git a/hphp/test/vm/impl_abstract_dv_i_integer.php.expectf b/hphp/test/quick/impl_abstract_dv_i_integer.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_i_integer.php.expectf
rename to hphp/test/quick/impl_abstract_dv_i_integer.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_ia.php b/hphp/test/quick/impl_abstract_dv_ia.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_ia.php
rename to hphp/test/quick/impl_abstract_dv_ia.php
diff --git a/hphp/test/vm/impl_abstract_dv_ia.php.expectf b/hphp/test/quick/impl_abstract_dv_ia.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_ia.php.expectf
rename to hphp/test/quick/impl_abstract_dv_ia.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_id.php b/hphp/test/quick/impl_abstract_dv_id.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_id.php
rename to hphp/test/quick/impl_abstract_dv_id.php
diff --git a/hphp/test/vm/impl_abstract_dv_id.php.expectf b/hphp/test/quick/impl_abstract_dv_id.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_id.php.expectf
rename to hphp/test/quick/impl_abstract_dv_id.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_io.php b/hphp/test/quick/impl_abstract_dv_io.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_io.php
rename to hphp/test/quick/impl_abstract_dv_io.php
diff --git a/hphp/test/vm/impl_abstract_dv_io.php.expectf b/hphp/test/quick/impl_abstract_dv_io.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_io.php.expectf
rename to hphp/test/quick/impl_abstract_dv_io.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_is.php b/hphp/test/quick/impl_abstract_dv_is.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_is.php
rename to hphp/test/quick/impl_abstract_dv_is.php
diff --git a/hphp/test/vm/impl_abstract_dv_is.php.expectf b/hphp/test/quick/impl_abstract_dv_is.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_is.php.expectf
rename to hphp/test/quick/impl_abstract_dv_is.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_sa.php b/hphp/test/quick/impl_abstract_dv_sa.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_sa.php
rename to hphp/test/quick/impl_abstract_dv_sa.php
diff --git a/hphp/test/vm/impl_abstract_dv_sa.php.expectf b/hphp/test/quick/impl_abstract_dv_sa.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_sa.php.expectf
rename to hphp/test/quick/impl_abstract_dv_sa.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_si.php b/hphp/test/quick/impl_abstract_dv_si.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_si.php
rename to hphp/test/quick/impl_abstract_dv_si.php
diff --git a/hphp/test/vm/impl_abstract_dv_si.php.expectf b/hphp/test/quick/impl_abstract_dv_si.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_si.php.expectf
rename to hphp/test/quick/impl_abstract_dv_si.php.expectf
diff --git a/hphp/test/vm/impl_abstract_dv_so.php b/hphp/test/quick/impl_abstract_dv_so.php
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_so.php
rename to hphp/test/quick/impl_abstract_dv_so.php
diff --git a/hphp/test/vm/impl_abstract_dv_so.php.expectf b/hphp/test/quick/impl_abstract_dv_so.php.expectf
similarity index 100%
rename from hphp/test/vm/impl_abstract_dv_so.php.expectf
rename to hphp/test/quick/impl_abstract_dv_so.php.expectf
diff --git a/hphp/test/vm/incdec-1.php b/hphp/test/quick/incdec-1.php
similarity index 100%
rename from hphp/test/vm/incdec-1.php
rename to hphp/test/quick/incdec-1.php
diff --git a/hphp/test/vm/incdec-1.php.expect b/hphp/test/quick/incdec-1.php.expect
similarity index 100%
rename from hphp/test/vm/incdec-1.php.expect
rename to hphp/test/quick/incdec-1.php.expect
diff --git a/hphp/test/vm/incdec-2.php b/hphp/test/quick/incdec-2.php
similarity index 100%
rename from hphp/test/vm/incdec-2.php
rename to hphp/test/quick/incdec-2.php
diff --git a/hphp/test/vm/incdec-2.php.expect b/hphp/test/quick/incdec-2.php.expect
similarity index 100%
rename from hphp/test/vm/incdec-2.php.expect
rename to hphp/test/quick/incdec-2.php.expect
diff --git a/hphp/test/vm/include.php b/hphp/test/quick/include.php
similarity index 100%
rename from hphp/test/vm/include.php
rename to hphp/test/quick/include.php
diff --git a/hphp/test/vm/include.php.expect b/hphp/test/quick/include.php.expect
similarity index 100%
rename from hphp/test/vm/include.php.expect
rename to hphp/test/quick/include.php.expect
diff --git a/hphp/test/quick/include2.php b/hphp/test/quick/include2.php
new file mode 100644
index 000000000..5bb2bc381
--- /dev/null
+++ b/hphp/test/quick/include2.php
@@ -0,0 +1,18 @@
+<?php
+function f() {}
+$x = 12;
+@f();
+$y = 34;
+@f();
+$z = 56;
+$t = include 'include2_a.php';
+var_dump($x);
+var_dump($y);
+var_dump($z);
+var_dump($t);
+$t = include_once 'include2_a.php';
+var_dump($t);
+$t = @include_once 'include_doesnt_exist.php';
+var_dump($t);
+$t = include_once 'include2_b.php';
+var_dump($t);
diff --git a/hphp/test/quick/include2.php.expect b/hphp/test/quick/include2.php.expect
new file mode 100644
index 000000000..c59433342
--- /dev/null
+++ b/hphp/test/quick/include2.php.expect
@@ -0,0 +1,10 @@
+int(12)
+int(34)
+int(56)
+int(13)
+int(35)
+int(57)
+int(1)
+bool(true)
+bool(false)
+int(1)
diff --git a/hphp/test/quick/include2_a.php b/hphp/test/quick/include2_a.php
new file mode 100644
index 000000000..fd83a4b35
--- /dev/null
+++ b/hphp/test/quick/include2_a.php
@@ -0,0 +1,7 @@
+<?php
+var_dump($x);
+var_dump($y);
+var_dump($z);
+$x = $x + 1;
+$y += 1;
+++$z;
diff --git a/hphp/test/quick/include2_b.php b/hphp/test/quick/include2_b.php
new file mode 100644
index 000000000..b791dd3a1
--- /dev/null
+++ b/hphp/test/quick/include2_b.php
@@ -0,0 +1,5 @@
+<?php
+
+// this file contains only hoistable definitions, so we bypass
+// running pseudoMain
+class Hoistable {}
diff --git a/hphp/test/quick/include3.php b/hphp/test/quick/include3.php
new file mode 100644
index 000000000..0eb2bae05
--- /dev/null
+++ b/hphp/test/quick/include3.php
@@ -0,0 +1,17 @@
+<?php
+
+class A {
+  private $c;
+  private $d;
+  public function f() {
+    eval('$this->a = 20; $this->c = 200;');
+    include 'include3_a.php';
+    echo $this->a."\n";
+    echo $this->b."\n";
+    echo $this->c."\n";
+    echo $this->d."\n";
+  }
+}
+
+$a = new A;
+$a->f();
diff --git a/hphp/test/quick/include3.php.expect b/hphp/test/quick/include3.php.expect
new file mode 100644
index 000000000..7e5d8fa90
--- /dev/null
+++ b/hphp/test/quick/include3.php.expect
@@ -0,0 +1,4 @@
+20
+15
+200
+150
diff --git a/hphp/test/quick/include3_a.php b/hphp/test/quick/include3_a.php
new file mode 100644
index 000000000..a57ad7b11
--- /dev/null
+++ b/hphp/test/quick/include3_a.php
@@ -0,0 +1,3 @@
+<?php
+$this->b=15;
+$this->d=150;
diff --git a/hphp/test/quick/include_b.php b/hphp/test/quick/include_b.php
new file mode 100644
index 000000000..74670821d
--- /dev/null
+++ b/hphp/test/quick/include_b.php
@@ -0,0 +1,6 @@
+<?php
+
+$a = 2;#"ab\n";
+$b = 3;#"b\n";
+
+print "Hello from b!\n";
diff --git a/hphp/test/vm/include_backtrace.php b/hphp/test/quick/include_backtrace.php
similarity index 100%
rename from hphp/test/vm/include_backtrace.php
rename to hphp/test/quick/include_backtrace.php
diff --git a/hphp/test/vm/include_backtrace.php.expectf b/hphp/test/quick/include_backtrace.php.expectf
similarity index 100%
rename from hphp/test/vm/include_backtrace.php.expectf
rename to hphp/test/quick/include_backtrace.php.expectf
diff --git a/hphp/test/vm/include_backtrace2.php b/hphp/test/quick/include_backtrace2.php
similarity index 100%
rename from hphp/test/vm/include_backtrace2.php
rename to hphp/test/quick/include_backtrace2.php
diff --git a/hphp/test/quick/include_c.php b/hphp/test/quick/include_c.php
new file mode 100644
index 000000000..b72871a17
--- /dev/null
+++ b/hphp/test/quick/include_c.php
@@ -0,0 +1,3 @@
+<?php
+
+print "Hello from c!\n";
diff --git a/hphp/test/quick/include_d.php b/hphp/test/quick/include_d.php
new file mode 100644
index 000000000..8eb4e1ea3
--- /dev/null
+++ b/hphp/test/quick/include_d.php
@@ -0,0 +1,3 @@
+<?php
+
+print "Hello from include_d\n";
diff --git a/hphp/test/vm/indirect-fn.php b/hphp/test/quick/indirect-fn.php
similarity index 100%
rename from hphp/test/vm/indirect-fn.php
rename to hphp/test/quick/indirect-fn.php
diff --git a/hphp/test/vm/indirect-fn.php.expect b/hphp/test/quick/indirect-fn.php.expect
similarity index 100%
rename from hphp/test/vm/indirect-fn.php.expect
rename to hphp/test/quick/indirect-fn.php.expect
diff --git a/hphp/test/quick/infinite.php b/hphp/test/quick/infinite.php
new file mode 100644
index 000000000..0af2f4540
--- /dev/null
+++ b/hphp/test/quick/infinite.php
@@ -0,0 +1,7 @@
+<?php
+
+for(; ;) {
+  for(; ;) { }
+}
+
+?>
diff --git a/hphp/test/vm/inherit-static-local.php b/hphp/test/quick/inherit-static-local.php
similarity index 100%
rename from hphp/test/vm/inherit-static-local.php
rename to hphp/test/quick/inherit-static-local.php
diff --git a/hphp/test/vm/inherit-static-local.php.expect b/hphp/test/quick/inherit-static-local.php.expect
similarity index 100%
rename from hphp/test/vm/inherit-static-local.php.expect
rename to hphp/test/quick/inherit-static-local.php.expect
diff --git a/hphp/test/vm/inittrace.php b/hphp/test/quick/inittrace.php
similarity index 100%
rename from hphp/test/vm/inittrace.php
rename to hphp/test/quick/inittrace.php
diff --git a/hphp/test/vm/inittrace.php.expect b/hphp/test/quick/inittrace.php.expect
similarity index 100%
rename from hphp/test/vm/inittrace.php.expect
rename to hphp/test/quick/inittrace.php.expect
diff --git a/hphp/test/vm/inline_closure_gen.php b/hphp/test/quick/inline_closure_gen.php
similarity index 100%
rename from hphp/test/vm/inline_closure_gen.php
rename to hphp/test/quick/inline_closure_gen.php
diff --git a/hphp/test/vm/inline_closure_gen.php.expect b/hphp/test/quick/inline_closure_gen.php.expect
similarity index 100%
rename from hphp/test/vm/inline_closure_gen.php.expect
rename to hphp/test/quick/inline_closure_gen.php.expect
diff --git a/hphp/test/vm/inline_surprise_throw.php b/hphp/test/quick/inline_surprise_throw.php
similarity index 100%
rename from hphp/test/vm/inline_surprise_throw.php
rename to hphp/test/quick/inline_surprise_throw.php
diff --git a/hphp/test/vm/inline_surprise_throw.php.expect b/hphp/test/quick/inline_surprise_throw.php.expect
similarity index 100%
rename from hphp/test/vm/inline_surprise_throw.php.expect
rename to hphp/test/quick/inline_surprise_throw.php.expect
diff --git a/hphp/test/vm/instanceof.php b/hphp/test/quick/instanceof.php
similarity index 100%
rename from hphp/test/vm/instanceof.php
rename to hphp/test/quick/instanceof.php
diff --git a/hphp/test/vm/instanceof.php.expect b/hphp/test/quick/instanceof.php.expect
similarity index 100%
rename from hphp/test/vm/instanceof.php.expect
rename to hphp/test/quick/instanceof.php.expect
diff --git a/hphp/test/vm/instanceofInterface.php b/hphp/test/quick/instanceofInterface.php
similarity index 100%
rename from hphp/test/vm/instanceofInterface.php
rename to hphp/test/quick/instanceofInterface.php
diff --git a/hphp/test/vm/instanceofInterface.php.expect b/hphp/test/quick/instanceofInterface.php.expect
similarity index 100%
rename from hphp/test/vm/instanceofInterface.php.expect
rename to hphp/test/quick/instanceofInterface.php.expect
diff --git a/hphp/test/vm/intercept.php b/hphp/test/quick/intercept.php
similarity index 100%
rename from hphp/test/vm/intercept.php
rename to hphp/test/quick/intercept.php
diff --git a/hphp/test/vm/intercept.php.expect b/hphp/test/quick/intercept.php.expect
similarity index 100%
rename from hphp/test/vm/intercept.php.expect
rename to hphp/test/quick/intercept.php.expect
diff --git a/hphp/test/quick/intercept2.php b/hphp/test/quick/intercept2.php
new file mode 100644
index 000000000..fbeb28cdd
--- /dev/null
+++ b/hphp/test/quick/intercept2.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * Test intercepts where callsites have already been bound to the
+ * pre-intercept function.
+ */
+
+function foo() {
+  var_dump(__METHOD__);
+}
+
+function bar() {
+  var_dump(__METHOD__);
+}
+
+function test() {
+  foo();
+}
+
+class C {
+  function __call($name, $args) {
+    var_dump(__METHOD__, $name, $args);
+  }
+}
+
+
+function swizzle($name, $obj, $args, $data, &$done) {
+  var_dump($name, $obj, $args, $data, $done);
+  $done = false;
+}
+
+function main() {
+  $c = new C();
+  for ($i = 0; $i < 3; $i++) {
+    test();
+    foo();
+    $c->snoot();
+    if ($i == 1) {
+      fb_intercept('foo', 'bar', false);
+      fb_intercept('C::__call', 'swizzle');
+    }
+  }
+}
+
+main();
+
diff --git a/hphp/test/quick/intercept2.php.expect b/hphp/test/quick/intercept2.php.expect
new file mode 100644
index 000000000..6060c1fb4
--- /dev/null
+++ b/hphp/test/quick/intercept2.php.expect
@@ -0,0 +1,30 @@
+string(3) "foo"
+string(3) "foo"
+string(9) "C::__call"
+string(5) "snoot"
+array(0) {
+}
+string(3) "foo"
+string(3) "foo"
+string(9) "C::__call"
+string(5) "snoot"
+array(0) {
+}
+string(3) "bar"
+string(3) "bar"
+string(9) "C::__call"
+object(C)#1 (0) {
+}
+array(2) {
+  [0]=>
+  string(5) "snoot"
+  [1]=>
+  array(0) {
+  }
+}
+NULL
+bool(true)
+string(9) "C::__call"
+string(5) "snoot"
+array(0) {
+}
diff --git a/hphp/test/vm/intercept3.php b/hphp/test/quick/intercept3.php
similarity index 100%
rename from hphp/test/vm/intercept3.php
rename to hphp/test/quick/intercept3.php
diff --git a/hphp/test/vm/intercept3.php.expect b/hphp/test/quick/intercept3.php.expect
similarity index 100%
rename from hphp/test/vm/intercept3.php.expect
rename to hphp/test/quick/intercept3.php.expect
diff --git a/hphp/test/vm/interface1.php b/hphp/test/quick/interface1.php
similarity index 100%
rename from hphp/test/vm/interface1.php
rename to hphp/test/quick/interface1.php
diff --git a/hphp/test/vm/interface1.php.expectf b/hphp/test/quick/interface1.php.expectf
similarity index 100%
rename from hphp/test/vm/interface1.php.expectf
rename to hphp/test/quick/interface1.php.expectf
diff --git a/hphp/test/vm/interface10.php b/hphp/test/quick/interface10.php
similarity index 100%
rename from hphp/test/vm/interface10.php
rename to hphp/test/quick/interface10.php
diff --git a/hphp/test/vm/interface10.php.expectf b/hphp/test/quick/interface10.php.expectf
similarity index 100%
rename from hphp/test/vm/interface10.php.expectf
rename to hphp/test/quick/interface10.php.expectf
diff --git a/hphp/test/vm/interface11.php b/hphp/test/quick/interface11.php
similarity index 100%
rename from hphp/test/vm/interface11.php
rename to hphp/test/quick/interface11.php
diff --git a/hphp/test/vm/interface11.php.expect b/hphp/test/quick/interface11.php.expect
similarity index 100%
rename from hphp/test/vm/interface11.php.expect
rename to hphp/test/quick/interface11.php.expect
diff --git a/hphp/test/vm/interface2.php b/hphp/test/quick/interface2.php
similarity index 100%
rename from hphp/test/vm/interface2.php
rename to hphp/test/quick/interface2.php
diff --git a/hphp/test/vm/interface2.php.expect b/hphp/test/quick/interface2.php.expect
similarity index 100%
rename from hphp/test/vm/interface2.php.expect
rename to hphp/test/quick/interface2.php.expect
diff --git a/hphp/test/vm/interface3.php b/hphp/test/quick/interface3.php
similarity index 100%
rename from hphp/test/vm/interface3.php
rename to hphp/test/quick/interface3.php
diff --git a/hphp/test/vm/interface3.php.expectf b/hphp/test/quick/interface3.php.expectf
similarity index 100%
rename from hphp/test/vm/interface3.php.expectf
rename to hphp/test/quick/interface3.php.expectf
diff --git a/hphp/test/vm/interface4.php b/hphp/test/quick/interface4.php
similarity index 100%
rename from hphp/test/vm/interface4.php
rename to hphp/test/quick/interface4.php
diff --git a/hphp/test/vm/interface4.php.expect b/hphp/test/quick/interface4.php.expect
similarity index 100%
rename from hphp/test/vm/interface4.php.expect
rename to hphp/test/quick/interface4.php.expect
diff --git a/hphp/test/vm/interface5.php b/hphp/test/quick/interface5.php
similarity index 100%
rename from hphp/test/vm/interface5.php
rename to hphp/test/quick/interface5.php
diff --git a/hphp/test/vm/interface5.php.expect b/hphp/test/quick/interface5.php.expect
similarity index 100%
rename from hphp/test/vm/interface5.php.expect
rename to hphp/test/quick/interface5.php.expect
diff --git a/hphp/test/vm/interface6.php b/hphp/test/quick/interface6.php
similarity index 100%
rename from hphp/test/vm/interface6.php
rename to hphp/test/quick/interface6.php
diff --git a/hphp/test/vm/interface6.php.expectf b/hphp/test/quick/interface6.php.expectf
similarity index 100%
rename from hphp/test/vm/interface6.php.expectf
rename to hphp/test/quick/interface6.php.expectf
diff --git a/hphp/test/vm/interface7.php b/hphp/test/quick/interface7.php
similarity index 100%
rename from hphp/test/vm/interface7.php
rename to hphp/test/quick/interface7.php
diff --git a/hphp/test/vm/interface7.php.expectf b/hphp/test/quick/interface7.php.expectf
similarity index 100%
rename from hphp/test/vm/interface7.php.expectf
rename to hphp/test/quick/interface7.php.expectf
diff --git a/hphp/test/vm/interface8.php b/hphp/test/quick/interface8.php
similarity index 100%
rename from hphp/test/vm/interface8.php
rename to hphp/test/quick/interface8.php
diff --git a/hphp/test/vm/interface8.php.expectf b/hphp/test/quick/interface8.php.expectf
similarity index 100%
rename from hphp/test/vm/interface8.php.expectf
rename to hphp/test/quick/interface8.php.expectf
diff --git a/hphp/test/vm/interface9.php b/hphp/test/quick/interface9.php
similarity index 100%
rename from hphp/test/vm/interface9.php
rename to hphp/test/quick/interface9.php
diff --git a/hphp/test/vm/interface9.php.expectf b/hphp/test/quick/interface9.php.expectf
similarity index 100%
rename from hphp/test/vm/interface9.php.expectf
rename to hphp/test/quick/interface9.php.expectf
diff --git a/hphp/test/vm/is_callable.php b/hphp/test/quick/is_callable.php
similarity index 100%
rename from hphp/test/vm/is_callable.php
rename to hphp/test/quick/is_callable.php
diff --git a/hphp/test/vm/is_callable.php.expect b/hphp/test/quick/is_callable.php.expect
similarity index 100%
rename from hphp/test/vm/is_callable.php.expect
rename to hphp/test/quick/is_callable.php.expect
diff --git a/hphp/test/vm/jitarray.php b/hphp/test/quick/jitarray.php
similarity index 100%
rename from hphp/test/vm/jitarray.php
rename to hphp/test/quick/jitarray.php
diff --git a/hphp/test/vm/jitarray.php.expect b/hphp/test/quick/jitarray.php.expect
similarity index 100%
rename from hphp/test/vm/jitarray.php.expect
rename to hphp/test/quick/jitarray.php.expect
diff --git a/hphp/test/vm/keyref_error.php b/hphp/test/quick/keyref_error.php
similarity index 100%
rename from hphp/test/vm/keyref_error.php
rename to hphp/test/quick/keyref_error.php
diff --git a/hphp/test/vm/keyref_error.php.expectf b/hphp/test/quick/keyref_error.php.expectf
similarity index 100%
rename from hphp/test/vm/keyref_error.php.expectf
rename to hphp/test/quick/keyref_error.php.expectf
diff --git a/hphp/test/vm/lc.php b/hphp/test/quick/lc.php
similarity index 100%
rename from hphp/test/vm/lc.php
rename to hphp/test/quick/lc.php
diff --git a/hphp/test/vm/lc.php.expect b/hphp/test/quick/lc.php.expect
similarity index 100%
rename from hphp/test/vm/lc.php.expect
rename to hphp/test/quick/lc.php.expect
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65492.php b/hphp/test/quick/lexer_heredoc_buffer_boundary_65492.php
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65492.php
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65492.php
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65492.php.expect b/hphp/test/quick/lexer_heredoc_buffer_boundary_65492.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65492.php.expect
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65492.php.expect
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65493.php b/hphp/test/quick/lexer_heredoc_buffer_boundary_65493.php
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65493.php
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65493.php
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65493.php.expect b/hphp/test/quick/lexer_heredoc_buffer_boundary_65493.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65493.php.expect
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65493.php.expect
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65494.php b/hphp/test/quick/lexer_heredoc_buffer_boundary_65494.php
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65494.php
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65494.php
diff --git a/hphp/test/vm/lexer_heredoc_buffer_boundary_65494.php.expect b/hphp/test/quick/lexer_heredoc_buffer_boundary_65494.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_buffer_boundary_65494.php.expect
rename to hphp/test/quick/lexer_heredoc_buffer_boundary_65494.php.expect
diff --git a/hphp/test/vm/lexer_heredoc_label_cornercases.php b/hphp/test/quick/lexer_heredoc_label_cornercases.php
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_label_cornercases.php
rename to hphp/test/quick/lexer_heredoc_label_cornercases.php
diff --git a/hphp/test/vm/lexer_heredoc_label_cornercases.php.expect b/hphp/test/quick/lexer_heredoc_label_cornercases.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_label_cornercases.php.expect
rename to hphp/test/quick/lexer_heredoc_label_cornercases.php.expect
diff --git a/hphp/test/vm/lexer_heredoc_many_buffers.php b/hphp/test/quick/lexer_heredoc_many_buffers.php
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_many_buffers.php
rename to hphp/test/quick/lexer_heredoc_many_buffers.php
diff --git a/hphp/test/vm/lexer_heredoc_many_buffers.php.expect b/hphp/test/quick/lexer_heredoc_many_buffers.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_heredoc_many_buffers.php.expect
rename to hphp/test/quick/lexer_heredoc_many_buffers.php.expect
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65492.php b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65492.php
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65492.php
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65492.php
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65492.php.expect b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65492.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65492.php.expect
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65492.php.expect
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65493.php b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65493.php
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65493.php
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65493.php
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65493.php.expect b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65493.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65493.php.expect
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65493.php.expect
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65494.php b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65494.php
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65494.php
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65494.php
diff --git a/hphp/test/vm/lexer_nowdoc_buffer_boundary_65494.php.expect b/hphp/test/quick/lexer_nowdoc_buffer_boundary_65494.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_buffer_boundary_65494.php.expect
rename to hphp/test/quick/lexer_nowdoc_buffer_boundary_65494.php.expect
diff --git a/hphp/test/vm/lexer_nowdoc_label_cornercases.php b/hphp/test/quick/lexer_nowdoc_label_cornercases.php
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_label_cornercases.php
rename to hphp/test/quick/lexer_nowdoc_label_cornercases.php
diff --git a/hphp/test/vm/lexer_nowdoc_label_cornercases.php.expect b/hphp/test/quick/lexer_nowdoc_label_cornercases.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_label_cornercases.php.expect
rename to hphp/test/quick/lexer_nowdoc_label_cornercases.php.expect
diff --git a/hphp/test/vm/lexer_nowdoc_many_buffers.php b/hphp/test/quick/lexer_nowdoc_many_buffers.php
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_many_buffers.php
rename to hphp/test/quick/lexer_nowdoc_many_buffers.php
diff --git a/hphp/test/vm/lexer_nowdoc_many_buffers.php.expect b/hphp/test/quick/lexer_nowdoc_many_buffers.php.expect
similarity index 100%
rename from hphp/test/vm/lexer_nowdoc_many_buffers.php.expect
rename to hphp/test/quick/lexer_nowdoc_many_buffers.php.expect
diff --git a/hphp/test/vm/list-assignment.php b/hphp/test/quick/list-assignment.php
similarity index 100%
rename from hphp/test/vm/list-assignment.php
rename to hphp/test/quick/list-assignment.php
diff --git a/hphp/test/vm/list-assignment.php.expectf b/hphp/test/quick/list-assignment.php.expectf
similarity index 100%
rename from hphp/test/vm/list-assignment.php.expectf
rename to hphp/test/quick/list-assignment.php.expectf
diff --git a/hphp/test/vm/locals.php b/hphp/test/quick/locals.php
similarity index 100%
rename from hphp/test/vm/locals.php
rename to hphp/test/quick/locals.php
diff --git a/hphp/test/vm/locals.php.expect b/hphp/test/quick/locals.php.expect
similarity index 100%
rename from hphp/test/vm/locals.php.expect
rename to hphp/test/quick/locals.php.expect
diff --git a/hphp/test/vm/lotsa-locals.php b/hphp/test/quick/lotsa-locals.php
similarity index 100%
rename from hphp/test/vm/lotsa-locals.php
rename to hphp/test/quick/lotsa-locals.php
diff --git a/hphp/test/vm/lotsa-locals.php.expect b/hphp/test/quick/lotsa-locals.php.expect
similarity index 100%
rename from hphp/test/vm/lotsa-locals.php.expect
rename to hphp/test/quick/lotsa-locals.php.expect
diff --git a/hphp/test/vm/lotta-args.php b/hphp/test/quick/lotta-args.php
similarity index 100%
rename from hphp/test/vm/lotta-args.php
rename to hphp/test/quick/lotta-args.php
diff --git a/hphp/test/vm/lotta-args.php.expect b/hphp/test/quick/lotta-args.php.expect
similarity index 100%
rename from hphp/test/vm/lotta-args.php.expect
rename to hphp/test/quick/lotta-args.php.expect
diff --git a/hphp/test/vm/magic-get-dtors.php b/hphp/test/quick/magic-get-dtors.php
similarity index 100%
rename from hphp/test/vm/magic-get-dtors.php
rename to hphp/test/quick/magic-get-dtors.php
diff --git a/hphp/test/vm/magic-get-dtors.php.expect b/hphp/test/quick/magic-get-dtors.php.expect
similarity index 100%
rename from hphp/test/vm/magic-get-dtors.php.expect
rename to hphp/test/quick/magic-get-dtors.php.expect
diff --git a/hphp/test/vm/magic-get-set.php b/hphp/test/quick/magic-get-set.php
similarity index 100%
rename from hphp/test/vm/magic-get-set.php
rename to hphp/test/quick/magic-get-set.php
diff --git a/hphp/test/vm/magic-get-set.php.expect b/hphp/test/quick/magic-get-set.php.expect
similarity index 100%
rename from hphp/test/vm/magic-get-set.php.expect
rename to hphp/test/quick/magic-get-set.php.expect
diff --git a/hphp/test/vm/mediawikitest.php b/hphp/test/quick/mediawikitest.php
similarity index 100%
rename from hphp/test/vm/mediawikitest.php
rename to hphp/test/quick/mediawikitest.php
diff --git a/hphp/test/vm/mediawikitest.php.expect b/hphp/test/quick/mediawikitest.php.expect
similarity index 100%
rename from hphp/test/vm/mediawikitest.php.expect
rename to hphp/test/quick/mediawikitest.php.expect
diff --git a/hphp/test/vm/method-non-object.php b/hphp/test/quick/method-non-object.php
similarity index 100%
rename from hphp/test/vm/method-non-object.php
rename to hphp/test/quick/method-non-object.php
diff --git a/hphp/test/vm/method-non-object.php.expectf b/hphp/test/quick/method-non-object.php.expectf
similarity index 100%
rename from hphp/test/vm/method-non-object.php.expectf
rename to hphp/test/quick/method-non-object.php.expectf
diff --git a/hphp/test/vm/method-non-object2.php b/hphp/test/quick/method-non-object2.php
similarity index 100%
rename from hphp/test/vm/method-non-object2.php
rename to hphp/test/quick/method-non-object2.php
diff --git a/hphp/test/vm/method-non-object2.php.expectf b/hphp/test/quick/method-non-object2.php.expectf
similarity index 100%
rename from hphp/test/vm/method-non-object2.php.expectf
rename to hphp/test/quick/method-non-object2.php.expectf
diff --git a/hphp/test/vm/method-undefined.php b/hphp/test/quick/method-undefined.php
similarity index 100%
rename from hphp/test/vm/method-undefined.php
rename to hphp/test/quick/method-undefined.php
diff --git a/hphp/test/vm/method-undefined.php.expectf b/hphp/test/quick/method-undefined.php.expectf
similarity index 100%
rename from hphp/test/vm/method-undefined.php.expectf
rename to hphp/test/quick/method-undefined.php.expectf
diff --git a/hphp/test/vm/method.php b/hphp/test/quick/method.php
similarity index 100%
rename from hphp/test/vm/method.php
rename to hphp/test/quick/method.php
diff --git a/hphp/test/vm/method.php.expect b/hphp/test/quick/method.php.expect
similarity index 100%
rename from hphp/test/vm/method.php.expect
rename to hphp/test/quick/method.php.expect
diff --git a/hphp/test/vm/method2.php b/hphp/test/quick/method2.php
similarity index 100%
rename from hphp/test/vm/method2.php
rename to hphp/test/quick/method2.php
diff --git a/hphp/test/vm/method2.php.expect b/hphp/test/quick/method2.php.expect
similarity index 100%
rename from hphp/test/vm/method2.php.expect
rename to hphp/test/quick/method2.php.expect
diff --git a/hphp/test/vm/method3.php b/hphp/test/quick/method3.php
similarity index 100%
rename from hphp/test/vm/method3.php
rename to hphp/test/quick/method3.php
diff --git a/hphp/test/vm/method3.php.expect b/hphp/test/quick/method3.php.expect
similarity index 100%
rename from hphp/test/vm/method3.php.expect
rename to hphp/test/quick/method3.php.expect
diff --git a/hphp/test/vm/missing_arg_exception.php b/hphp/test/quick/missing_arg_exception.php
similarity index 100%
rename from hphp/test/vm/missing_arg_exception.php
rename to hphp/test/quick/missing_arg_exception.php
diff --git a/hphp/test/vm/missing_arg_exception.php.expect b/hphp/test/quick/missing_arg_exception.php.expect
similarity index 100%
rename from hphp/test/vm/missing_arg_exception.php.expect
rename to hphp/test/quick/missing_arg_exception.php.expect
diff --git a/hphp/test/vm/mixedbag.php b/hphp/test/quick/mixedbag.php
similarity index 100%
rename from hphp/test/vm/mixedbag.php
rename to hphp/test/quick/mixedbag.php
diff --git a/hphp/test/vm/mixedbag.php.expect b/hphp/test/quick/mixedbag.php.expect
similarity index 100%
rename from hphp/test/vm/mixedbag.php.expect
rename to hphp/test/quick/mixedbag.php.expect
diff --git a/hphp/test/vm/mod.php b/hphp/test/quick/mod.php
similarity index 100%
rename from hphp/test/vm/mod.php
rename to hphp/test/quick/mod.php
diff --git a/hphp/test/vm/mod.php.expectf b/hphp/test/quick/mod.php.expectf
similarity index 100%
rename from hphp/test/vm/mod.php.expectf
rename to hphp/test/quick/mod.php.expectf
diff --git a/hphp/test/vm/mod.php.filter b/hphp/test/quick/mod.php.filter
similarity index 100%
rename from hphp/test/vm/mod.php.filter
rename to hphp/test/quick/mod.php.filter
diff --git a/hphp/test/vm/multidim_props.php b/hphp/test/quick/multidim_props.php
similarity index 100%
rename from hphp/test/vm/multidim_props.php
rename to hphp/test/quick/multidim_props.php
diff --git a/hphp/test/vm/multidim_props.php.expectf b/hphp/test/quick/multidim_props.php.expectf
similarity index 100%
rename from hphp/test/vm/multidim_props.php.expectf
rename to hphp/test/quick/multidim_props.php.expectf
diff --git a/hphp/test/vm/negjump.php b/hphp/test/quick/negjump.php
similarity index 100%
rename from hphp/test/vm/negjump.php
rename to hphp/test/quick/negjump.php
diff --git a/hphp/test/vm/negjump.php.expect b/hphp/test/quick/negjump.php.expect
similarity index 100%
rename from hphp/test/vm/negjump.php.expect
rename to hphp/test/quick/negjump.php.expect
diff --git a/hphp/test/vm/nested__destruct.php b/hphp/test/quick/nested__destruct.php
similarity index 100%
rename from hphp/test/vm/nested__destruct.php
rename to hphp/test/quick/nested__destruct.php
diff --git a/hphp/test/vm/nested__destruct.php.expect b/hphp/test/quick/nested__destruct.php.expect
similarity index 100%
rename from hphp/test/vm/nested__destruct.php.expect
rename to hphp/test/quick/nested__destruct.php.expect
diff --git a/hphp/test/vm/nested_parens.php b/hphp/test/quick/nested_parens.php
similarity index 100%
rename from hphp/test/vm/nested_parens.php
rename to hphp/test/quick/nested_parens.php
diff --git a/hphp/test/vm/nested_parens.php.expect b/hphp/test/quick/nested_parens.php.expect
similarity index 100%
rename from hphp/test/vm/nested_parens.php.expect
rename to hphp/test/quick/nested_parens.php.expect
diff --git a/hphp/test/vm/nested_vm_exceptions.php b/hphp/test/quick/nested_vm_exceptions.php
similarity index 100%
rename from hphp/test/vm/nested_vm_exceptions.php
rename to hphp/test/quick/nested_vm_exceptions.php
diff --git a/hphp/test/vm/nested_vm_exceptions.php.expectf b/hphp/test/quick/nested_vm_exceptions.php.expectf
similarity index 100%
rename from hphp/test/vm/nested_vm_exceptions.php.expectf
rename to hphp/test/quick/nested_vm_exceptions.php.expectf
diff --git a/hphp/test/vm/nested_vm_exceptions2.php b/hphp/test/quick/nested_vm_exceptions2.php
similarity index 100%
rename from hphp/test/vm/nested_vm_exceptions2.php
rename to hphp/test/quick/nested_vm_exceptions2.php
diff --git a/hphp/test/vm/nested_vm_exceptions2.php.expectf b/hphp/test/quick/nested_vm_exceptions2.php.expectf
similarity index 100%
rename from hphp/test/vm/nested_vm_exceptions2.php.expectf
rename to hphp/test/quick/nested_vm_exceptions2.php.expectf
diff --git a/hphp/test/vm/no_more_id_func.php b/hphp/test/quick/no_more_id_func.php
similarity index 100%
rename from hphp/test/vm/no_more_id_func.php
rename to hphp/test/quick/no_more_id_func.php
diff --git a/hphp/test/vm/no_more_id_func.php.expect b/hphp/test/quick/no_more_id_func.php.expect
similarity index 100%
rename from hphp/test/vm/no_more_id_func.php.expect
rename to hphp/test/quick/no_more_id_func.php.expect
diff --git a/hphp/test/vm/non-instance.php b/hphp/test/quick/non-instance.php
similarity index 100%
rename from hphp/test/vm/non-instance.php
rename to hphp/test/quick/non-instance.php
diff --git a/hphp/test/vm/non-instance.php.expect b/hphp/test/quick/non-instance.php.expect
similarity index 100%
rename from hphp/test/vm/non-instance.php.expect
rename to hphp/test/quick/non-instance.php.expect
diff --git a/hphp/test/vm/non-special-this.php b/hphp/test/quick/non-special-this.php
similarity index 100%
rename from hphp/test/vm/non-special-this.php
rename to hphp/test/quick/non-special-this.php
diff --git a/hphp/test/vm/non-special-this.php.expect b/hphp/test/quick/non-special-this.php.expect
similarity index 100%
rename from hphp/test/vm/non-special-this.php.expect
rename to hphp/test/quick/non-special-this.php.expect
diff --git a/hphp/test/vm/not-enough-args.php b/hphp/test/quick/not-enough-args.php
similarity index 100%
rename from hphp/test/vm/not-enough-args.php
rename to hphp/test/quick/not-enough-args.php
diff --git a/hphp/test/vm/not-enough-args.php.expectf b/hphp/test/quick/not-enough-args.php.expectf
similarity index 100%
rename from hphp/test/vm/not-enough-args.php.expectf
rename to hphp/test/quick/not-enough-args.php.expectf
diff --git a/hphp/test/vm/null_this.php b/hphp/test/quick/null_this.php
similarity index 100%
rename from hphp/test/vm/null_this.php
rename to hphp/test/quick/null_this.php
diff --git a/hphp/test/vm/null_this.php.expectf b/hphp/test/quick/null_this.php.expectf
similarity index 100%
rename from hphp/test/vm/null_this.php.expectf
rename to hphp/test/quick/null_this.php.expectf
diff --git a/hphp/test/vm/nullbranch.php b/hphp/test/quick/nullbranch.php
similarity index 100%
rename from hphp/test/vm/nullbranch.php
rename to hphp/test/quick/nullbranch.php
diff --git a/hphp/test/vm/nullbranch.php.expect b/hphp/test/quick/nullbranch.php.expect
similarity index 100%
rename from hphp/test/vm/nullbranch.php.expect
rename to hphp/test/quick/nullbranch.php.expect
diff --git a/hphp/test/vm/obj-sweep.php b/hphp/test/quick/obj-sweep.php
similarity index 100%
rename from hphp/test/vm/obj-sweep.php
rename to hphp/test/quick/obj-sweep.php
diff --git a/hphp/test/vm/obj-sweep.php.expect b/hphp/test/quick/obj-sweep.php.expect
similarity index 100%
rename from hphp/test/vm/obj-sweep.php.expect
rename to hphp/test/quick/obj-sweep.php.expect
diff --git a/hphp/test/vm/objiter.php b/hphp/test/quick/objiter.php
similarity index 100%
rename from hphp/test/vm/objiter.php
rename to hphp/test/quick/objiter.php
diff --git a/hphp/test/vm/objiter.php.expect b/hphp/test/quick/objiter.php.expect
similarity index 100%
rename from hphp/test/vm/objiter.php.expect
rename to hphp/test/quick/objiter.php.expect
diff --git a/hphp/test/vm/objmethod.php b/hphp/test/quick/objmethod.php
similarity index 100%
rename from hphp/test/vm/objmethod.php
rename to hphp/test/quick/objmethod.php
diff --git a/hphp/test/vm/objmethod.php.expectf b/hphp/test/quick/objmethod.php.expectf
similarity index 100%
rename from hphp/test/vm/objmethod.php.expectf
rename to hphp/test/quick/objmethod.php.expectf
diff --git a/hphp/test/vm/on_list_assign.php b/hphp/test/quick/on_list_assign.php
similarity index 100%
rename from hphp/test/vm/on_list_assign.php
rename to hphp/test/quick/on_list_assign.php
diff --git a/hphp/test/vm/on_list_assign.php.expectf b/hphp/test/quick/on_list_assign.php.expectf
similarity index 100%
rename from hphp/test/vm/on_list_assign.php.expectf
rename to hphp/test/quick/on_list_assign.php.expectf
diff --git a/hphp/test/vm/ops.php b/hphp/test/quick/ops.php
similarity index 100%
rename from hphp/test/vm/ops.php
rename to hphp/test/quick/ops.php
diff --git a/hphp/test/vm/ops.php.expectf b/hphp/test/quick/ops.php.expectf
similarity index 100%
rename from hphp/test/vm/ops.php.expectf
rename to hphp/test/quick/ops.php.expectf
diff --git a/hphp/test/vm/parse_fail_shapes.php b/hphp/test/quick/parse_fail_shapes.php
similarity index 100%
rename from hphp/test/vm/parse_fail_shapes.php
rename to hphp/test/quick/parse_fail_shapes.php
diff --git a/hphp/test/vm/parse_fail_shapes.php.expectf b/hphp/test/quick/parse_fail_shapes.php.expectf
similarity index 100%
rename from hphp/test/vm/parse_fail_shapes.php.expectf
rename to hphp/test/quick/parse_fail_shapes.php.expectf
diff --git a/hphp/test/vm/parse_fail_shapes2.php b/hphp/test/quick/parse_fail_shapes2.php
similarity index 100%
rename from hphp/test/vm/parse_fail_shapes2.php
rename to hphp/test/quick/parse_fail_shapes2.php
diff --git a/hphp/test/vm/parse_fail_shapes2.php.expectf b/hphp/test/quick/parse_fail_shapes2.php.expectf
similarity index 100%
rename from hphp/test/vm/parse_fail_shapes2.php.expectf
rename to hphp/test/quick/parse_fail_shapes2.php.expectf
diff --git a/hphp/test/vm/parse_shapes.php b/hphp/test/quick/parse_shapes.php
similarity index 100%
rename from hphp/test/vm/parse_shapes.php
rename to hphp/test/quick/parse_shapes.php
diff --git a/hphp/test/vm/parse_shapes.php.expectf b/hphp/test/quick/parse_shapes.php.expectf
similarity index 100%
rename from hphp/test/vm/parse_shapes.php.expectf
rename to hphp/test/quick/parse_shapes.php.expectf
diff --git a/hphp/test/vm/parse_type_not_typedef.php b/hphp/test/quick/parse_type_not_typedef.php
similarity index 100%
rename from hphp/test/vm/parse_type_not_typedef.php
rename to hphp/test/quick/parse_type_not_typedef.php
diff --git a/hphp/test/vm/parse_type_not_typedef.php.expect b/hphp/test/quick/parse_type_not_typedef.php.expect
similarity index 100%
rename from hphp/test/vm/parse_type_not_typedef.php.expect
rename to hphp/test/quick/parse_type_not_typedef.php.expect
diff --git a/hphp/test/vm/parser_massive_add_exp.php b/hphp/test/quick/parser_massive_add_exp.php
similarity index 100%
rename from hphp/test/vm/parser_massive_add_exp.php
rename to hphp/test/quick/parser_massive_add_exp.php
diff --git a/hphp/test/vm/parser_massive_add_exp.php.expect b/hphp/test/quick/parser_massive_add_exp.php.expect
similarity index 100%
rename from hphp/test/vm/parser_massive_add_exp.php.expect
rename to hphp/test/quick/parser_massive_add_exp.php.expect
diff --git a/hphp/test/vm/parser_massive_concat_exp.php b/hphp/test/quick/parser_massive_concat_exp.php
similarity index 100%
rename from hphp/test/vm/parser_massive_concat_exp.php
rename to hphp/test/quick/parser_massive_concat_exp.php
diff --git a/hphp/test/vm/parser_massive_concat_exp.php.expect b/hphp/test/quick/parser_massive_concat_exp.php.expect
similarity index 100%
rename from hphp/test/vm/parser_massive_concat_exp.php.expect
rename to hphp/test/quick/parser_massive_concat_exp.php.expect
diff --git a/hphp/test/quick/perfctr.php.disabled b/hphp/test/quick/perfctr.php.disabled
new file mode 100644
index 000000000..9b903801a
--- /dev/null
+++ b/hphp/test/quick/perfctr.php.disabled
@@ -0,0 +1,52 @@
+<?php
+
+function foo() {
+  $i = 0;
+  while($i < 100000) {
+    $i++;
+  }
+}
+
+$events = array("cpu-cycles",
+                "cache-references",
+                "cache-misses",
+                "branches",
+                "branch-misses",
+                "bus-cycles",
+                "L1-dcache-loads",
+                "L1-dcache-load-misses",
+                "L1-dcache-stores",
+                "L1-dcache-store-misses",
+                "L1-dcache-prefetches",
+                "L1-dcache-prefetch-misses",
+                "L1-icache-loads",
+                "L1-icache-load-misses",
+                "L1-icache-prefetches",
+                "L1-icache-prefetch-misses",
+                "LLC-loads",
+                "LLC-load-misses",
+                "LLC-stores",
+                "LLC-store-misses",
+                "LLC-prefetches",
+                "LLC-prefetch-misses",
+                "dTLB-loads",
+                "dTLB-load-misses",
+                "dTLB-stores",
+                "dTLB-store-misses",
+                "dTLB-prefetches",
+                "dTLB-prefetch-misses",
+                "iTLB-loads",
+                "iTLB-load-misses",
+                "branch-loads",
+                "branch-load-misses",
+                );
+
+var_dump(function_exists("hphp_set_hardware_events"));
+var_dump(function_exists("hphp_clear_hardware_events"));
+
+foreach($events as $e) {
+  hphp_set_hardware_events("$e");
+  foo();
+  var_dump(hphp_get_hardware_counters());
+  hphp_clear_hardware_events();
+}
diff --git a/hphp/test/quick/perfctr.php.expect b/hphp/test/quick/perfctr.php.expect
new file mode 100644
index 000000000..9276a5eec
--- /dev/null
+++ b/hphp/test/quick/perfctr.php.expect
@@ -0,0 +1,130 @@
+bool(true)
+bool(true)
+array(2) {
+  ["instructions"]=>
+  ["cpu-cycles"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["cache-references"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["cache-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["branches"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["branch-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["bus-cycles"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-load-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-stores"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-store-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-prefetches"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-dcache-prefetch-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-icache-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["L1-icache-load-misses"]=>
+}
+failed to set perf event: L1-icache-prefetches
+array(1) {
+  ["instructions"]=>
+}
+failed to set perf event: L1-icache-prefetch-misses
+array(1) {
+  ["instructions"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-load-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-stores"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-store-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-prefetches"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["LLC-prefetch-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["dTLB-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["dTLB-load-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["dTLB-stores"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["dTLB-store-misses"]=>
+}
+failed to set perf event: dTLB-prefetches
+array(1) {
+  ["instructions"]=>
+}
+failed to set perf event: dTLB-prefetch-misses
+array(1) {
+  ["instructions"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["iTLB-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["iTLB-load-misses"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["branch-loads"]=>
+}
+array(2) {
+  ["instructions"]=>
+  ["branch-load-misses"]=>
+}
diff --git a/hphp/test/quick/pinit.php b/hphp/test/quick/pinit.php
new file mode 100644
index 000000000..f865b1fed
--- /dev/null
+++ b/hphp/test/quick/pinit.php
@@ -0,0 +1,19 @@
+<?php
+
+// This is to trigger a specific refcounting bug in the VM, to do with object
+// initialization templates. #668149
+
+class Fub {
+  const FLUB = 'flub';
+  // This depends on a class constant, which means it will need a 86pinit().
+  public $dub = array(
+    self::FLUB => array(123)
+  );
+}
+
+$f = new Fub;
+var_dump($f->dub);
+unset($f);
+
+$f = new Fub;
+var_dump($f->dub);
diff --git a/hphp/test/vm/pinit.php.expect b/hphp/test/quick/pinit.php.expect
similarity index 100%
rename from hphp/test/vm/pinit.php.expect
rename to hphp/test/quick/pinit.php.expect
diff --git a/hphp/test/vm/poly-torture.php b/hphp/test/quick/poly-torture.php
similarity index 100%
rename from hphp/test/vm/poly-torture.php
rename to hphp/test/quick/poly-torture.php
diff --git a/hphp/test/vm/poly-torture.php.expectf b/hphp/test/quick/poly-torture.php.expectf
similarity index 100%
rename from hphp/test/vm/poly-torture.php.expectf
rename to hphp/test/quick/poly-torture.php.expectf
diff --git a/hphp/test/vm/preposts.php b/hphp/test/quick/preposts.php
similarity index 100%
rename from hphp/test/vm/preposts.php
rename to hphp/test/quick/preposts.php
diff --git a/hphp/test/vm/preposts.php.expect b/hphp/test/quick/preposts.php.expect
similarity index 100%
rename from hphp/test/vm/preposts.php.expect
rename to hphp/test/quick/preposts.php.expect
diff --git a/hphp/test/vm/printf.php b/hphp/test/quick/printf.php
similarity index 100%
rename from hphp/test/vm/printf.php
rename to hphp/test/quick/printf.php
diff --git a/hphp/test/vm/printf.php.expect b/hphp/test/quick/printf.php.expect
similarity index 100%
rename from hphp/test/vm/printf.php.expect
rename to hphp/test/quick/printf.php.expect
diff --git a/hphp/test/vm/priv1.php b/hphp/test/quick/priv1.php
similarity index 100%
rename from hphp/test/vm/priv1.php
rename to hphp/test/quick/priv1.php
diff --git a/hphp/test/vm/priv1.php.expectf b/hphp/test/quick/priv1.php.expectf
similarity index 100%
rename from hphp/test/vm/priv1.php.expectf
rename to hphp/test/quick/priv1.php.expectf
diff --git a/hphp/test/vm/priv2.php b/hphp/test/quick/priv2.php
similarity index 100%
rename from hphp/test/vm/priv2.php
rename to hphp/test/quick/priv2.php
diff --git a/hphp/test/vm/priv2.php.expectf b/hphp/test/quick/priv2.php.expectf
similarity index 100%
rename from hphp/test/vm/priv2.php.expectf
rename to hphp/test/quick/priv2.php.expectf
diff --git a/hphp/test/vm/priv3.php b/hphp/test/quick/priv3.php
similarity index 100%
rename from hphp/test/vm/priv3.php
rename to hphp/test/quick/priv3.php
diff --git a/hphp/test/vm/priv3.php.expectf b/hphp/test/quick/priv3.php.expectf
similarity index 100%
rename from hphp/test/vm/priv3.php.expectf
rename to hphp/test/quick/priv3.php.expectf
diff --git a/hphp/test/vm/priv4.php b/hphp/test/quick/priv4.php
similarity index 100%
rename from hphp/test/vm/priv4.php
rename to hphp/test/quick/priv4.php
diff --git a/hphp/test/vm/priv4.php.expectf b/hphp/test/quick/priv4.php.expectf
similarity index 100%
rename from hphp/test/vm/priv4.php.expectf
rename to hphp/test/quick/priv4.php.expectf
diff --git a/hphp/test/vm/priv5.php b/hphp/test/quick/priv5.php
similarity index 100%
rename from hphp/test/vm/priv5.php
rename to hphp/test/quick/priv5.php
diff --git a/hphp/test/vm/priv5.php.expectf b/hphp/test/quick/priv5.php.expectf
similarity index 100%
rename from hphp/test/vm/priv5.php.expectf
rename to hphp/test/quick/priv5.php.expectf
diff --git a/hphp/test/vm/priv6.php b/hphp/test/quick/priv6.php
similarity index 100%
rename from hphp/test/vm/priv6.php
rename to hphp/test/quick/priv6.php
diff --git a/hphp/test/vm/priv6.php.expectf b/hphp/test/quick/priv6.php.expectf
similarity index 100%
rename from hphp/test/vm/priv6.php.expectf
rename to hphp/test/quick/priv6.php.expectf
diff --git a/hphp/test/vm/prop-access-error1.php b/hphp/test/quick/prop-access-error1.php
similarity index 100%
rename from hphp/test/vm/prop-access-error1.php
rename to hphp/test/quick/prop-access-error1.php
diff --git a/hphp/test/vm/prop-access-error1.php.expectf b/hphp/test/quick/prop-access-error1.php.expectf
similarity index 100%
rename from hphp/test/vm/prop-access-error1.php.expectf
rename to hphp/test/quick/prop-access-error1.php.expectf
diff --git a/hphp/test/vm/prop_ctx.php b/hphp/test/quick/prop_ctx.php
similarity index 100%
rename from hphp/test/vm/prop_ctx.php
rename to hphp/test/quick/prop_ctx.php
diff --git a/hphp/test/vm/prop_ctx.php.expectf b/hphp/test/quick/prop_ctx.php.expectf
similarity index 100%
rename from hphp/test/vm/prop_ctx.php.expectf
rename to hphp/test/quick/prop_ctx.php.expectf
diff --git a/hphp/test/vm/propagate-array.php b/hphp/test/quick/propagate-array.php
similarity index 100%
rename from hphp/test/vm/propagate-array.php
rename to hphp/test/quick/propagate-array.php
diff --git a/hphp/test/vm/propagate-array.php.expect b/hphp/test/quick/propagate-array.php.expect
similarity index 100%
rename from hphp/test/vm/propagate-array.php.expect
rename to hphp/test/quick/propagate-array.php.expect
diff --git a/hphp/test/vm/properties-dynamic.php b/hphp/test/quick/properties-dynamic.php
similarity index 100%
rename from hphp/test/vm/properties-dynamic.php
rename to hphp/test/quick/properties-dynamic.php
diff --git a/hphp/test/vm/properties-dynamic.php.expect b/hphp/test/quick/properties-dynamic.php.expect
similarity index 100%
rename from hphp/test/vm/properties-dynamic.php.expect
rename to hphp/test/quick/properties-dynamic.php.expect
diff --git a/hphp/test/vm/properties.php b/hphp/test/quick/properties.php
similarity index 100%
rename from hphp/test/vm/properties.php
rename to hphp/test/quick/properties.php
diff --git a/hphp/test/vm/properties.php.expect b/hphp/test/quick/properties.php.expect
similarity index 100%
rename from hphp/test/vm/properties.php.expect
rename to hphp/test/quick/properties.php.expect
diff --git a/hphp/test/quick/properties2.php b/hphp/test/quick/properties2.php
new file mode 100644
index 000000000..d63b005ad
--- /dev/null
+++ b/hphp/test/quick/properties2.php
@@ -0,0 +1,36 @@
+<?php
+
+class X {
+  protected function foo() { echo "X::foo\n"; }
+  private function bar() { echo "X::bar\n"; }
+  protected $field = 1;
+};
+
+
+class A extends X {
+  protected function foo() {
+    echo "A::foo " . $this->field . "\n";
+  }
+};
+
+class B extends X {
+  function foo() {
+    $a = new A;
+    $a->foo();
+    $a->field = 123;
+    $a->foo();
+  }
+};
+
+$b = new B;
+$b->foo();
+
+class C extends phpmcc {
+  protected $a;
+  public function __construct() {
+    $this->a = 1;
+  }
+}
+
+$c = new C;
+var_dump($c);
diff --git a/hphp/test/quick/properties2.php.expect b/hphp/test/quick/properties2.php.expect
new file mode 100644
index 000000000..ab60042d4
--- /dev/null
+++ b/hphp/test/quick/properties2.php.expect
@@ -0,0 +1,6 @@
+A::foo 1
+A::foo 123
+object(C)#2 (1) {
+  ["a":protected]=>
+  int(1)
+}
diff --git a/hphp/test/vm/properties3.php b/hphp/test/quick/properties3.php
similarity index 100%
rename from hphp/test/vm/properties3.php
rename to hphp/test/quick/properties3.php
diff --git a/hphp/test/vm/properties3.php.expectf b/hphp/test/quick/properties3.php.expectf
similarity index 100%
rename from hphp/test/vm/properties3.php.expectf
rename to hphp/test/quick/properties3.php.expectf
diff --git a/hphp/test/vm/properties4.php b/hphp/test/quick/properties4.php
similarity index 100%
rename from hphp/test/vm/properties4.php
rename to hphp/test/quick/properties4.php
diff --git a/hphp/test/vm/properties4.php.expect b/hphp/test/quick/properties4.php.expect
similarity index 100%
rename from hphp/test/vm/properties4.php.expect
rename to hphp/test/quick/properties4.php.expect
diff --git a/hphp/test/vm/property_exists.php b/hphp/test/quick/property_exists.php
similarity index 100%
rename from hphp/test/vm/property_exists.php
rename to hphp/test/quick/property_exists.php
diff --git a/hphp/test/vm/property_exists.php.expect b/hphp/test/quick/property_exists.php.expect
similarity index 100%
rename from hphp/test/vm/property_exists.php.expect
rename to hphp/test/quick/property_exists.php.expect
diff --git a/hphp/test/vm/pseudomain1.php b/hphp/test/quick/pseudomain1.php
similarity index 100%
rename from hphp/test/vm/pseudomain1.php
rename to hphp/test/quick/pseudomain1.php
diff --git a/hphp/test/vm/pseudomain1.php.expect b/hphp/test/quick/pseudomain1.php.expect
similarity index 100%
rename from hphp/test/vm/pseudomain1.php.expect
rename to hphp/test/quick/pseudomain1.php.expect
diff --git a/hphp/test/vm/qop.php b/hphp/test/quick/qop.php
similarity index 100%
rename from hphp/test/vm/qop.php
rename to hphp/test/quick/qop.php
diff --git a/hphp/test/vm/qop.php.expect b/hphp/test/quick/qop.php.expect
similarity index 100%
rename from hphp/test/vm/qop.php.expect
rename to hphp/test/quick/qop.php.expect
diff --git a/hphp/test/vm/qop2.php b/hphp/test/quick/qop2.php
similarity index 100%
rename from hphp/test/vm/qop2.php
rename to hphp/test/quick/qop2.php
diff --git a/hphp/test/vm/qop2.php.expect b/hphp/test/quick/qop2.php.expect
similarity index 100%
rename from hphp/test/vm/qop2.php.expect
rename to hphp/test/quick/qop2.php.expect
diff --git a/hphp/test/quick/reassign_this1.php b/hphp/test/quick/reassign_this1.php
new file mode 100644
index 000000000..a201940cb
--- /dev/null
+++ b/hphp/test/quick/reassign_this1.php
@@ -0,0 +1,6 @@
+<?php
+class Foo {
+  public $x;
+}
+$this =& new Foo();
+echo $this->x;
diff --git a/hphp/test/quick/reassign_this1.php.expectf b/hphp/test/quick/reassign_this1.php.expectf
new file mode 100644
index 000000000..44dd76a06
--- /dev/null
+++ b/hphp/test/quick/reassign_this1.php.expectf
@@ -0,0 +1 @@
+HipHop Fatal error: Cannot re-assign $this in %s on line 5
diff --git a/hphp/test/quick/reassign_this2.php b/hphp/test/quick/reassign_this2.php
new file mode 100644
index 000000000..0c764b783
--- /dev/null
+++ b/hphp/test/quick/reassign_this2.php
@@ -0,0 +1,6 @@
+<?php
+$myarray = array(1 => 2, 2 => 3);
+
+foreach ($myarray as $a => $this) {
+  echo $a . " " . $this . "\n";
+}
diff --git a/hphp/test/quick/reassign_this2.php.expectf b/hphp/test/quick/reassign_this2.php.expectf
new file mode 100644
index 000000000..b8e92c91a
--- /dev/null
+++ b/hphp/test/quick/reassign_this2.php.expectf
@@ -0,0 +1 @@
+HipHop Fatal error: Cannot re-assign $this in %s on line 6
diff --git a/hphp/test/vm/recurse-reentry.php b/hphp/test/quick/recurse-reentry.php
similarity index 100%
rename from hphp/test/vm/recurse-reentry.php
rename to hphp/test/quick/recurse-reentry.php
diff --git a/hphp/test/vm/recurse-reentry.php.expectf b/hphp/test/quick/recurse-reentry.php.expectf
similarity index 100%
rename from hphp/test/vm/recurse-reentry.php.expectf
rename to hphp/test/quick/recurse-reentry.php.expectf
diff --git a/hphp/test/vm/redecl_abstract_method.php b/hphp/test/quick/redecl_abstract_method.php
similarity index 100%
rename from hphp/test/vm/redecl_abstract_method.php
rename to hphp/test/quick/redecl_abstract_method.php
diff --git a/hphp/test/vm/redecl_abstract_method.php.expectf b/hphp/test/quick/redecl_abstract_method.php.expectf
similarity index 100%
rename from hphp/test/vm/redecl_abstract_method.php.expectf
rename to hphp/test/quick/redecl_abstract_method.php.expectf
diff --git a/hphp/test/vm/redecl_abstract_method2.php b/hphp/test/quick/redecl_abstract_method2.php
similarity index 100%
rename from hphp/test/vm/redecl_abstract_method2.php
rename to hphp/test/quick/redecl_abstract_method2.php
diff --git a/hphp/test/vm/redecl_abstract_method2.php.expectf b/hphp/test/quick/redecl_abstract_method2.php.expectf
similarity index 100%
rename from hphp/test/vm/redecl_abstract_method2.php.expectf
rename to hphp/test/quick/redecl_abstract_method2.php.expectf
diff --git a/hphp/test/vm/redeclared_class1.php b/hphp/test/quick/redeclared_class1.php
similarity index 100%
rename from hphp/test/vm/redeclared_class1.php
rename to hphp/test/quick/redeclared_class1.php
diff --git a/hphp/test/vm/redeclared_class2.php b/hphp/test/quick/redeclared_class2.php
similarity index 100%
rename from hphp/test/vm/redeclared_class2.php
rename to hphp/test/quick/redeclared_class2.php
diff --git a/hphp/test/vm/redeclared_class_a.php b/hphp/test/quick/redeclared_class_a.php
similarity index 100%
rename from hphp/test/vm/redeclared_class_a.php
rename to hphp/test/quick/redeclared_class_a.php
diff --git a/hphp/test/vm/redeclared_class_a.php.expectf b/hphp/test/quick/redeclared_class_a.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_class_a.php.expectf
rename to hphp/test/quick/redeclared_class_a.php.expectf
diff --git a/hphp/test/vm/redeclared_class_b.php b/hphp/test/quick/redeclared_class_b.php
similarity index 100%
rename from hphp/test/vm/redeclared_class_b.php
rename to hphp/test/quick/redeclared_class_b.php
diff --git a/hphp/test/vm/redeclared_class_b.php.expectf b/hphp/test/quick/redeclared_class_b.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_class_b.php.expectf
rename to hphp/test/quick/redeclared_class_b.php.expectf
diff --git a/hphp/test/vm/redeclared_function.php b/hphp/test/quick/redeclared_function.php
similarity index 100%
rename from hphp/test/vm/redeclared_function.php
rename to hphp/test/quick/redeclared_function.php
diff --git a/hphp/test/vm/redeclared_function.php.expectf b/hphp/test/quick/redeclared_function.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_function.php.expectf
rename to hphp/test/quick/redeclared_function.php.expectf
diff --git a/hphp/test/vm/redeclared_method.php b/hphp/test/quick/redeclared_method.php
similarity index 100%
rename from hphp/test/vm/redeclared_method.php
rename to hphp/test/quick/redeclared_method.php
diff --git a/hphp/test/vm/redeclared_method.php.expectf b/hphp/test/quick/redeclared_method.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_method.php.expectf
rename to hphp/test/quick/redeclared_method.php.expectf
diff --git a/hphp/test/vm/redeclared_method1.php b/hphp/test/quick/redeclared_method1.php
similarity index 100%
rename from hphp/test/vm/redeclared_method1.php
rename to hphp/test/quick/redeclared_method1.php
diff --git a/hphp/test/vm/redeclared_method1.php.expectf b/hphp/test/quick/redeclared_method1.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_method1.php.expectf
rename to hphp/test/quick/redeclared_method1.php.expectf
diff --git a/hphp/test/vm/redeclared_method2.php b/hphp/test/quick/redeclared_method2.php
similarity index 100%
rename from hphp/test/vm/redeclared_method2.php
rename to hphp/test/quick/redeclared_method2.php
diff --git a/hphp/test/vm/redeclared_method2.php.expectf b/hphp/test/quick/redeclared_method2.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_method2.php.expectf
rename to hphp/test/quick/redeclared_method2.php.expectf
diff --git a/hphp/test/vm/redeclared_method3.php b/hphp/test/quick/redeclared_method3.php
similarity index 100%
rename from hphp/test/vm/redeclared_method3.php
rename to hphp/test/quick/redeclared_method3.php
diff --git a/hphp/test/vm/redeclared_method3.php.expectf b/hphp/test/quick/redeclared_method3.php.expectf
similarity index 100%
rename from hphp/test/vm/redeclared_method3.php.expectf
rename to hphp/test/quick/redeclared_method3.php.expectf
diff --git a/hphp/test/vm/redeclared_method4.php b/hphp/test/quick/redeclared_method4.php
similarity index 100%
rename from hphp/test/vm/redeclared_method4.php
rename to hphp/test/quick/redeclared_method4.php
diff --git a/hphp/test/vm/redeclared_method4.php.expect b/hphp/test/quick/redeclared_method4.php.expect
similarity index 100%
rename from hphp/test/vm/redeclared_method4.php.expect
rename to hphp/test/quick/redeclared_method4.php.expect
diff --git a/hphp/test/vm/redundant-ldref1.php b/hphp/test/quick/redundant-ldref1.php
similarity index 100%
rename from hphp/test/vm/redundant-ldref1.php
rename to hphp/test/quick/redundant-ldref1.php
diff --git a/hphp/test/vm/redundant-ldref1.php.expect b/hphp/test/quick/redundant-ldref1.php.expect
similarity index 100%
rename from hphp/test/vm/redundant-ldref1.php.expect
rename to hphp/test/quick/redundant-ldref1.php.expect
diff --git a/hphp/test/vm/ref_args.php b/hphp/test/quick/ref_args.php
similarity index 100%
rename from hphp/test/vm/ref_args.php
rename to hphp/test/quick/ref_args.php
diff --git a/hphp/test/vm/ref_args.php.expect b/hphp/test/quick/ref_args.php.expect
similarity index 100%
rename from hphp/test/vm/ref_args.php.expect
rename to hphp/test/quick/ref_args.php.expect
diff --git a/hphp/test/vm/reflect-default.php b/hphp/test/quick/reflect-default.php
similarity index 100%
rename from hphp/test/vm/reflect-default.php
rename to hphp/test/quick/reflect-default.php
diff --git a/hphp/test/vm/reflect-default.php.expect b/hphp/test/quick/reflect-default.php.expect
similarity index 100%
rename from hphp/test/vm/reflect-default.php.expect
rename to hphp/test/quick/reflect-default.php.expect
diff --git a/hphp/test/vm/reflection.php b/hphp/test/quick/reflection.php
similarity index 100%
rename from hphp/test/vm/reflection.php
rename to hphp/test/quick/reflection.php
diff --git a/hphp/test/vm/reflection.php.expectf b/hphp/test/quick/reflection.php.expectf
similarity index 100%
rename from hphp/test/vm/reflection.php.expectf
rename to hphp/test/quick/reflection.php.expectf
diff --git a/hphp/test/vm/reflection2.php b/hphp/test/quick/reflection2.php
similarity index 100%
rename from hphp/test/vm/reflection2.php
rename to hphp/test/quick/reflection2.php
diff --git a/hphp/test/vm/reflection2.php.expectf b/hphp/test/quick/reflection2.php.expectf
similarity index 100%
rename from hphp/test/vm/reflection2.php.expectf
rename to hphp/test/quick/reflection2.php.expectf
diff --git a/hphp/test/vm/reflection_isclosure.php b/hphp/test/quick/reflection_isclosure.php
similarity index 100%
rename from hphp/test/vm/reflection_isclosure.php
rename to hphp/test/quick/reflection_isclosure.php
diff --git a/hphp/test/vm/reflection_isclosure.php.expect b/hphp/test/quick/reflection_isclosure.php.expect
similarity index 100%
rename from hphp/test/vm/reflection_isclosure.php.expect
rename to hphp/test/quick/reflection_isclosure.php.expect
diff --git a/hphp/test/vm/reflection_noconstuctor.php b/hphp/test/quick/reflection_noconstuctor.php
similarity index 100%
rename from hphp/test/vm/reflection_noconstuctor.php
rename to hphp/test/quick/reflection_noconstuctor.php
diff --git a/hphp/test/vm/reflection_noconstuctor.php.expect b/hphp/test/quick/reflection_noconstuctor.php.expect
similarity index 100%
rename from hphp/test/vm/reflection_noconstuctor.php.expect
rename to hphp/test/quick/reflection_noconstuctor.php.expect
diff --git a/hphp/test/vm/regalloc-fun.php b/hphp/test/quick/regalloc-fun.php
similarity index 100%
rename from hphp/test/vm/regalloc-fun.php
rename to hphp/test/quick/regalloc-fun.php
diff --git a/hphp/test/vm/regalloc-fun.php.expect b/hphp/test/quick/regalloc-fun.php.expect
similarity index 100%
rename from hphp/test/vm/regalloc-fun.php.expect
rename to hphp/test/quick/regalloc-fun.php.expect
diff --git a/hphp/test/vm/regalloc.php b/hphp/test/quick/regalloc.php
similarity index 100%
rename from hphp/test/vm/regalloc.php
rename to hphp/test/quick/regalloc.php
diff --git a/hphp/test/vm/regalloc.php.expect b/hphp/test/quick/regalloc.php.expect
similarity index 100%
rename from hphp/test/vm/regalloc.php.expect
rename to hphp/test/quick/regalloc.php.expect
diff --git a/hphp/test/vm/regpressure.php b/hphp/test/quick/regpressure.php
similarity index 100%
rename from hphp/test/vm/regpressure.php
rename to hphp/test/quick/regpressure.php
diff --git a/hphp/test/vm/regpressure.php.expect b/hphp/test/quick/regpressure.php.expect
similarity index 100%
rename from hphp/test/vm/regpressure.php.expect
rename to hphp/test/quick/regpressure.php.expect
diff --git a/hphp/test/vm/regpressure2.php b/hphp/test/quick/regpressure2.php
similarity index 100%
rename from hphp/test/vm/regpressure2.php
rename to hphp/test/quick/regpressure2.php
diff --git a/hphp/test/vm/regpressure2.php.expect b/hphp/test/quick/regpressure2.php.expect
similarity index 100%
rename from hphp/test/vm/regpressure2.php.expect
rename to hphp/test/quick/regpressure2.php.expect
diff --git a/hphp/test/vm/rejit.php b/hphp/test/quick/rejit.php
similarity index 100%
rename from hphp/test/vm/rejit.php
rename to hphp/test/quick/rejit.php
diff --git a/hphp/test/tcr/bad_function_calls/1709.php.expect b/hphp/test/quick/rejit.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1709.php.expect
rename to hphp/test/quick/rejit.php.expect
diff --git a/hphp/test/vm/rename_dyn_function.php b/hphp/test/quick/rename_dyn_function.php
similarity index 100%
rename from hphp/test/vm/rename_dyn_function.php
rename to hphp/test/quick/rename_dyn_function.php
diff --git a/hphp/test/vm/rename_dyn_function.php.expect b/hphp/test/quick/rename_dyn_function.php.expect
similarity index 100%
rename from hphp/test/vm/rename_dyn_function.php.expect
rename to hphp/test/quick/rename_dyn_function.php.expect
diff --git a/hphp/test/vm/rename_dynamic.php b/hphp/test/quick/rename_dynamic.php
similarity index 100%
rename from hphp/test/vm/rename_dynamic.php
rename to hphp/test/quick/rename_dynamic.php
diff --git a/hphp/test/vm/rename_dynamic.php.expect b/hphp/test/quick/rename_dynamic.php.expect
similarity index 100%
rename from hphp/test/vm/rename_dynamic.php.expect
rename to hphp/test/quick/rename_dynamic.php.expect
diff --git a/hphp/test/vm/rename_function.php b/hphp/test/quick/rename_function.php
similarity index 100%
rename from hphp/test/vm/rename_function.php
rename to hphp/test/quick/rename_function.php
diff --git a/hphp/test/vm/rename_function.php.expect b/hphp/test/quick/rename_function.php.expect
similarity index 100%
rename from hphp/test/vm/rename_function.php.expect
rename to hphp/test/quick/rename_function.php.expect
diff --git a/hphp/test/vm/reqonce.php b/hphp/test/quick/reqonce.php
similarity index 100%
rename from hphp/test/vm/reqonce.php
rename to hphp/test/quick/reqonce.php
diff --git a/hphp/test/vm/reqonce.php.expect b/hphp/test/quick/reqonce.php.expect
similarity index 100%
rename from hphp/test/vm/reqonce.php.expect
rename to hphp/test/quick/reqonce.php.expect
diff --git a/hphp/test/vm/reqonce2.php b/hphp/test/quick/reqonce2.php
similarity index 100%
rename from hphp/test/vm/reqonce2.php
rename to hphp/test/quick/reqonce2.php
diff --git a/hphp/test/vm/reqonce2.php.expect b/hphp/test/quick/reqonce2.php.expect
similarity index 100%
rename from hphp/test/vm/reqonce2.php.expect
rename to hphp/test/quick/reqonce2.php.expect
diff --git a/hphp/test/vm/reqtests/mod.inc b/hphp/test/quick/reqtests/mod.inc
similarity index 100%
rename from hphp/test/vm/reqtests/mod.inc
rename to hphp/test/quick/reqtests/mod.inc
diff --git a/hphp/test/vm/reserved_class1.php b/hphp/test/quick/reserved_class1.php
similarity index 100%
rename from hphp/test/vm/reserved_class1.php
rename to hphp/test/quick/reserved_class1.php
diff --git a/hphp/test/vm/reserved_class1.php.expectf b/hphp/test/quick/reserved_class1.php.expectf
similarity index 100%
rename from hphp/test/vm/reserved_class1.php.expectf
rename to hphp/test/quick/reserved_class1.php.expectf
diff --git a/hphp/test/vm/reserved_class2.php b/hphp/test/quick/reserved_class2.php
similarity index 100%
rename from hphp/test/vm/reserved_class2.php
rename to hphp/test/quick/reserved_class2.php
diff --git a/hphp/test/vm/reserved_class2.php.expectf b/hphp/test/quick/reserved_class2.php.expectf
similarity index 100%
rename from hphp/test/vm/reserved_class2.php.expectf
rename to hphp/test/quick/reserved_class2.php.expectf
diff --git a/hphp/test/vm/resource.php b/hphp/test/quick/resource.php
similarity index 100%
rename from hphp/test/vm/resource.php
rename to hphp/test/quick/resource.php
diff --git a/hphp/test/vm/resource.php.expect b/hphp/test/quick/resource.php.expect
similarity index 100%
rename from hphp/test/vm/resource.php.expect
rename to hphp/test/quick/resource.php.expect
diff --git a/hphp/test/vm/resurrect.php b/hphp/test/quick/resurrect.php
similarity index 100%
rename from hphp/test/vm/resurrect.php
rename to hphp/test/quick/resurrect.php
diff --git a/hphp/test/vm/resurrect.php.expect b/hphp/test/quick/resurrect.php.expect
similarity index 100%
rename from hphp/test/vm/resurrect.php.expect
rename to hphp/test/quick/resurrect.php.expect
diff --git a/hphp/test/vm/retc-destruct.php b/hphp/test/quick/retc-destruct.php
similarity index 100%
rename from hphp/test/vm/retc-destruct.php
rename to hphp/test/quick/retc-destruct.php
diff --git a/hphp/test/vm/retc-destruct.php.expect b/hphp/test/quick/retc-destruct.php.expect
similarity index 100%
rename from hphp/test/vm/retc-destruct.php.expect
rename to hphp/test/quick/retc-destruct.php.expect
diff --git a/hphp/test/vm/return-from-foreach.php b/hphp/test/quick/return-from-foreach.php
similarity index 100%
rename from hphp/test/vm/return-from-foreach.php
rename to hphp/test/quick/return-from-foreach.php
diff --git a/hphp/test/vm/return-from-foreach.php.expect b/hphp/test/quick/return-from-foreach.php.expect
similarity index 100%
rename from hphp/test/vm/return-from-foreach.php.expect
rename to hphp/test/quick/return-from-foreach.php.expect
diff --git a/hphp/test/vm/retval_backtrace.php b/hphp/test/quick/retval_backtrace.php
similarity index 100%
rename from hphp/test/vm/retval_backtrace.php
rename to hphp/test/quick/retval_backtrace.php
diff --git a/hphp/test/vm/retval_backtrace.php.expect b/hphp/test/quick/retval_backtrace.php.expect
similarity index 100%
rename from hphp/test/vm/retval_backtrace.php.expect
rename to hphp/test/quick/retval_backtrace.php.expect
diff --git a/hphp/test/vm/retype.php b/hphp/test/quick/retype.php
similarity index 100%
rename from hphp/test/vm/retype.php
rename to hphp/test/quick/retype.php
diff --git a/hphp/test/vm/retype.php.expect b/hphp/test/quick/retype.php.expect
similarity index 100%
rename from hphp/test/vm/retype.php.expect
rename to hphp/test/quick/retype.php.expect
diff --git a/hphp/test/vm/sb_overflow.php b/hphp/test/quick/sb_overflow.php
similarity index 100%
rename from hphp/test/vm/sb_overflow.php
rename to hphp/test/quick/sb_overflow.php
diff --git a/hphp/test/vm/sb_overflow.php.expect b/hphp/test/quick/sb_overflow.php.expect
similarity index 100%
rename from hphp/test/vm/sb_overflow.php.expect
rename to hphp/test/quick/sb_overflow.php.expect
diff --git a/hphp/test/vm/selfparent.php b/hphp/test/quick/selfparent.php
similarity index 100%
rename from hphp/test/vm/selfparent.php
rename to hphp/test/quick/selfparent.php
diff --git a/hphp/test/vm/selfparent.php.expect b/hphp/test/quick/selfparent.php.expect
similarity index 100%
rename from hphp/test/vm/selfparent.php.expect
rename to hphp/test/quick/selfparent.php.expect
diff --git a/hphp/test/quick/serialization_limit.php b/hphp/test/quick/serialization_limit.php
new file mode 100644
index 000000000..785345710
--- /dev/null
+++ b/hphp/test/quick/serialization_limit.php
@@ -0,0 +1,18 @@
+<?php
+
+function foo($a) {
+  $v = array();
+  for ($i = 0; $i < 1024; $i++) {
+    $v[] = $a;
+  }
+  return $v;
+}
+
+function test() {
+  $a = foo(1);
+  $a = foo($a);
+  $a = foo($a);
+  print_r($a, true);
+}
+
+test();
diff --git a/hphp/test/quick/serialization_limit.php.expectf b/hphp/test/quick/serialization_limit.php.expectf
new file mode 100644
index 000000000..04af8ee7e
--- /dev/null
+++ b/hphp/test/quick/serialization_limit.php.expectf
@@ -0,0 +1 @@
+HipHop Notice: print_r() exceeded max bytes limit in %s on line 15
diff --git a/hphp/test/vm/serialize.php b/hphp/test/quick/serialize.php
similarity index 100%
rename from hphp/test/vm/serialize.php
rename to hphp/test/quick/serialize.php
diff --git a/hphp/test/vm/serialize.php.expect b/hphp/test/quick/serialize.php.expect
similarity index 100%
rename from hphp/test/vm/serialize.php.expect
rename to hphp/test/quick/serialize.php.expect
diff --git a/hphp/test/vm/setHelperPreError.php b/hphp/test/quick/setHelperPreError.php
similarity index 100%
rename from hphp/test/vm/setHelperPreError.php
rename to hphp/test/quick/setHelperPreError.php
diff --git a/hphp/test/vm/setHelperPreError.php.expectf b/hphp/test/quick/setHelperPreError.php.expectf
similarity index 100%
rename from hphp/test/vm/setHelperPreError.php.expectf
rename to hphp/test/quick/setHelperPreError.php.expectf
diff --git a/hphp/test/vm/setelemloc.php b/hphp/test/quick/setelemloc.php
similarity index 100%
rename from hphp/test/vm/setelemloc.php
rename to hphp/test/quick/setelemloc.php
diff --git a/hphp/test/vm/setelemloc.php.expect b/hphp/test/quick/setelemloc.php.expect
similarity index 100%
rename from hphp/test/vm/setelemloc.php.expect
rename to hphp/test/quick/setelemloc.php.expect
diff --git a/hphp/test/vm/setelemloc2.php b/hphp/test/quick/setelemloc2.php
similarity index 100%
rename from hphp/test/vm/setelemloc2.php
rename to hphp/test/quick/setelemloc2.php
diff --git a/hphp/test/vm/setelemloc2.php.expect b/hphp/test/quick/setelemloc2.php.expect
similarity index 100%
rename from hphp/test/vm/setelemloc2.php.expect
rename to hphp/test/quick/setelemloc2.php.expect
diff --git a/hphp/test/vm/setg-dtor.php b/hphp/test/quick/setg-dtor.php
similarity index 100%
rename from hphp/test/vm/setg-dtor.php
rename to hphp/test/quick/setg-dtor.php
diff --git a/hphp/test/vm/setg-dtor.php.expect b/hphp/test/quick/setg-dtor.php.expect
similarity index 100%
rename from hphp/test/vm/setg-dtor.php.expect
rename to hphp/test/quick/setg-dtor.php.expect
diff --git a/hphp/test/vm/seth-dtor.php b/hphp/test/quick/seth-dtor.php
similarity index 100%
rename from hphp/test/vm/seth-dtor.php
rename to hphp/test/quick/seth-dtor.php
diff --git a/hphp/test/vm/seth-dtor.php.expect b/hphp/test/quick/seth-dtor.php.expect
similarity index 100%
rename from hphp/test/vm/seth-dtor.php.expect
rename to hphp/test/quick/seth-dtor.php.expect
diff --git a/hphp/test/vm/seth-dtor3.php b/hphp/test/quick/seth-dtor3.php
similarity index 100%
rename from hphp/test/vm/seth-dtor3.php
rename to hphp/test/quick/seth-dtor3.php
diff --git a/hphp/test/vm/seth-dtor3.php.expect b/hphp/test/quick/seth-dtor3.php.expect
similarity index 100%
rename from hphp/test/vm/seth-dtor3.php.expect
rename to hphp/test/quick/seth-dtor3.php.expect
diff --git a/hphp/test/vm/setmcrash.php b/hphp/test/quick/setmcrash.php
similarity index 100%
rename from hphp/test/vm/setmcrash.php
rename to hphp/test/quick/setmcrash.php
diff --git a/hphp/test/tcr/bad_function_calls/1712.php.expect b/hphp/test/quick/setmcrash.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1712.php.expect
rename to hphp/test/quick/setmcrash.php.expect
diff --git a/hphp/test/vm/setmstr.php b/hphp/test/quick/setmstr.php
similarity index 100%
rename from hphp/test/vm/setmstr.php
rename to hphp/test/quick/setmstr.php
diff --git a/hphp/test/vm/setmstr.php.expect b/hphp/test/quick/setmstr.php.expect
similarity index 100%
rename from hphp/test/vm/setmstr.php.expect
rename to hphp/test/quick/setmstr.php.expect
diff --git a/hphp/test/vm/setmstr2.php b/hphp/test/quick/setmstr2.php
similarity index 100%
rename from hphp/test/vm/setmstr2.php
rename to hphp/test/quick/setmstr2.php
diff --git a/hphp/test/vm/setmstr2.php.expect b/hphp/test/quick/setmstr2.php.expect
similarity index 100%
rename from hphp/test/vm/setmstr2.php.expect
rename to hphp/test/quick/setmstr2.php.expect
diff --git a/hphp/test/vm/setnewelemloc.php b/hphp/test/quick/setnewelemloc.php
similarity index 100%
rename from hphp/test/vm/setnewelemloc.php
rename to hphp/test/quick/setnewelemloc.php
diff --git a/hphp/test/vm/setnewelemloc.php.expect b/hphp/test/quick/setnewelemloc.php.expect
similarity index 100%
rename from hphp/test/vm/setnewelemloc.php.expect
rename to hphp/test/quick/setnewelemloc.php.expect
diff --git a/hphp/test/vm/setnewelemloc2.php b/hphp/test/quick/setnewelemloc2.php
similarity index 100%
rename from hphp/test/vm/setnewelemloc2.php
rename to hphp/test/quick/setnewelemloc2.php
diff --git a/hphp/test/vm/setnewelemloc2.php.expect b/hphp/test/quick/setnewelemloc2.php.expect
similarity index 100%
rename from hphp/test/vm/setnewelemloc2.php.expect
rename to hphp/test/quick/setnewelemloc2.php.expect
diff --git a/hphp/test/vm/setop-incdec-refs.php b/hphp/test/quick/setop-incdec-refs.php
similarity index 100%
rename from hphp/test/vm/setop-incdec-refs.php
rename to hphp/test/quick/setop-incdec-refs.php
diff --git a/hphp/test/vm/setop-incdec-refs.php.expect b/hphp/test/quick/setop-incdec-refs.php.expect
similarity index 100%
rename from hphp/test/vm/setop-incdec-refs.php.expect
rename to hphp/test/quick/setop-incdec-refs.php.expect
diff --git a/hphp/test/vm/setprofile_throw.php b/hphp/test/quick/setprofile_throw.php
similarity index 100%
rename from hphp/test/vm/setprofile_throw.php
rename to hphp/test/quick/setprofile_throw.php
diff --git a/hphp/test/vm/setprofile_throw.php.expect b/hphp/test/quick/setprofile_throw.php.expect
similarity index 100%
rename from hphp/test/vm/setprofile_throw.php.expect
rename to hphp/test/quick/setprofile_throw.php.expect
diff --git a/hphp/test/vm/sets-dtor.php b/hphp/test/quick/sets-dtor.php
similarity index 100%
rename from hphp/test/vm/sets-dtor.php
rename to hphp/test/quick/sets-dtor.php
diff --git a/hphp/test/vm/sets-dtor.php.expect b/hphp/test/quick/sets-dtor.php.expect
similarity index 100%
rename from hphp/test/vm/sets-dtor.php.expect
rename to hphp/test/quick/sets-dtor.php.expect
diff --git a/hphp/test/vm/silencer.php b/hphp/test/quick/silencer.php
similarity index 100%
rename from hphp/test/vm/silencer.php
rename to hphp/test/quick/silencer.php
diff --git a/hphp/test/vm/silencer.php.expectf b/hphp/test/quick/silencer.php.expectf
similarity index 100%
rename from hphp/test/vm/silencer.php.expectf
rename to hphp/test/quick/silencer.php.expectf
diff --git a/hphp/test/vm/simpl-0.php b/hphp/test/quick/simpl-0.php
similarity index 100%
rename from hphp/test/vm/simpl-0.php
rename to hphp/test/quick/simpl-0.php
diff --git a/hphp/test/vm/simpl-0.php.expect b/hphp/test/quick/simpl-0.php.expect
similarity index 100%
rename from hphp/test/vm/simpl-0.php.expect
rename to hphp/test/quick/simpl-0.php.expect
diff --git a/hphp/test/vm/simpl-1.php b/hphp/test/quick/simpl-1.php
similarity index 100%
rename from hphp/test/vm/simpl-1.php
rename to hphp/test/quick/simpl-1.php
diff --git a/hphp/test/vm/simpl-1.php.expect b/hphp/test/quick/simpl-1.php.expect
similarity index 100%
rename from hphp/test/vm/simpl-1.php.expect
rename to hphp/test/quick/simpl-1.php.expect
diff --git a/hphp/test/vm/sp.php b/hphp/test/quick/sp.php
similarity index 100%
rename from hphp/test/vm/sp.php
rename to hphp/test/quick/sp.php
diff --git a/hphp/test/vm/sp.php.expect b/hphp/test/quick/sp.php.expect
similarity index 100%
rename from hphp/test/vm/sp.php.expect
rename to hphp/test/quick/sp.php.expect
diff --git a/hphp/test/vm/squishdefval.php b/hphp/test/quick/squishdefval.php
similarity index 100%
rename from hphp/test/vm/squishdefval.php
rename to hphp/test/quick/squishdefval.php
diff --git a/hphp/test/vm/squishdefval.php.expect b/hphp/test/quick/squishdefval.php.expect
similarity index 100%
rename from hphp/test/vm/squishdefval.php.expect
rename to hphp/test/quick/squishdefval.php.expect
diff --git a/hphp/test/vm/static-in-vector.php b/hphp/test/quick/static-in-vector.php
similarity index 100%
rename from hphp/test/vm/static-in-vector.php
rename to hphp/test/quick/static-in-vector.php
diff --git a/hphp/test/vm/static-in-vector.php.expect b/hphp/test/quick/static-in-vector.php.expect
similarity index 100%
rename from hphp/test/vm/static-in-vector.php.expect
rename to hphp/test/quick/static-in-vector.php.expect
diff --git a/hphp/test/vm/static_array.php b/hphp/test/quick/static_array.php
similarity index 100%
rename from hphp/test/vm/static_array.php
rename to hphp/test/quick/static_array.php
diff --git a/hphp/test/vm/static_array.php.expectf b/hphp/test/quick/static_array.php.expectf
similarity index 100%
rename from hphp/test/vm/static_array.php.expectf
rename to hphp/test/quick/static_array.php.expectf
diff --git a/hphp/test/vm/static_closure.php b/hphp/test/quick/static_closure.php
similarity index 100%
rename from hphp/test/vm/static_closure.php
rename to hphp/test/quick/static_closure.php
diff --git a/hphp/test/vm/static_closure.php.expect b/hphp/test/quick/static_closure.php.expect
similarity index 100%
rename from hphp/test/vm/static_closure.php.expect
rename to hphp/test/quick/static_closure.php.expect
diff --git a/hphp/test/vm/static_closure_gen.php b/hphp/test/quick/static_closure_gen.php
similarity index 100%
rename from hphp/test/vm/static_closure_gen.php
rename to hphp/test/quick/static_closure_gen.php
diff --git a/hphp/test/vm/static_closure_gen.php.expect b/hphp/test/quick/static_closure_gen.php.expect
similarity index 100%
rename from hphp/test/vm/static_closure_gen.php.expect
rename to hphp/test/quick/static_closure_gen.php.expect
diff --git a/hphp/test/vm/static_closure_params.php b/hphp/test/quick/static_closure_params.php
similarity index 100%
rename from hphp/test/vm/static_closure_params.php
rename to hphp/test/quick/static_closure_params.php
diff --git a/hphp/test/vm/static_closure_params.php.expect b/hphp/test/quick/static_closure_params.php.expect
similarity index 100%
rename from hphp/test/vm/static_closure_params.php.expect
rename to hphp/test/quick/static_closure_params.php.expect
diff --git a/hphp/test/vm/static_clscns.php b/hphp/test/quick/static_clscns.php
similarity index 100%
rename from hphp/test/vm/static_clscns.php
rename to hphp/test/quick/static_clscns.php
diff --git a/hphp/test/vm/static_clscns.php.expect b/hphp/test/quick/static_clscns.php.expect
similarity index 100%
rename from hphp/test/vm/static_clscns.php.expect
rename to hphp/test/quick/static_clscns.php.expect
diff --git a/hphp/test/vm/static_clsmethod.php b/hphp/test/quick/static_clsmethod.php
similarity index 100%
rename from hphp/test/vm/static_clsmethod.php
rename to hphp/test/quick/static_clsmethod.php
diff --git a/hphp/test/vm/static_clsmethod.php.expectf b/hphp/test/quick/static_clsmethod.php.expectf
similarity index 100%
rename from hphp/test/vm/static_clsmethod.php.expectf
rename to hphp/test/quick/static_clsmethod.php.expectf
diff --git a/hphp/test/vm/static_new.php b/hphp/test/quick/static_new.php
similarity index 100%
rename from hphp/test/vm/static_new.php
rename to hphp/test/quick/static_new.php
diff --git a/hphp/test/vm/static_new.php.expect b/hphp/test/quick/static_new.php.expect
similarity index 100%
rename from hphp/test/vm/static_new.php.expect
rename to hphp/test/quick/static_new.php.expect
diff --git a/hphp/test/vm/static_prop_eval_order.php b/hphp/test/quick/static_prop_eval_order.php
similarity index 100%
rename from hphp/test/vm/static_prop_eval_order.php
rename to hphp/test/quick/static_prop_eval_order.php
diff --git a/hphp/test/vm/static_prop_eval_order.php.expect b/hphp/test/quick/static_prop_eval_order.php.expect
similarity index 100%
rename from hphp/test/vm/static_prop_eval_order.php.expect
rename to hphp/test/quick/static_prop_eval_order.php.expect
diff --git a/hphp/test/vm/static_properties.php b/hphp/test/quick/static_properties.php
similarity index 100%
rename from hphp/test/vm/static_properties.php
rename to hphp/test/quick/static_properties.php
diff --git a/hphp/test/vm/static_properties.php.expect b/hphp/test/quick/static_properties.php.expect
similarity index 100%
rename from hphp/test/vm/static_properties.php.expect
rename to hphp/test/quick/static_properties.php.expect
diff --git a/hphp/test/vm/static_sprop.php b/hphp/test/quick/static_sprop.php
similarity index 100%
rename from hphp/test/vm/static_sprop.php
rename to hphp/test/quick/static_sprop.php
diff --git a/hphp/test/vm/static_sprop.php.expect b/hphp/test/quick/static_sprop.php.expect
similarity index 100%
rename from hphp/test/vm/static_sprop.php.expect
rename to hphp/test/quick/static_sprop.php.expect
diff --git a/hphp/test/vm/static_sprop2.php b/hphp/test/quick/static_sprop2.php
similarity index 100%
rename from hphp/test/vm/static_sprop2.php
rename to hphp/test/quick/static_sprop2.php
diff --git a/hphp/test/vm/static_sprop2.php.expectf b/hphp/test/quick/static_sprop2.php.expectf
similarity index 100%
rename from hphp/test/vm/static_sprop2.php.expectf
rename to hphp/test/quick/static_sprop2.php.expectf
diff --git a/hphp/test/vm/static_vars.php b/hphp/test/quick/static_vars.php
similarity index 100%
rename from hphp/test/vm/static_vars.php
rename to hphp/test/quick/static_vars.php
diff --git a/hphp/test/vm/static_vars.php.expect b/hphp/test/quick/static_vars.php.expect
similarity index 100%
rename from hphp/test/vm/static_vars.php.expect
rename to hphp/test/quick/static_vars.php.expect
diff --git a/hphp/test/vm/strToInt.php b/hphp/test/quick/strToInt.php
similarity index 100%
rename from hphp/test/vm/strToInt.php
rename to hphp/test/quick/strToInt.php
diff --git a/hphp/test/vm/strToInt.php.expect b/hphp/test/quick/strToInt.php.expect
similarity index 100%
rename from hphp/test/vm/strToInt.php.expect
rename to hphp/test/quick/strToInt.php.expect
diff --git a/hphp/test/vm/strict.php b/hphp/test/quick/strict.php
similarity index 100%
rename from hphp/test/vm/strict.php
rename to hphp/test/quick/strict.php
diff --git a/hphp/test/vm/strict.php.expect b/hphp/test/quick/strict.php.expect
similarity index 100%
rename from hphp/test/vm/strict.php.expect
rename to hphp/test/quick/strict.php.expect
diff --git a/hphp/test/vm/strict_bad_end.php b/hphp/test/quick/strict_bad_end.php
similarity index 100%
rename from hphp/test/vm/strict_bad_end.php
rename to hphp/test/quick/strict_bad_end.php
diff --git a/hphp/test/vm/strict_bad_end.php.expectf b/hphp/test/quick/strict_bad_end.php.expectf
similarity index 100%
rename from hphp/test/vm/strict_bad_end.php.expectf
rename to hphp/test/quick/strict_bad_end.php.expectf
diff --git a/hphp/test/vm/strict_bad_start.php b/hphp/test/quick/strict_bad_start.php
similarity index 100%
rename from hphp/test/vm/strict_bad_start.php
rename to hphp/test/quick/strict_bad_start.php
diff --git a/hphp/test/vm/strict_bad_start.php.expectf b/hphp/test/quick/strict_bad_start.php.expectf
similarity index 100%
rename from hphp/test/vm/strict_bad_start.php.expectf
rename to hphp/test/quick/strict_bad_start.php.expectf
diff --git a/hphp/test/vm/strict_classes.php b/hphp/test/quick/strict_classes.php
similarity index 100%
rename from hphp/test/vm/strict_classes.php
rename to hphp/test/quick/strict_classes.php
diff --git a/hphp/test/vm/strict_classes.php.expect b/hphp/test/quick/strict_classes.php.expect
similarity index 100%
rename from hphp/test/vm/strict_classes.php.expect
rename to hphp/test/quick/strict_classes.php.expect
diff --git a/hphp/test/quick/strict_classes2.php b/hphp/test/quick/strict_classes2.php
new file mode 100644
index 000000000..ebc248015
--- /dev/null
+++ b/hphp/test/quick/strict_classes2.php
@@ -0,0 +1,14 @@
+<?hh
+
+class :x:frag {}
+
+class Foo {
+  private :x:frag $c;
+  protected :x:frag $b;
+  public :x:frag $a;
+
+  public static function bar(:x:frag $x): :x:frag {
+    return $x;
+  }
+}
+print_r(Foo::bar(<x:frag/>));
diff --git a/hphp/test/quick/strict_classes2.php.expect b/hphp/test/quick/strict_classes2.php.expect
new file mode 100644
index 000000000..eef6f7f3b
--- /dev/null
+++ b/hphp/test/quick/strict_classes2.php.expect
@@ -0,0 +1,3 @@
+xhp_x__frag Object
+(
+)
diff --git a/hphp/test/vm/strict_const_type.php b/hphp/test/quick/strict_const_type.php
similarity index 100%
rename from hphp/test/vm/strict_const_type.php
rename to hphp/test/quick/strict_const_type.php
diff --git a/hphp/test/vm/strict_extends.php b/hphp/test/quick/strict_extends.php
similarity index 100%
rename from hphp/test/vm/strict_extends.php
rename to hphp/test/quick/strict_extends.php
diff --git a/hphp/test/quick/strict_functions.php b/hphp/test/quick/strict_functions.php
new file mode 100644
index 000000000..32cf3c435
--- /dev/null
+++ b/hphp/test/quick/strict_functions.php
@@ -0,0 +1,14 @@
+<?hh
+function compose<X,Y,Z>((function(Y):Z) $f, (function(X):Y) $g):(function(X):Z) {
+  return function(X $x):Z use($f, $g) {
+    return $f($g($x));
+  };
+}
+
+$x = compose('htmlspecialchars_decode', 'htmlspecialchars');
+
+for($i=0;$i<256;$i++) {
+  if (chr($i) !== $x(chr($i))) {
+    echo "[$i]\n";
+  }
+}
diff --git a/hphp/test/tcr/class_constant/1608.php.expect b/hphp/test/quick/strict_functions.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1608.php.expect
rename to hphp/test/quick/strict_functions.php.expect
diff --git a/hphp/test/quick/strict_functions2.php b/hphp/test/quick/strict_functions2.php
new file mode 100644
index 000000000..6fbf4bb49
--- /dev/null
+++ b/hphp/test/quick/strict_functions2.php
@@ -0,0 +1,9 @@
+<?hh
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+function toto(mixed $x, ...): int {
+  return (int)$x;
+}
+
+echo toto(1), "\n";
+echo toto("1"), "\n";
diff --git a/hphp/test/quick/strict_functions2.php.expect b/hphp/test/quick/strict_functions2.php.expect
new file mode 100644
index 000000000..6ed281c75
--- /dev/null
+++ b/hphp/test/quick/strict_functions2.php.expect
@@ -0,0 +1,2 @@
+1
+1
diff --git a/hphp/test/quick/strict_functions3.php b/hphp/test/quick/strict_functions3.php
new file mode 100644
index 000000000..b5a7de02a
--- /dev/null
+++ b/hphp/test/quick/strict_functions3.php
@@ -0,0 +1,9 @@
+<?hh
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+class :x:frag { }
+
+function foo(:x:frag $x): :x:frag {
+  return $x;
+}
+print_r(foo(<x:frag/>));
diff --git a/hphp/test/quick/strict_functions3.php.expect b/hphp/test/quick/strict_functions3.php.expect
new file mode 100644
index 000000000..eef6f7f3b
--- /dev/null
+++ b/hphp/test/quick/strict_functions3.php.expect
@@ -0,0 +1,3 @@
+xhp_x__frag Object
+(
+)
diff --git a/hphp/test/vm/strict_numbers.php b/hphp/test/quick/strict_numbers.php
similarity index 100%
rename from hphp/test/vm/strict_numbers.php
rename to hphp/test/quick/strict_numbers.php
diff --git a/hphp/test/vm/strict_numbers.php.expectf b/hphp/test/quick/strict_numbers.php.expectf
similarity index 100%
rename from hphp/test/vm/strict_numbers.php.expectf
rename to hphp/test/quick/strict_numbers.php.expectf
diff --git a/hphp/test/vm/strict_tuples.php b/hphp/test/quick/strict_tuples.php
similarity index 100%
rename from hphp/test/vm/strict_tuples.php
rename to hphp/test/quick/strict_tuples.php
diff --git a/hphp/test/vm/strict_type_args.php b/hphp/test/quick/strict_type_args.php
similarity index 100%
rename from hphp/test/vm/strict_type_args.php
rename to hphp/test/quick/strict_type_args.php
diff --git a/hphp/test/vm/strict_type_args.php.expect b/hphp/test/quick/strict_type_args.php.expect
similarity index 100%
rename from hphp/test/vm/strict_type_args.php.expect
rename to hphp/test/quick/strict_type_args.php.expect
diff --git a/hphp/test/vm/strict_type_args2.php b/hphp/test/quick/strict_type_args2.php
similarity index 100%
rename from hphp/test/vm/strict_type_args2.php
rename to hphp/test/quick/strict_type_args2.php
diff --git a/hphp/test/vm/strict_type_args2.php.expectf b/hphp/test/quick/strict_type_args2.php.expectf
similarity index 100%
rename from hphp/test/vm/strict_type_args2.php.expectf
rename to hphp/test/quick/strict_type_args2.php.expectf
diff --git a/hphp/test/vm/strict_type_args3.php b/hphp/test/quick/strict_type_args3.php
similarity index 100%
rename from hphp/test/vm/strict_type_args3.php
rename to hphp/test/quick/strict_type_args3.php
diff --git a/hphp/test/vm/strict_type_args3.php.expectf b/hphp/test/quick/strict_type_args3.php.expectf
similarity index 100%
rename from hphp/test/vm/strict_type_args3.php.expectf
rename to hphp/test/quick/strict_type_args3.php.expectf
diff --git a/hphp/test/vm/string-cse.php b/hphp/test/quick/string-cse.php
similarity index 100%
rename from hphp/test/vm/string-cse.php
rename to hphp/test/quick/string-cse.php
diff --git a/hphp/test/vm/string-cse.php.expect b/hphp/test/quick/string-cse.php.expect
similarity index 100%
rename from hphp/test/vm/string-cse.php.expect
rename to hphp/test/quick/string-cse.php.expect
diff --git a/hphp/test/vm/string_copy.php b/hphp/test/quick/string_copy.php
similarity index 100%
rename from hphp/test/vm/string_copy.php
rename to hphp/test/quick/string_copy.php
diff --git a/hphp/test/vm/string_copy.php.expect b/hphp/test/quick/string_copy.php.expect
similarity index 100%
rename from hphp/test/vm/string_copy.php.expect
rename to hphp/test/quick/string_copy.php.expect
diff --git a/hphp/test/vm/switch.php b/hphp/test/quick/switch.php
similarity index 100%
rename from hphp/test/vm/switch.php
rename to hphp/test/quick/switch.php
diff --git a/hphp/test/vm/switch.php.expect b/hphp/test/quick/switch.php.expect
similarity index 100%
rename from hphp/test/vm/switch.php.expect
rename to hphp/test/quick/switch.php.expect
diff --git a/hphp/test/vm/switchRef.php b/hphp/test/quick/switchRef.php
similarity index 100%
rename from hphp/test/vm/switchRef.php
rename to hphp/test/quick/switchRef.php
diff --git a/hphp/test/vm/switchRef.php.expect b/hphp/test/quick/switchRef.php.expect
similarity index 100%
rename from hphp/test/vm/switchRef.php.expect
rename to hphp/test/quick/switchRef.php.expect
diff --git a/hphp/test/quick/switch_special_cases.php b/hphp/test/quick/switch_special_cases.php
new file mode 100644
index 000000000..eff369e7e
--- /dev/null
+++ b/hphp/test/quick/switch_special_cases.php
@@ -0,0 +1,67 @@
+<?php
+
+function err() {
+  return true;
+}
+set_error_handler('err');
+
+function doswitch($foo) {
+  echo "--------------------------------\n";
+  var_dump($foo);
+  switch($foo) {
+    case 0:
+      echo "0\n";
+      break;
+
+    case -1:
+      echo "-1\n";
+      break;
+
+    case 1:
+      echo "1\n";
+      break;
+
+    case 4:
+    case 2:
+      echo "2 or 4: $foo\n";
+      break;
+
+    case 5:
+      echo "5\n";
+      break;
+
+    default:
+      echo "default\n";
+      break;
+  }
+}
+
+class c {}
+
+function main() {
+  $f = fopen("/dev/null", "w");
+  $things = array(
+    null,
+    true,
+    false,
+    5,
+    2.0,
+    2.2,
+    '2',
+    '2.0',
+    '2.2',
+    'blar',
+    '',
+    4,
+    array(),
+    array('foo', 'floo'),
+    new stdclass(),
+    new c(),
+    $f
+  );
+  var_dump($f == 4);
+  foreach ($things as $t) {
+    doswitch($t);
+  }
+}
+main();
diff --git a/hphp/test/quick/switch_special_cases.php.expect b/hphp/test/quick/switch_special_cases.php.expect
new file mode 100644
index 000000000..890b12ae9
--- /dev/null
+++ b/hphp/test/quick/switch_special_cases.php.expect
@@ -0,0 +1,60 @@
+bool(true)
+--------------------------------
+NULL
+0
+--------------------------------
+bool(true)
+-1
+--------------------------------
+bool(false)
+0
+--------------------------------
+int(5)
+5
+--------------------------------
+float(2)
+2 or 4: 2
+--------------------------------
+float(2.2)
+default
+--------------------------------
+string(1) "2"
+2 or 4: 2
+--------------------------------
+string(3) "2.0"
+2 or 4: 2.0
+--------------------------------
+string(3) "2.2"
+default
+--------------------------------
+string(4) "blar"
+0
+--------------------------------
+string(0) ""
+0
+--------------------------------
+int(4)
+2 or 4: 4
+--------------------------------
+array(0) {
+}
+default
+--------------------------------
+array(2) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  string(4) "floo"
+}
+default
+--------------------------------
+object(stdClass)#1 (0) {
+}
+1
+--------------------------------
+object(c)#2 (0) {
+}
+1
+--------------------------------
+resource(4) of type (stream)
+2 or 4: Resource id #4
diff --git a/hphp/test/vm/syntax-error-incl.php b/hphp/test/quick/syntax-error-incl.php
similarity index 100%
rename from hphp/test/vm/syntax-error-incl.php
rename to hphp/test/quick/syntax-error-incl.php
diff --git a/hphp/test/vm/syntax-error-incl.php.expectf b/hphp/test/quick/syntax-error-incl.php.expectf
similarity index 100%
rename from hphp/test/vm/syntax-error-incl.php.expectf
rename to hphp/test/quick/syntax-error-incl.php.expectf
diff --git a/hphp/test/vm/syntax-error.php b/hphp/test/quick/syntax-error.php
similarity index 100%
rename from hphp/test/vm/syntax-error.php
rename to hphp/test/quick/syntax-error.php
diff --git a/hphp/test/vm/syntax-error.php.expectf b/hphp/test/quick/syntax-error.php.expectf
similarity index 100%
rename from hphp/test/vm/syntax-error.php.expectf
rename to hphp/test/quick/syntax-error.php.expectf
diff --git a/hphp/test/vm/temparray.php b/hphp/test/quick/temparray.php
similarity index 100%
rename from hphp/test/vm/temparray.php
rename to hphp/test/quick/temparray.php
diff --git a/hphp/test/vm/temparray.php.expect b/hphp/test/quick/temparray.php.expect
similarity index 100%
rename from hphp/test/vm/temparray.php.expect
rename to hphp/test/quick/temparray.php.expect
diff --git a/hphp/test/vm/throw.php b/hphp/test/quick/throw.php
similarity index 100%
rename from hphp/test/vm/throw.php
rename to hphp/test/quick/throw.php
diff --git a/hphp/test/vm/throw.php.expect b/hphp/test/quick/throw.php.expect
similarity index 100%
rename from hphp/test/vm/throw.php.expect
rename to hphp/test/quick/throw.php.expect
diff --git a/hphp/test/quick/tostring.php b/hphp/test/quick/tostring.php
new file mode 100644
index 000000000..6d620ba28
--- /dev/null
+++ b/hphp/test/quick/tostring.php
@@ -0,0 +1,19 @@
+<?php ;
+
+class X {
+  function not__toString() { throw new Exception('boom'); }
+}
+
+function foo($x) {
+  return $x;
+}
+
+function test($x) {
+  return foo((string)$x);
+}
+
+try {
+  test(new X);
+} catch (Exception $e) {
+  var_dump($e->getMessage());
+  }
diff --git a/hphp/test/quick/tostring.php.expectf b/hphp/test/quick/tostring.php.expectf
new file mode 100644
index 000000000..1bde2dbb0
--- /dev/null
+++ b/hphp/test/quick/tostring.php.expectf
@@ -0,0 +1 @@
+HipHop Fatal error: Bad type conversion: X::__toString() was not defined. in %s on line 12
diff --git a/hphp/test/vm/trailing_comma.php b/hphp/test/quick/trailing_comma.php
similarity index 100%
rename from hphp/test/vm/trailing_comma.php
rename to hphp/test/quick/trailing_comma.php
diff --git a/hphp/test/vm/trailing_comma.php.expect b/hphp/test/quick/trailing_comma.php.expect
similarity index 100%
rename from hphp/test/vm/trailing_comma.php.expect
rename to hphp/test/quick/trailing_comma.php.expect
diff --git a/hphp/test/vm/trailing_comma_bad1.php b/hphp/test/quick/trailing_comma_bad1.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad1.php
rename to hphp/test/quick/trailing_comma_bad1.php
diff --git a/hphp/test/vm/trailing_comma_bad1.php.expectf b/hphp/test/quick/trailing_comma_bad1.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad1.php.expectf
rename to hphp/test/quick/trailing_comma_bad1.php.expectf
diff --git a/hphp/test/vm/trailing_comma_bad2.php b/hphp/test/quick/trailing_comma_bad2.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad2.php
rename to hphp/test/quick/trailing_comma_bad2.php
diff --git a/hphp/test/vm/trailing_comma_bad2.php.expectf b/hphp/test/quick/trailing_comma_bad2.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad2.php.expectf
rename to hphp/test/quick/trailing_comma_bad2.php.expectf
diff --git a/hphp/test/vm/trailing_comma_bad3.php b/hphp/test/quick/trailing_comma_bad3.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad3.php
rename to hphp/test/quick/trailing_comma_bad3.php
diff --git a/hphp/test/vm/trailing_comma_bad3.php.expectf b/hphp/test/quick/trailing_comma_bad3.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad3.php.expectf
rename to hphp/test/quick/trailing_comma_bad3.php.expectf
diff --git a/hphp/test/vm/trailing_comma_bad4.php b/hphp/test/quick/trailing_comma_bad4.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad4.php
rename to hphp/test/quick/trailing_comma_bad4.php
diff --git a/hphp/test/vm/trailing_comma_bad4.php.expectf b/hphp/test/quick/trailing_comma_bad4.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad4.php.expectf
rename to hphp/test/quick/trailing_comma_bad4.php.expectf
diff --git a/hphp/test/vm/trailing_comma_bad5.php b/hphp/test/quick/trailing_comma_bad5.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad5.php
rename to hphp/test/quick/trailing_comma_bad5.php
diff --git a/hphp/test/vm/trailing_comma_bad5.php.expectf b/hphp/test/quick/trailing_comma_bad5.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad5.php.expectf
rename to hphp/test/quick/trailing_comma_bad5.php.expectf
diff --git a/hphp/test/vm/trailing_comma_bad6.php b/hphp/test/quick/trailing_comma_bad6.php
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad6.php
rename to hphp/test/quick/trailing_comma_bad6.php
diff --git a/hphp/test/vm/trailing_comma_bad6.php.expectf b/hphp/test/quick/trailing_comma_bad6.php.expectf
similarity index 100%
rename from hphp/test/vm/trailing_comma_bad6.php.expectf
rename to hphp/test/quick/trailing_comma_bad6.php.expectf
diff --git a/hphp/test/vm/trait_method_modif1.php b/hphp/test/quick/trait_method_modif1.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif1.php
rename to hphp/test/quick/trait_method_modif1.php
diff --git a/hphp/test/vm/trait_method_modif1.php.expectf b/hphp/test/quick/trait_method_modif1.php.expectf
similarity index 100%
rename from hphp/test/vm/trait_method_modif1.php.expectf
rename to hphp/test/quick/trait_method_modif1.php.expectf
diff --git a/hphp/test/vm/trait_method_modif10.php b/hphp/test/quick/trait_method_modif10.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif10.php
rename to hphp/test/quick/trait_method_modif10.php
diff --git a/hphp/test/vm/trait_method_modif10.php.expectf b/hphp/test/quick/trait_method_modif10.php.expectf
similarity index 100%
rename from hphp/test/vm/trait_method_modif10.php.expectf
rename to hphp/test/quick/trait_method_modif10.php.expectf
diff --git a/hphp/test/vm/trait_method_modif3.php b/hphp/test/quick/trait_method_modif3.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif3.php
rename to hphp/test/quick/trait_method_modif3.php
diff --git a/hphp/test/vm/trait_method_modif3.php.expectf b/hphp/test/quick/trait_method_modif3.php.expectf
similarity index 100%
rename from hphp/test/vm/trait_method_modif3.php.expectf
rename to hphp/test/quick/trait_method_modif3.php.expectf
diff --git a/hphp/test/vm/trait_method_modif4.php b/hphp/test/quick/trait_method_modif4.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif4.php
rename to hphp/test/quick/trait_method_modif4.php
diff --git a/hphp/test/vm/trait_method_modif4.php.expect b/hphp/test/quick/trait_method_modif4.php.expect
similarity index 100%
rename from hphp/test/vm/trait_method_modif4.php.expect
rename to hphp/test/quick/trait_method_modif4.php.expect
diff --git a/hphp/test/vm/trait_method_modif7.php b/hphp/test/quick/trait_method_modif7.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif7.php
rename to hphp/test/quick/trait_method_modif7.php
diff --git a/hphp/test/vm/trait_method_modif7.php.expectf b/hphp/test/quick/trait_method_modif7.php.expectf
similarity index 100%
rename from hphp/test/vm/trait_method_modif7.php.expectf
rename to hphp/test/quick/trait_method_modif7.php.expectf
diff --git a/hphp/test/vm/trait_method_modif8.php b/hphp/test/quick/trait_method_modif8.php
similarity index 100%
rename from hphp/test/vm/trait_method_modif8.php
rename to hphp/test/quick/trait_method_modif8.php
diff --git a/hphp/test/vm/trait_method_modif8.php.expectf b/hphp/test/quick/trait_method_modif8.php.expectf
similarity index 100%
rename from hphp/test/vm/trait_method_modif8.php.expectf
rename to hphp/test/quick/trait_method_modif8.php.expectf
diff --git a/hphp/test/vm/traits.php b/hphp/test/quick/traits.php
similarity index 100%
rename from hphp/test/vm/traits.php
rename to hphp/test/quick/traits.php
diff --git a/hphp/test/vm/traits.php.expect b/hphp/test/quick/traits.php.expect
similarity index 100%
rename from hphp/test/vm/traits.php.expect
rename to hphp/test/quick/traits.php.expect
diff --git a/hphp/test/vm/traits2.php b/hphp/test/quick/traits2.php
similarity index 100%
rename from hphp/test/vm/traits2.php
rename to hphp/test/quick/traits2.php
diff --git a/hphp/test/vm/traits2.php.expectf b/hphp/test/quick/traits2.php.expectf
similarity index 100%
rename from hphp/test/vm/traits2.php.expectf
rename to hphp/test/quick/traits2.php.expectf
diff --git a/hphp/test/vm/translator_unwind.hhas b/hphp/test/quick/translator_unwind.hhas
similarity index 100%
rename from hphp/test/vm/translator_unwind.hhas
rename to hphp/test/quick/translator_unwind.hhas
diff --git a/hphp/test/vm/translator_unwind.hhas.expect b/hphp/test/quick/translator_unwind.hhas.expect
similarity index 100%
rename from hphp/test/vm/translator_unwind.hhas.expect
rename to hphp/test/quick/translator_unwind.hhas.expect
diff --git a/hphp/test/vm/trim_dtor.php b/hphp/test/quick/trim_dtor.php
similarity index 100%
rename from hphp/test/vm/trim_dtor.php
rename to hphp/test/quick/trim_dtor.php
diff --git a/hphp/test/vm/trim_dtor.php.expect b/hphp/test/quick/trim_dtor.php.expect
similarity index 100%
rename from hphp/test/vm/trim_dtor.php.expect
rename to hphp/test/quick/trim_dtor.php.expect
diff --git a/hphp/test/vm/typechecks-dv.php b/hphp/test/quick/typechecks-dv.php
similarity index 100%
rename from hphp/test/vm/typechecks-dv.php
rename to hphp/test/quick/typechecks-dv.php
diff --git a/hphp/test/vm/typechecks-dv.php.expectf b/hphp/test/quick/typechecks-dv.php.expectf
similarity index 100%
rename from hphp/test/vm/typechecks-dv.php.expectf
rename to hphp/test/quick/typechecks-dv.php.expectf
diff --git a/hphp/test/vm/typechecks-obj.php b/hphp/test/quick/typechecks-obj.php
similarity index 100%
rename from hphp/test/vm/typechecks-obj.php
rename to hphp/test/quick/typechecks-obj.php
diff --git a/hphp/test/vm/typechecks-obj.php.expectf b/hphp/test/quick/typechecks-obj.php.expectf
similarity index 100%
rename from hphp/test/vm/typechecks-obj.php.expectf
rename to hphp/test/quick/typechecks-obj.php.expectf
diff --git a/hphp/test/vm/typedef_class.php b/hphp/test/quick/typedef_class.php
similarity index 100%
rename from hphp/test/vm/typedef_class.php
rename to hphp/test/quick/typedef_class.php
diff --git a/hphp/test/vm/typedef_class.php.expect b/hphp/test/quick/typedef_class.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_class.php.expect
rename to hphp/test/quick/typedef_class.php.expect
diff --git a/hphp/test/vm/typedef_class_fail1.php b/hphp/test/quick/typedef_class_fail1.php
similarity index 100%
rename from hphp/test/vm/typedef_class_fail1.php
rename to hphp/test/quick/typedef_class_fail1.php
diff --git a/hphp/test/vm/typedef_class_fail1.php.expectf b/hphp/test/quick/typedef_class_fail1.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_class_fail1.php.expectf
rename to hphp/test/quick/typedef_class_fail1.php.expectf
diff --git a/hphp/test/vm/typedef_class_fail2.php b/hphp/test/quick/typedef_class_fail2.php
similarity index 100%
rename from hphp/test/vm/typedef_class_fail2.php
rename to hphp/test/quick/typedef_class_fail2.php
diff --git a/hphp/test/vm/typedef_class_fail2.php.expectf b/hphp/test/quick/typedef_class_fail2.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_class_fail2.php.expectf
rename to hphp/test/quick/typedef_class_fail2.php.expectf
diff --git a/hphp/test/vm/typedef_cyclic.php b/hphp/test/quick/typedef_cyclic.php
similarity index 100%
rename from hphp/test/vm/typedef_cyclic.php
rename to hphp/test/quick/typedef_cyclic.php
diff --git a/hphp/test/vm/typedef_cyclic.php.expectf b/hphp/test/quick/typedef_cyclic.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_cyclic.php.expectf
rename to hphp/test/quick/typedef_cyclic.php.expectf
diff --git a/hphp/test/vm/typedef_duplicate.php b/hphp/test/quick/typedef_duplicate.php
similarity index 100%
rename from hphp/test/vm/typedef_duplicate.php
rename to hphp/test/quick/typedef_duplicate.php
diff --git a/hphp/test/vm/typedef_duplicate.php.expectf b/hphp/test/quick/typedef_duplicate.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_duplicate.php.expectf
rename to hphp/test/quick/typedef_duplicate.php.expectf
diff --git a/hphp/test/vm/typedef_duplicate2.php b/hphp/test/quick/typedef_duplicate2.php
similarity index 100%
rename from hphp/test/vm/typedef_duplicate2.php
rename to hphp/test/quick/typedef_duplicate2.php
diff --git a/hphp/test/vm/typedef_duplicate2.php.expectf b/hphp/test/quick/typedef_duplicate2.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_duplicate2.php.expectf
rename to hphp/test/quick/typedef_duplicate2.php.expectf
diff --git a/hphp/test/vm/typedef_duplicate3.php b/hphp/test/quick/typedef_duplicate3.php
similarity index 100%
rename from hphp/test/vm/typedef_duplicate3.php
rename to hphp/test/quick/typedef_duplicate3.php
diff --git a/hphp/test/vm/typedef_duplicate3.php.expectf b/hphp/test/quick/typedef_duplicate3.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_duplicate3.php.expectf
rename to hphp/test/quick/typedef_duplicate3.php.expectf
diff --git a/hphp/test/vm/typedef_duplicate4.php b/hphp/test/quick/typedef_duplicate4.php
similarity index 100%
rename from hphp/test/vm/typedef_duplicate4.php
rename to hphp/test/quick/typedef_duplicate4.php
diff --git a/hphp/test/vm/typedef_duplicate4.php.expectf b/hphp/test/quick/typedef_duplicate4.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_duplicate4.php.expectf
rename to hphp/test/quick/typedef_duplicate4.php.expectf
diff --git a/hphp/test/vm/typedef_duplicate_ok.php b/hphp/test/quick/typedef_duplicate_ok.php
similarity index 100%
rename from hphp/test/vm/typedef_duplicate_ok.php
rename to hphp/test/quick/typedef_duplicate_ok.php
diff --git a/hphp/test/vm/typedef_duplicate_ok.php.expect b/hphp/test/quick/typedef_duplicate_ok.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_duplicate_ok.php.expect
rename to hphp/test/quick/typedef_duplicate_ok.php.expect
diff --git a/hphp/test/vm/typedef_invalid_name.php b/hphp/test/quick/typedef_invalid_name.php
similarity index 100%
rename from hphp/test/vm/typedef_invalid_name.php
rename to hphp/test/quick/typedef_invalid_name.php
diff --git a/hphp/test/vm/typedef_invalid_name.php.expectf b/hphp/test/quick/typedef_invalid_name.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_invalid_name.php.expectf
rename to hphp/test/quick/typedef_invalid_name.php.expectf
diff --git a/hphp/test/vm/typedef_mixed_case.php b/hphp/test/quick/typedef_mixed_case.php
similarity index 100%
rename from hphp/test/vm/typedef_mixed_case.php
rename to hphp/test/quick/typedef_mixed_case.php
diff --git a/hphp/test/tcr/closure/1933.php.expect b/hphp/test/quick/typedef_mixed_case.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1933.php.expect
rename to hphp/test/quick/typedef_mixed_case.php.expect
diff --git a/hphp/test/vm/typedef_newtype.php b/hphp/test/quick/typedef_newtype.php
similarity index 100%
rename from hphp/test/vm/typedef_newtype.php
rename to hphp/test/quick/typedef_newtype.php
diff --git a/hphp/test/tcr/compilation/1239.php.expect b/hphp/test/quick/typedef_newtype.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1239.php.expect
rename to hphp/test/quick/typedef_newtype.php.expect
diff --git a/hphp/test/vm/typedef_non_class.php b/hphp/test/quick/typedef_non_class.php
similarity index 100%
rename from hphp/test/vm/typedef_non_class.php
rename to hphp/test/quick/typedef_non_class.php
diff --git a/hphp/test/vm/typedef_non_class.php.expect b/hphp/test/quick/typedef_non_class.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_non_class.php.expect
rename to hphp/test/quick/typedef_non_class.php.expect
diff --git a/hphp/test/vm/typedef_non_class_fail1.php b/hphp/test/quick/typedef_non_class_fail1.php
similarity index 100%
rename from hphp/test/vm/typedef_non_class_fail1.php
rename to hphp/test/quick/typedef_non_class_fail1.php
diff --git a/hphp/test/vm/typedef_non_class_fail1.php.expectf b/hphp/test/quick/typedef_non_class_fail1.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_non_class_fail1.php.expectf
rename to hphp/test/quick/typedef_non_class_fail1.php.expectf
diff --git a/hphp/test/vm/typedef_non_class_fail2.php b/hphp/test/quick/typedef_non_class_fail2.php
similarity index 100%
rename from hphp/test/vm/typedef_non_class_fail2.php
rename to hphp/test/quick/typedef_non_class_fail2.php
diff --git a/hphp/test/vm/typedef_non_class_fail2.php.expectf b/hphp/test/quick/typedef_non_class_fail2.php.expectf
similarity index 100%
rename from hphp/test/vm/typedef_non_class_fail2.php.expectf
rename to hphp/test/quick/typedef_non_class_fail2.php.expectf
diff --git a/hphp/test/vm/typedef_shape.php b/hphp/test/quick/typedef_shape.php
similarity index 100%
rename from hphp/test/vm/typedef_shape.php
rename to hphp/test/quick/typedef_shape.php
diff --git a/hphp/test/vm/typedef_shape.php.expect b/hphp/test/quick/typedef_shape.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_shape.php.expect
rename to hphp/test/quick/typedef_shape.php.expect
diff --git a/hphp/test/vm/typedef_to_typedef.php b/hphp/test/quick/typedef_to_typedef.php
similarity index 100%
rename from hphp/test/vm/typedef_to_typedef.php
rename to hphp/test/quick/typedef_to_typedef.php
diff --git a/hphp/test/vm/typedef_to_typedef.php.expect b/hphp/test/quick/typedef_to_typedef.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_to_typedef.php.expect
rename to hphp/test/quick/typedef_to_typedef.php.expect
diff --git a/hphp/test/vm/typehint_callable.php b/hphp/test/quick/typehint_callable.php
similarity index 100%
rename from hphp/test/vm/typehint_callable.php
rename to hphp/test/quick/typehint_callable.php
diff --git a/hphp/test/vm/typehint_callable.php.expectf b/hphp/test/quick/typehint_callable.php.expectf
similarity index 100%
rename from hphp/test/vm/typehint_callable.php.expectf
rename to hphp/test/quick/typehint_callable.php.expectf
diff --git a/hphp/test/vm/typehint_lsb_parent.php b/hphp/test/quick/typehint_lsb_parent.php
similarity index 100%
rename from hphp/test/vm/typehint_lsb_parent.php
rename to hphp/test/quick/typehint_lsb_parent.php
diff --git a/hphp/test/vm/typehint_lsb_parent.php.expectf b/hphp/test/quick/typehint_lsb_parent.php.expectf
similarity index 100%
rename from hphp/test/vm/typehint_lsb_parent.php.expectf
rename to hphp/test/quick/typehint_lsb_parent.php.expectf
diff --git a/hphp/test/vm/typehint_lsb_self.php b/hphp/test/quick/typehint_lsb_self.php
similarity index 100%
rename from hphp/test/vm/typehint_lsb_self.php
rename to hphp/test/quick/typehint_lsb_self.php
diff --git a/hphp/test/vm/typehint_lsb_self.php.expectf b/hphp/test/quick/typehint_lsb_self.php.expectf
similarity index 100%
rename from hphp/test/vm/typehint_lsb_self.php.expectf
rename to hphp/test/quick/typehint_lsb_self.php.expectf
diff --git a/hphp/test/vm/undefined-class.php b/hphp/test/quick/undefined-class.php
similarity index 100%
rename from hphp/test/vm/undefined-class.php
rename to hphp/test/quick/undefined-class.php
diff --git a/hphp/test/vm/undefined-class.php.expectf b/hphp/test/quick/undefined-class.php.expectf
similarity index 100%
rename from hphp/test/vm/undefined-class.php.expectf
rename to hphp/test/quick/undefined-class.php.expectf
diff --git a/hphp/test/vm/undefined-global.php b/hphp/test/quick/undefined-global.php
similarity index 100%
rename from hphp/test/vm/undefined-global.php
rename to hphp/test/quick/undefined-global.php
diff --git a/hphp/test/vm/undefined-global.php.expect b/hphp/test/quick/undefined-global.php.expect
similarity index 100%
rename from hphp/test/vm/undefined-global.php.expect
rename to hphp/test/quick/undefined-global.php.expect
diff --git a/hphp/test/vm/undefined-index.php b/hphp/test/quick/undefined-index.php
similarity index 100%
rename from hphp/test/vm/undefined-index.php
rename to hphp/test/quick/undefined-index.php
diff --git a/hphp/test/vm/undefined-index.php.expectf b/hphp/test/quick/undefined-index.php.expectf
similarity index 100%
rename from hphp/test/vm/undefined-index.php.expectf
rename to hphp/test/quick/undefined-index.php.expectf
diff --git a/hphp/test/vm/undefined-variable.php b/hphp/test/quick/undefined-variable.php
similarity index 100%
rename from hphp/test/vm/undefined-variable.php
rename to hphp/test/quick/undefined-variable.php
diff --git a/hphp/test/vm/undefined-variable.php.expectf b/hphp/test/quick/undefined-variable.php.expectf
similarity index 100%
rename from hphp/test/vm/undefined-variable.php.expectf
rename to hphp/test/quick/undefined-variable.php.expectf
diff --git a/hphp/test/vm/undefined-vgetg.php b/hphp/test/quick/undefined-vgetg.php
similarity index 100%
rename from hphp/test/vm/undefined-vgetg.php
rename to hphp/test/quick/undefined-vgetg.php
diff --git a/hphp/test/vm/undefined-vgetg.php.expect b/hphp/test/quick/undefined-vgetg.php.expect
similarity index 100%
rename from hphp/test/vm/undefined-vgetg.php.expect
rename to hphp/test/quick/undefined-vgetg.php.expect
diff --git a/hphp/test/vm/undefined_is_type.php b/hphp/test/quick/undefined_is_type.php
similarity index 100%
rename from hphp/test/vm/undefined_is_type.php
rename to hphp/test/quick/undefined_is_type.php
diff --git a/hphp/test/vm/undefined_is_type.php.expectf b/hphp/test/quick/undefined_is_type.php.expectf
similarity index 100%
rename from hphp/test/vm/undefined_is_type.php.expectf
rename to hphp/test/quick/undefined_is_type.php.expectf
diff --git a/hphp/test/vm/unpack.php b/hphp/test/quick/unpack.php
similarity index 100%
rename from hphp/test/vm/unpack.php
rename to hphp/test/quick/unpack.php
diff --git a/hphp/test/vm/unpack.php.expect b/hphp/test/quick/unpack.php.expect
similarity index 100%
rename from hphp/test/vm/unpack.php.expect
rename to hphp/test/quick/unpack.php.expect
diff --git a/hphp/test/vm/unset_badbase.php b/hphp/test/quick/unset_badbase.php
similarity index 100%
rename from hphp/test/vm/unset_badbase.php
rename to hphp/test/quick/unset_badbase.php
diff --git a/hphp/test/vm/unset_badbase.php.expectf b/hphp/test/quick/unset_badbase.php.expectf
similarity index 100%
rename from hphp/test/vm/unset_badbase.php.expectf
rename to hphp/test/quick/unset_badbase.php.expectf
diff --git a/hphp/test/vm/unset_undef_g.php b/hphp/test/quick/unset_undef_g.php
similarity index 100%
rename from hphp/test/vm/unset_undef_g.php
rename to hphp/test/quick/unset_undef_g.php
diff --git a/hphp/test/tcr/compilation/1240.php.expect b/hphp/test/quick/unset_undef_g.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1240.php.expect
rename to hphp/test/quick/unset_undef_g.php.expect
diff --git a/hphp/test/quick/unset_varenv.php b/hphp/test/quick/unset_varenv.php
new file mode 100644
index 000000000..f197c8830
--- /dev/null
+++ b/hphp/test/quick/unset_varenv.php
@@ -0,0 +1,11 @@
+<?php
+
+function foo() {
+  $x = 'c';
+  $$x = "haha";
+  echo "value: " . $$x . "\n";
+  unset($$x);
+  echo "value: " . $$x . "\n";
+}
+
+foo();
diff --git a/hphp/test/quick/unset_varenv.php.expectf b/hphp/test/quick/unset_varenv.php.expectf
new file mode 100644
index 000000000..b826408de
--- /dev/null
+++ b/hphp/test/quick/unset_varenv.php.expectf
@@ -0,0 +1,3 @@
+value: haha
+HipHop Notice: Undefined variable: c in %s on line 8
+value: 
diff --git a/hphp/test/vm/unused_clscns.php b/hphp/test/quick/unused_clscns.php
similarity index 100%
rename from hphp/test/vm/unused_clscns.php
rename to hphp/test/quick/unused_clscns.php
diff --git a/hphp/test/vm/unused_clscns.php.expectf b/hphp/test/quick/unused_clscns.php.expectf
similarity index 100%
rename from hphp/test/vm/unused_clscns.php.expectf
rename to hphp/test/quick/unused_clscns.php.expectf
diff --git a/hphp/test/vm/user_func.php b/hphp/test/quick/user_func.php
similarity index 100%
rename from hphp/test/vm/user_func.php
rename to hphp/test/quick/user_func.php
diff --git a/hphp/test/vm/user_func.php.expect b/hphp/test/quick/user_func.php.expect
similarity index 100%
rename from hphp/test/vm/user_func.php.expect
rename to hphp/test/quick/user_func.php.expect
diff --git a/hphp/test/vm/va_poly.php b/hphp/test/quick/va_poly.php
similarity index 100%
rename from hphp/test/vm/va_poly.php
rename to hphp/test/quick/va_poly.php
diff --git a/hphp/test/tcr/compilation/1241.php.expect b/hphp/test/quick/va_poly.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1241.php.expect
rename to hphp/test/quick/va_poly.php.expect
diff --git a/hphp/test/vm/var.php b/hphp/test/quick/var.php
similarity index 100%
rename from hphp/test/vm/var.php
rename to hphp/test/quick/var.php
diff --git a/hphp/test/vm/var.php.expect b/hphp/test/quick/var.php.expect
similarity index 100%
rename from hphp/test/vm/var.php.expect
rename to hphp/test/quick/var.php.expect
diff --git a/hphp/test/quick/varenv_extra_args.php b/hphp/test/quick/varenv_extra_args.php
new file mode 100644
index 000000000..8cd008f10
--- /dev/null
+++ b/hphp/test/quick/varenv_extra_args.php
@@ -0,0 +1,9 @@
+<?php
+
+function foo($asd) {
+  $y = "a";
+  $$y = 12;
+  var_dump(func_get_args());
+  var_dump(func_get_arg(2));
+}
+foo(2, "foo", "bar");
diff --git a/hphp/test/quick/varenv_extra_args.php.expect b/hphp/test/quick/varenv_extra_args.php.expect
new file mode 100644
index 000000000..5689f945e
--- /dev/null
+++ b/hphp/test/quick/varenv_extra_args.php.expect
@@ -0,0 +1,9 @@
+array(3) {
+  [0]=>
+  int(2)
+  [1]=>
+  string(3) "foo"
+  [2]=>
+  string(3) "bar"
+}
+string(3) "bar"
diff --git a/hphp/test/vm/vector-stack-base.php b/hphp/test/quick/vector-stack-base.php
similarity index 100%
rename from hphp/test/vm/vector-stack-base.php
rename to hphp/test/quick/vector-stack-base.php
diff --git a/hphp/test/vm/vector-stack-base.php.expect b/hphp/test/quick/vector-stack-base.php.expect
similarity index 100%
rename from hphp/test/vm/vector-stack-base.php.expect
rename to hphp/test/quick/vector-stack-base.php.expect
diff --git a/hphp/test/vm/vector-variant-key.php b/hphp/test/quick/vector-variant-key.php
similarity index 100%
rename from hphp/test/vm/vector-variant-key.php
rename to hphp/test/quick/vector-variant-key.php
diff --git a/hphp/test/vm/vector-variant-key.php.expect b/hphp/test/quick/vector-variant-key.php.expect
similarity index 100%
rename from hphp/test/vm/vector-variant-key.php.expect
rename to hphp/test/quick/vector-variant-key.php.expect
diff --git a/hphp/test/vm/verify-param-type.php b/hphp/test/quick/verify-param-type.php
similarity index 100%
rename from hphp/test/vm/verify-param-type.php
rename to hphp/test/quick/verify-param-type.php
diff --git a/hphp/test/vm/verify-param-type.php.expectf b/hphp/test/quick/verify-param-type.php.expectf
similarity index 100%
rename from hphp/test/vm/verify-param-type.php.expectf
rename to hphp/test/quick/verify-param-type.php.expectf
diff --git a/hphp/test/vm/vgets.php b/hphp/test/quick/vgets.php
similarity index 100%
rename from hphp/test/vm/vgets.php
rename to hphp/test/quick/vgets.php
diff --git a/hphp/test/vm/vgets.php.expect b/hphp/test/quick/vgets.php.expect
similarity index 100%
rename from hphp/test/vm/vgets.php.expect
rename to hphp/test/quick/vgets.php.expect
diff --git a/hphp/test/vm/weird-isset-empty.php b/hphp/test/quick/weird-isset-empty.php
similarity index 100%
rename from hphp/test/vm/weird-isset-empty.php
rename to hphp/test/quick/weird-isset-empty.php
diff --git a/hphp/test/vm/weird-isset-empty.php.expect b/hphp/test/quick/weird-isset-empty.php.expect
similarity index 100%
rename from hphp/test/vm/weird-isset-empty.php.expect
rename to hphp/test/quick/weird-isset-empty.php.expect
diff --git a/hphp/test/vm/xhp-malformed.php b/hphp/test/quick/xhp-malformed.php
similarity index 100%
rename from hphp/test/vm/xhp-malformed.php
rename to hphp/test/quick/xhp-malformed.php
diff --git a/hphp/test/vm/xhp-malformed.php.expectf b/hphp/test/quick/xhp-malformed.php.expectf
similarity index 100%
rename from hphp/test/vm/xhp-malformed.php.expectf
rename to hphp/test/quick/xhp-malformed.php.expectf
diff --git a/hphp/test/vm/yield_final.php b/hphp/test/quick/yield_final.php
similarity index 100%
rename from hphp/test/vm/yield_final.php
rename to hphp/test/quick/yield_final.php
diff --git a/hphp/test/vm/yield_final.php.expectf b/hphp/test/quick/yield_final.php.expectf
similarity index 100%
rename from hphp/test/vm/yield_final.php.expectf
rename to hphp/test/quick/yield_final.php.expectf
diff --git a/hphp/test/vm/yield_return.php b/hphp/test/quick/yield_return.php
similarity index 100%
rename from hphp/test/vm/yield_return.php
rename to hphp/test/quick/yield_return.php
diff --git a/hphp/test/vm/yield_return.php.expectf b/hphp/test/quick/yield_return.php.expectf
similarity index 100%
rename from hphp/test/vm/yield_return.php.expectf
rename to hphp/test/quick/yield_return.php.expectf
diff --git a/hphp/test/vm/zend_closure_005.php b/hphp/test/quick/zend_closure_005.php
similarity index 100%
rename from hphp/test/vm/zend_closure_005.php
rename to hphp/test/quick/zend_closure_005.php
diff --git a/hphp/test/vm/zend_closure_005.php.expect b/hphp/test/quick/zend_closure_005.php.expect
similarity index 100%
rename from hphp/test/vm/zend_closure_005.php.expect
rename to hphp/test/quick/zend_closure_005.php.expect
diff --git a/hphp/test/vm/zend_closure_007.php b/hphp/test/quick/zend_closure_007.php
similarity index 100%
rename from hphp/test/vm/zend_closure_007.php
rename to hphp/test/quick/zend_closure_007.php
diff --git a/hphp/test/vm/zend_closure_007.php.expect b/hphp/test/quick/zend_closure_007.php.expect
similarity index 100%
rename from hphp/test/vm/zend_closure_007.php.expect
rename to hphp/test/quick/zend_closure_007.php.expect
diff --git a/hphp/test/vm/zend_closure_020.php b/hphp/test/quick/zend_closure_020.php
similarity index 100%
rename from hphp/test/vm/zend_closure_020.php
rename to hphp/test/quick/zend_closure_020.php
diff --git a/hphp/test/vm/zend_closure_020.php.expectf b/hphp/test/quick/zend_closure_020.php.expectf
similarity index 100%
rename from hphp/test/vm/zend_closure_020.php.expectf
rename to hphp/test/quick/zend_closure_020.php.expectf
diff --git a/hphp/test/vm/zend_closure_025.php b/hphp/test/quick/zend_closure_025.php
similarity index 100%
rename from hphp/test/vm/zend_closure_025.php
rename to hphp/test/quick/zend_closure_025.php
diff --git a/hphp/test/vm/zend_closure_025.php.expect b/hphp/test/quick/zend_closure_025.php.expect
similarity index 100%
rename from hphp/test/vm/zend_closure_025.php.expect
rename to hphp/test/quick/zend_closure_025.php.expect
diff --git a/hphp/test/vm/zend_indirect_method_call_001.php b/hphp/test/quick/zend_indirect_method_call_001.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_001.php
rename to hphp/test/quick/zend_indirect_method_call_001.php
diff --git a/hphp/test/vm/zend_indirect_method_call_001.php.expect b/hphp/test/quick/zend_indirect_method_call_001.php.expect
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_001.php.expect
rename to hphp/test/quick/zend_indirect_method_call_001.php.expect
diff --git a/hphp/test/vm/zend_indirect_method_call_002.php b/hphp/test/quick/zend_indirect_method_call_002.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_002.php
rename to hphp/test/quick/zend_indirect_method_call_002.php
diff --git a/hphp/test/vm/zend_indirect_method_call_002.php.expectf b/hphp/test/quick/zend_indirect_method_call_002.php.expectf
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_002.php.expectf
rename to hphp/test/quick/zend_indirect_method_call_002.php.expectf
diff --git a/hphp/test/vm/zend_indirect_method_call_003.php b/hphp/test/quick/zend_indirect_method_call_003.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_003.php
rename to hphp/test/quick/zend_indirect_method_call_003.php
diff --git a/hphp/test/vm/zend_indirect_method_call_003.php.expect b/hphp/test/quick/zend_indirect_method_call_003.php.expect
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_003.php.expect
rename to hphp/test/quick/zend_indirect_method_call_003.php.expect
diff --git a/hphp/test/vm/zend_indirect_method_call_004.php b/hphp/test/quick/zend_indirect_method_call_004.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_004.php
rename to hphp/test/quick/zend_indirect_method_call_004.php
diff --git a/hphp/test/vm/zend_indirect_method_call_004.php.expect b/hphp/test/quick/zend_indirect_method_call_004.php.expect
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_004.php.expect
rename to hphp/test/quick/zend_indirect_method_call_004.php.expect
diff --git a/hphp/test/vm/zend_indirect_method_call_005.php b/hphp/test/quick/zend_indirect_method_call_005.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_005.php
rename to hphp/test/quick/zend_indirect_method_call_005.php
diff --git a/hphp/test/vm/zend_indirect_method_call_005.php.expect b/hphp/test/quick/zend_indirect_method_call_005.php.expect
similarity index 100%
rename from hphp/test/vm/zend_indirect_method_call_005.php.expect
rename to hphp/test/quick/zend_indirect_method_call_005.php.expect
diff --git a/hphp/test/vm/zend_indirect_property_access.php b/hphp/test/quick/zend_indirect_property_access.php
similarity index 100%
rename from hphp/test/vm/zend_indirect_property_access.php
rename to hphp/test/quick/zend_indirect_property_access.php
diff --git a/hphp/test/vm/zend_indirect_property_access.php.expect b/hphp/test/quick/zend_indirect_property_access.php.expect
similarity index 100%
rename from hphp/test/vm/zend_indirect_property_access.php.expect
rename to hphp/test/quick/zend_indirect_property_access.php.expect
diff --git a/hphp/test/tcr/add/1420.php b/hphp/test/slow/add/1420.php
similarity index 100%
rename from hphp/test/tcr/add/1420.php
rename to hphp/test/slow/add/1420.php
diff --git a/hphp/test/tcr/add/1420.php.expect b/hphp/test/slow/add/1420.php.expect
similarity index 100%
rename from hphp/test/tcr/add/1420.php.expect
rename to hphp/test/slow/add/1420.php.expect
diff --git a/hphp/test/tcr/add/1421.php b/hphp/test/slow/add/1421.php
similarity index 100%
rename from hphp/test/tcr/add/1421.php
rename to hphp/test/slow/add/1421.php
diff --git a/hphp/test/tcr/add/1421.php.expect b/hphp/test/slow/add/1421.php.expect
similarity index 100%
rename from hphp/test/tcr/add/1421.php.expect
rename to hphp/test/slow/add/1421.php.expect
diff --git a/hphp/test/tcr/add/1422.php b/hphp/test/slow/add/1422.php
similarity index 100%
rename from hphp/test/tcr/add/1422.php
rename to hphp/test/slow/add/1422.php
diff --git a/hphp/test/tcr/add/1422.php.expect b/hphp/test/slow/add/1422.php.expect
similarity index 100%
rename from hphp/test/tcr/add/1422.php.expect
rename to hphp/test/slow/add/1422.php.expect
diff --git a/hphp/test/tcr/all_dynamic.hphp_opts b/hphp/test/slow/all_dynamic.hphp_opts
similarity index 100%
rename from hphp/test/tcr/all_dynamic.hphp_opts
rename to hphp/test/slow/all_dynamic.hphp_opts
diff --git a/hphp/test/tcr/all_dynamic_and_dynamic_method.hphp_opts b/hphp/test/slow/all_dynamic_and_dynamic_method.hphp_opts
similarity index 100%
rename from hphp/test/tcr/all_dynamic_and_dynamic_method.hphp_opts
rename to hphp/test/slow/all_dynamic_and_dynamic_method.hphp_opts
diff --git a/hphp/test/tcr/allow_object.opts b/hphp/test/slow/allow_object.opts
similarity index 100%
rename from hphp/test/tcr/allow_object.opts
rename to hphp/test/slow/allow_object.opts
diff --git a/hphp/test/tcr/apc/1812.php b/hphp/test/slow/apc/1812.php
similarity index 100%
rename from hphp/test/tcr/apc/1812.php
rename to hphp/test/slow/apc/1812.php
diff --git a/hphp/test/tcr/apc/1812.php.expect b/hphp/test/slow/apc/1812.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1812.php.expect
rename to hphp/test/slow/apc/1812.php.expect
diff --git a/hphp/test/tcr/apc/1813.php b/hphp/test/slow/apc/1813.php
similarity index 100%
rename from hphp/test/tcr/apc/1813.php
rename to hphp/test/slow/apc/1813.php
diff --git a/hphp/test/tcr/apc/1813.php.expect b/hphp/test/slow/apc/1813.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1813.php.expect
rename to hphp/test/slow/apc/1813.php.expect
diff --git a/hphp/test/tcr/apc/1814.php b/hphp/test/slow/apc/1814.php
similarity index 100%
rename from hphp/test/tcr/apc/1814.php
rename to hphp/test/slow/apc/1814.php
diff --git a/hphp/test/tcr/apc/1814.php.expect b/hphp/test/slow/apc/1814.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1814.php.expect
rename to hphp/test/slow/apc/1814.php.expect
diff --git a/hphp/test/tcr/apc/1815.php b/hphp/test/slow/apc/1815.php
similarity index 100%
rename from hphp/test/tcr/apc/1815.php
rename to hphp/test/slow/apc/1815.php
diff --git a/hphp/test/tcr/apc/1815.php.expect b/hphp/test/slow/apc/1815.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1815.php.expect
rename to hphp/test/slow/apc/1815.php.expect
diff --git a/hphp/test/tcr/apc/1816.php b/hphp/test/slow/apc/1816.php
similarity index 100%
rename from hphp/test/tcr/apc/1816.php
rename to hphp/test/slow/apc/1816.php
diff --git a/hphp/test/tcr/apc/1816.php.expect b/hphp/test/slow/apc/1816.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1816.php.expect
rename to hphp/test/slow/apc/1816.php.expect
diff --git a/hphp/test/tcr/apc/1817.php b/hphp/test/slow/apc/1817.php
similarity index 100%
rename from hphp/test/tcr/apc/1817.php
rename to hphp/test/slow/apc/1817.php
diff --git a/hphp/test/tcr/apc/1817.php.expect b/hphp/test/slow/apc/1817.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1817.php.expect
rename to hphp/test/slow/apc/1817.php.expect
diff --git a/hphp/test/tcr/apc/1818.php b/hphp/test/slow/apc/1818.php
similarity index 100%
rename from hphp/test/tcr/apc/1818.php
rename to hphp/test/slow/apc/1818.php
diff --git a/hphp/test/tcr/apc/1818.php.expect b/hphp/test/slow/apc/1818.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1818.php.expect
rename to hphp/test/slow/apc/1818.php.expect
diff --git a/hphp/test/tcr/apc/1819.php b/hphp/test/slow/apc/1819.php
similarity index 100%
rename from hphp/test/tcr/apc/1819.php
rename to hphp/test/slow/apc/1819.php
diff --git a/hphp/test/tcr/apc/1819.php.expect b/hphp/test/slow/apc/1819.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1819.php.expect
rename to hphp/test/slow/apc/1819.php.expect
diff --git a/hphp/test/tcr/apc/1820.php b/hphp/test/slow/apc/1820.php
similarity index 100%
rename from hphp/test/tcr/apc/1820.php
rename to hphp/test/slow/apc/1820.php
diff --git a/hphp/test/tcr/apc/1820.php.expect b/hphp/test/slow/apc/1820.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1820.php.expect
rename to hphp/test/slow/apc/1820.php.expect
diff --git a/hphp/test/tcr/apc/1820.php.opts b/hphp/test/slow/apc/1820.php.opts
similarity index 100%
rename from hphp/test/tcr/apc/1820.php.opts
rename to hphp/test/slow/apc/1820.php.opts
diff --git a/hphp/test/tcr/apc/1821.php b/hphp/test/slow/apc/1821.php
similarity index 100%
rename from hphp/test/tcr/apc/1821.php
rename to hphp/test/slow/apc/1821.php
diff --git a/hphp/test/tcr/apc/1821.php.expect b/hphp/test/slow/apc/1821.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1821.php.expect
rename to hphp/test/slow/apc/1821.php.expect
diff --git a/hphp/test/tcr/apc/1821.php.opts b/hphp/test/slow/apc/1821.php.opts
similarity index 100%
rename from hphp/test/tcr/apc/1821.php.opts
rename to hphp/test/slow/apc/1821.php.opts
diff --git a/hphp/test/tcr/apc/1822.php b/hphp/test/slow/apc/1822.php
similarity index 100%
rename from hphp/test/tcr/apc/1822.php
rename to hphp/test/slow/apc/1822.php
diff --git a/hphp/test/tcr/apc/1822.php.expect b/hphp/test/slow/apc/1822.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1822.php.expect
rename to hphp/test/slow/apc/1822.php.expect
diff --git a/hphp/test/tcr/apc/1823.php b/hphp/test/slow/apc/1823.php
similarity index 100%
rename from hphp/test/tcr/apc/1823.php
rename to hphp/test/slow/apc/1823.php
diff --git a/hphp/test/tcr/apc/1823.php.expect b/hphp/test/slow/apc/1823.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1823.php.expect
rename to hphp/test/slow/apc/1823.php.expect
diff --git a/hphp/test/tcr/apc/1824.php b/hphp/test/slow/apc/1824.php
similarity index 100%
rename from hphp/test/tcr/apc/1824.php
rename to hphp/test/slow/apc/1824.php
diff --git a/hphp/test/tcr/apc/1824.php.expect b/hphp/test/slow/apc/1824.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1824.php.expect
rename to hphp/test/slow/apc/1824.php.expect
diff --git a/hphp/test/tcr/apc/1824.php.hphp_opts b/hphp/test/slow/apc/1824.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/apc/1824.php.hphp_opts
rename to hphp/test/slow/apc/1824.php.hphp_opts
diff --git a/hphp/test/tcr/apc/1824.php.opts b/hphp/test/slow/apc/1824.php.opts
similarity index 100%
rename from hphp/test/tcr/apc/1824.php.opts
rename to hphp/test/slow/apc/1824.php.opts
diff --git a/hphp/test/tcr/apc/1825.php b/hphp/test/slow/apc/1825.php
similarity index 100%
rename from hphp/test/tcr/apc/1825.php
rename to hphp/test/slow/apc/1825.php
diff --git a/hphp/test/tcr/apc/1825.php.expect b/hphp/test/slow/apc/1825.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1825.php.expect
rename to hphp/test/slow/apc/1825.php.expect
diff --git a/hphp/test/tcr/apc/1825.php.hphp_opts b/hphp/test/slow/apc/1825.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/apc/1825.php.hphp_opts
rename to hphp/test/slow/apc/1825.php.hphp_opts
diff --git a/hphp/test/tcr/apc/1825.php.opts b/hphp/test/slow/apc/1825.php.opts
similarity index 100%
rename from hphp/test/tcr/apc/1825.php.opts
rename to hphp/test/slow/apc/1825.php.opts
diff --git a/hphp/test/tcr/apc/1826.php b/hphp/test/slow/apc/1826.php
similarity index 100%
rename from hphp/test/tcr/apc/1826.php
rename to hphp/test/slow/apc/1826.php
diff --git a/hphp/test/tcr/apc/1826.php.expect b/hphp/test/slow/apc/1826.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1826.php.expect
rename to hphp/test/slow/apc/1826.php.expect
diff --git a/hphp/test/tcr/apc/1827.php b/hphp/test/slow/apc/1827.php
similarity index 100%
rename from hphp/test/tcr/apc/1827.php
rename to hphp/test/slow/apc/1827.php
diff --git a/hphp/test/tcr/apc/1827.php.expect b/hphp/test/slow/apc/1827.php.expect
similarity index 100%
rename from hphp/test/tcr/apc/1827.php.expect
rename to hphp/test/slow/apc/1827.php.expect
diff --git a/hphp/test/tcr/argument_handling/28.php b/hphp/test/slow/argument_handling/28.php
similarity index 100%
rename from hphp/test/tcr/argument_handling/28.php
rename to hphp/test/slow/argument_handling/28.php
diff --git a/hphp/test/tcr/argument_handling/28.php.expect b/hphp/test/slow/argument_handling/28.php.expect
similarity index 100%
rename from hphp/test/tcr/argument_handling/28.php.expect
rename to hphp/test/slow/argument_handling/28.php.expect
diff --git a/hphp/test/tcr/argument_handling/29.php b/hphp/test/slow/argument_handling/29.php
similarity index 100%
rename from hphp/test/tcr/argument_handling/29.php
rename to hphp/test/slow/argument_handling/29.php
diff --git a/hphp/test/tcr/argument_handling/29.php.expect b/hphp/test/slow/argument_handling/29.php.expect
similarity index 100%
rename from hphp/test/tcr/argument_handling/29.php.expect
rename to hphp/test/slow/argument_handling/29.php.expect
diff --git a/hphp/test/tcr/array/177.php b/hphp/test/slow/array/177.php
similarity index 100%
rename from hphp/test/tcr/array/177.php
rename to hphp/test/slow/array/177.php
diff --git a/hphp/test/tcr/array/177.php.expect b/hphp/test/slow/array/177.php.expect
similarity index 100%
rename from hphp/test/tcr/array/177.php.expect
rename to hphp/test/slow/array/177.php.expect
diff --git a/hphp/test/tcr/array/177.php.hphp_opts b/hphp/test/slow/array/177.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/177.php.hphp_opts
rename to hphp/test/slow/array/177.php.hphp_opts
diff --git a/hphp/test/tcr/array/177.php.opts b/hphp/test/slow/array/177.php.opts
similarity index 100%
rename from hphp/test/tcr/array/177.php.opts
rename to hphp/test/slow/array/177.php.opts
diff --git a/hphp/test/tcr/array/178.php b/hphp/test/slow/array/178.php
similarity index 100%
rename from hphp/test/tcr/array/178.php
rename to hphp/test/slow/array/178.php
diff --git a/hphp/test/tcr/array/178.php.expect b/hphp/test/slow/array/178.php.expect
similarity index 100%
rename from hphp/test/tcr/array/178.php.expect
rename to hphp/test/slow/array/178.php.expect
diff --git a/hphp/test/tcr/array/178.php.hphp_opts b/hphp/test/slow/array/178.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/178.php.hphp_opts
rename to hphp/test/slow/array/178.php.hphp_opts
diff --git a/hphp/test/tcr/array/178.php.opts b/hphp/test/slow/array/178.php.opts
similarity index 100%
rename from hphp/test/tcr/array/178.php.opts
rename to hphp/test/slow/array/178.php.opts
diff --git a/hphp/test/tcr/array/179.php b/hphp/test/slow/array/179.php
similarity index 100%
rename from hphp/test/tcr/array/179.php
rename to hphp/test/slow/array/179.php
diff --git a/hphp/test/tcr/array/179.php.expect b/hphp/test/slow/array/179.php.expect
similarity index 100%
rename from hphp/test/tcr/array/179.php.expect
rename to hphp/test/slow/array/179.php.expect
diff --git a/hphp/test/tcr/array/179.php.hphp_opts b/hphp/test/slow/array/179.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/179.php.hphp_opts
rename to hphp/test/slow/array/179.php.hphp_opts
diff --git a/hphp/test/tcr/array/179.php.opts b/hphp/test/slow/array/179.php.opts
similarity index 100%
rename from hphp/test/tcr/array/179.php.opts
rename to hphp/test/slow/array/179.php.opts
diff --git a/hphp/test/tcr/array/180.php b/hphp/test/slow/array/180.php
similarity index 100%
rename from hphp/test/tcr/array/180.php
rename to hphp/test/slow/array/180.php
diff --git a/hphp/test/tcr/array/180.php.expect b/hphp/test/slow/array/180.php.expect
similarity index 100%
rename from hphp/test/tcr/array/180.php.expect
rename to hphp/test/slow/array/180.php.expect
diff --git a/hphp/test/tcr/array/180.php.hphp_opts b/hphp/test/slow/array/180.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/180.php.hphp_opts
rename to hphp/test/slow/array/180.php.hphp_opts
diff --git a/hphp/test/tcr/array/180.php.opts b/hphp/test/slow/array/180.php.opts
similarity index 100%
rename from hphp/test/tcr/array/180.php.opts
rename to hphp/test/slow/array/180.php.opts
diff --git a/hphp/test/tcr/array/181.php b/hphp/test/slow/array/181.php
similarity index 100%
rename from hphp/test/tcr/array/181.php
rename to hphp/test/slow/array/181.php
diff --git a/hphp/test/tcr/array/181.php.expect b/hphp/test/slow/array/181.php.expect
similarity index 100%
rename from hphp/test/tcr/array/181.php.expect
rename to hphp/test/slow/array/181.php.expect
diff --git a/hphp/test/tcr/array/181.php.hphp_opts b/hphp/test/slow/array/181.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/181.php.hphp_opts
rename to hphp/test/slow/array/181.php.hphp_opts
diff --git a/hphp/test/tcr/array/181.php.opts b/hphp/test/slow/array/181.php.opts
similarity index 100%
rename from hphp/test/tcr/array/181.php.opts
rename to hphp/test/slow/array/181.php.opts
diff --git a/hphp/test/tcr/array/182.php b/hphp/test/slow/array/182.php
similarity index 100%
rename from hphp/test/tcr/array/182.php
rename to hphp/test/slow/array/182.php
diff --git a/hphp/test/tcr/array/182.php.expect b/hphp/test/slow/array/182.php.expect
similarity index 100%
rename from hphp/test/tcr/array/182.php.expect
rename to hphp/test/slow/array/182.php.expect
diff --git a/hphp/test/tcr/array/182.php.hphp_opts b/hphp/test/slow/array/182.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/182.php.hphp_opts
rename to hphp/test/slow/array/182.php.hphp_opts
diff --git a/hphp/test/tcr/array/182.php.opts b/hphp/test/slow/array/182.php.opts
similarity index 100%
rename from hphp/test/tcr/array/182.php.opts
rename to hphp/test/slow/array/182.php.opts
diff --git a/hphp/test/tcr/array/183.php b/hphp/test/slow/array/183.php
similarity index 100%
rename from hphp/test/tcr/array/183.php
rename to hphp/test/slow/array/183.php
diff --git a/hphp/test/tcr/array/183.php.expect b/hphp/test/slow/array/183.php.expect
similarity index 100%
rename from hphp/test/tcr/array/183.php.expect
rename to hphp/test/slow/array/183.php.expect
diff --git a/hphp/test/tcr/array/183.php.hphp_opts b/hphp/test/slow/array/183.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/183.php.hphp_opts
rename to hphp/test/slow/array/183.php.hphp_opts
diff --git a/hphp/test/tcr/array/183.php.opts b/hphp/test/slow/array/183.php.opts
similarity index 100%
rename from hphp/test/tcr/array/183.php.opts
rename to hphp/test/slow/array/183.php.opts
diff --git a/hphp/test/tcr/array/184.php b/hphp/test/slow/array/184.php
similarity index 100%
rename from hphp/test/tcr/array/184.php
rename to hphp/test/slow/array/184.php
diff --git a/hphp/test/tcr/array/184.php.expect b/hphp/test/slow/array/184.php.expect
similarity index 100%
rename from hphp/test/tcr/array/184.php.expect
rename to hphp/test/slow/array/184.php.expect
diff --git a/hphp/test/tcr/array/184.php.hphp_opts b/hphp/test/slow/array/184.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/184.php.hphp_opts
rename to hphp/test/slow/array/184.php.hphp_opts
diff --git a/hphp/test/tcr/array/184.php.opts b/hphp/test/slow/array/184.php.opts
similarity index 100%
rename from hphp/test/tcr/array/184.php.opts
rename to hphp/test/slow/array/184.php.opts
diff --git a/hphp/test/tcr/array/185.php b/hphp/test/slow/array/185.php
similarity index 100%
rename from hphp/test/tcr/array/185.php
rename to hphp/test/slow/array/185.php
diff --git a/hphp/test/tcr/array/185.php.expect b/hphp/test/slow/array/185.php.expect
similarity index 100%
rename from hphp/test/tcr/array/185.php.expect
rename to hphp/test/slow/array/185.php.expect
diff --git a/hphp/test/tcr/array/185.php.hphp_opts b/hphp/test/slow/array/185.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/185.php.hphp_opts
rename to hphp/test/slow/array/185.php.hphp_opts
diff --git a/hphp/test/tcr/array/185.php.opts b/hphp/test/slow/array/185.php.opts
similarity index 100%
rename from hphp/test/tcr/array/185.php.opts
rename to hphp/test/slow/array/185.php.opts
diff --git a/hphp/test/tcr/array/186.php b/hphp/test/slow/array/186.php
similarity index 100%
rename from hphp/test/tcr/array/186.php
rename to hphp/test/slow/array/186.php
diff --git a/hphp/test/tcr/array/186.php.expect b/hphp/test/slow/array/186.php.expect
similarity index 100%
rename from hphp/test/tcr/array/186.php.expect
rename to hphp/test/slow/array/186.php.expect
diff --git a/hphp/test/tcr/array/186.php.hphp_opts b/hphp/test/slow/array/186.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/186.php.hphp_opts
rename to hphp/test/slow/array/186.php.hphp_opts
diff --git a/hphp/test/tcr/array/186.php.opts b/hphp/test/slow/array/186.php.opts
similarity index 100%
rename from hphp/test/tcr/array/186.php.opts
rename to hphp/test/slow/array/186.php.opts
diff --git a/hphp/test/tcr/array/187.php b/hphp/test/slow/array/187.php
similarity index 100%
rename from hphp/test/tcr/array/187.php
rename to hphp/test/slow/array/187.php
diff --git a/hphp/test/tcr/array/187.php.expect b/hphp/test/slow/array/187.php.expect
similarity index 100%
rename from hphp/test/tcr/array/187.php.expect
rename to hphp/test/slow/array/187.php.expect
diff --git a/hphp/test/tcr/array/187.php.hphp_opts b/hphp/test/slow/array/187.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/187.php.hphp_opts
rename to hphp/test/slow/array/187.php.hphp_opts
diff --git a/hphp/test/tcr/array/187.php.opts b/hphp/test/slow/array/187.php.opts
similarity index 100%
rename from hphp/test/tcr/array/187.php.opts
rename to hphp/test/slow/array/187.php.opts
diff --git a/hphp/test/tcr/array/188.php b/hphp/test/slow/array/188.php
similarity index 100%
rename from hphp/test/tcr/array/188.php
rename to hphp/test/slow/array/188.php
diff --git a/hphp/test/tcr/array/188.php.expect b/hphp/test/slow/array/188.php.expect
similarity index 100%
rename from hphp/test/tcr/array/188.php.expect
rename to hphp/test/slow/array/188.php.expect
diff --git a/hphp/test/tcr/array/188.php.hphp_opts b/hphp/test/slow/array/188.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/188.php.hphp_opts
rename to hphp/test/slow/array/188.php.hphp_opts
diff --git a/hphp/test/tcr/array/188.php.opts b/hphp/test/slow/array/188.php.opts
similarity index 100%
rename from hphp/test/tcr/array/188.php.opts
rename to hphp/test/slow/array/188.php.opts
diff --git a/hphp/test/tcr/array/189.php b/hphp/test/slow/array/189.php
similarity index 100%
rename from hphp/test/tcr/array/189.php
rename to hphp/test/slow/array/189.php
diff --git a/hphp/test/tcr/array/189.php.expect b/hphp/test/slow/array/189.php.expect
similarity index 100%
rename from hphp/test/tcr/array/189.php.expect
rename to hphp/test/slow/array/189.php.expect
diff --git a/hphp/test/tcr/array/189.php.hphp_opts b/hphp/test/slow/array/189.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/189.php.hphp_opts
rename to hphp/test/slow/array/189.php.hphp_opts
diff --git a/hphp/test/tcr/array/189.php.opts b/hphp/test/slow/array/189.php.opts
similarity index 100%
rename from hphp/test/tcr/array/189.php.opts
rename to hphp/test/slow/array/189.php.opts
diff --git a/hphp/test/tcr/array/190.php b/hphp/test/slow/array/190.php
similarity index 100%
rename from hphp/test/tcr/array/190.php
rename to hphp/test/slow/array/190.php
diff --git a/hphp/test/tcr/array/190.php.expect b/hphp/test/slow/array/190.php.expect
similarity index 100%
rename from hphp/test/tcr/array/190.php.expect
rename to hphp/test/slow/array/190.php.expect
diff --git a/hphp/test/tcr/array/190.php.hphp_opts b/hphp/test/slow/array/190.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/190.php.hphp_opts
rename to hphp/test/slow/array/190.php.hphp_opts
diff --git a/hphp/test/tcr/array/190.php.opts b/hphp/test/slow/array/190.php.opts
similarity index 100%
rename from hphp/test/tcr/array/190.php.opts
rename to hphp/test/slow/array/190.php.opts
diff --git a/hphp/test/tcr/array/191.php b/hphp/test/slow/array/191.php
similarity index 100%
rename from hphp/test/tcr/array/191.php
rename to hphp/test/slow/array/191.php
diff --git a/hphp/test/tcr/array/191.php.expect b/hphp/test/slow/array/191.php.expect
similarity index 100%
rename from hphp/test/tcr/array/191.php.expect
rename to hphp/test/slow/array/191.php.expect
diff --git a/hphp/test/tcr/array/191.php.hphp_opts b/hphp/test/slow/array/191.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/191.php.hphp_opts
rename to hphp/test/slow/array/191.php.hphp_opts
diff --git a/hphp/test/tcr/array/191.php.opts b/hphp/test/slow/array/191.php.opts
similarity index 100%
rename from hphp/test/tcr/array/191.php.opts
rename to hphp/test/slow/array/191.php.opts
diff --git a/hphp/test/tcr/array/192.php b/hphp/test/slow/array/192.php
similarity index 100%
rename from hphp/test/tcr/array/192.php
rename to hphp/test/slow/array/192.php
diff --git a/hphp/test/tcr/array/192.php.expect b/hphp/test/slow/array/192.php.expect
similarity index 100%
rename from hphp/test/tcr/array/192.php.expect
rename to hphp/test/slow/array/192.php.expect
diff --git a/hphp/test/tcr/array/192.php.hphp_opts b/hphp/test/slow/array/192.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/192.php.hphp_opts
rename to hphp/test/slow/array/192.php.hphp_opts
diff --git a/hphp/test/tcr/array/192.php.opts b/hphp/test/slow/array/192.php.opts
similarity index 100%
rename from hphp/test/tcr/array/192.php.opts
rename to hphp/test/slow/array/192.php.opts
diff --git a/hphp/test/tcr/array/193.php b/hphp/test/slow/array/193.php
similarity index 100%
rename from hphp/test/tcr/array/193.php
rename to hphp/test/slow/array/193.php
diff --git a/hphp/test/tcr/array/193.php.expect b/hphp/test/slow/array/193.php.expect
similarity index 100%
rename from hphp/test/tcr/array/193.php.expect
rename to hphp/test/slow/array/193.php.expect
diff --git a/hphp/test/tcr/array/193.php.hphp_opts b/hphp/test/slow/array/193.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/193.php.hphp_opts
rename to hphp/test/slow/array/193.php.hphp_opts
diff --git a/hphp/test/tcr/array/193.php.opts b/hphp/test/slow/array/193.php.opts
similarity index 100%
rename from hphp/test/tcr/array/193.php.opts
rename to hphp/test/slow/array/193.php.opts
diff --git a/hphp/test/tcr/array/194.php b/hphp/test/slow/array/194.php
similarity index 100%
rename from hphp/test/tcr/array/194.php
rename to hphp/test/slow/array/194.php
diff --git a/hphp/test/tcr/compilation/1244.php.expect b/hphp/test/slow/array/194.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1244.php.expect
rename to hphp/test/slow/array/194.php.expect
diff --git a/hphp/test/tcr/array/194.php.hphp_opts b/hphp/test/slow/array/194.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/194.php.hphp_opts
rename to hphp/test/slow/array/194.php.hphp_opts
diff --git a/hphp/test/tcr/array/194.php.opts b/hphp/test/slow/array/194.php.opts
similarity index 100%
rename from hphp/test/tcr/array/194.php.opts
rename to hphp/test/slow/array/194.php.opts
diff --git a/hphp/test/tcr/array/195.php b/hphp/test/slow/array/195.php
similarity index 100%
rename from hphp/test/tcr/array/195.php
rename to hphp/test/slow/array/195.php
diff --git a/hphp/test/tcr/array/195.php.expect b/hphp/test/slow/array/195.php.expect
similarity index 100%
rename from hphp/test/tcr/array/195.php.expect
rename to hphp/test/slow/array/195.php.expect
diff --git a/hphp/test/tcr/array/195.php.hphp_opts b/hphp/test/slow/array/195.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/195.php.hphp_opts
rename to hphp/test/slow/array/195.php.hphp_opts
diff --git a/hphp/test/tcr/array/195.php.opts b/hphp/test/slow/array/195.php.opts
similarity index 100%
rename from hphp/test/tcr/array/195.php.opts
rename to hphp/test/slow/array/195.php.opts
diff --git a/hphp/test/tcr/array/196.php b/hphp/test/slow/array/196.php
similarity index 100%
rename from hphp/test/tcr/array/196.php
rename to hphp/test/slow/array/196.php
diff --git a/hphp/test/tcr/array/196.php.expect b/hphp/test/slow/array/196.php.expect
similarity index 100%
rename from hphp/test/tcr/array/196.php.expect
rename to hphp/test/slow/array/196.php.expect
diff --git a/hphp/test/tcr/array/196.php.hphp_opts b/hphp/test/slow/array/196.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/196.php.hphp_opts
rename to hphp/test/slow/array/196.php.hphp_opts
diff --git a/hphp/test/tcr/array/196.php.opts b/hphp/test/slow/array/196.php.opts
similarity index 100%
rename from hphp/test/tcr/array/196.php.opts
rename to hphp/test/slow/array/196.php.opts
diff --git a/hphp/test/tcr/array/197.php b/hphp/test/slow/array/197.php
similarity index 100%
rename from hphp/test/tcr/array/197.php
rename to hphp/test/slow/array/197.php
diff --git a/hphp/test/tcr/array/197.php.expect b/hphp/test/slow/array/197.php.expect
similarity index 100%
rename from hphp/test/tcr/array/197.php.expect
rename to hphp/test/slow/array/197.php.expect
diff --git a/hphp/test/tcr/array/197.php.hphp_opts b/hphp/test/slow/array/197.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/197.php.hphp_opts
rename to hphp/test/slow/array/197.php.hphp_opts
diff --git a/hphp/test/tcr/array/197.php.opts b/hphp/test/slow/array/197.php.opts
similarity index 100%
rename from hphp/test/tcr/array/197.php.opts
rename to hphp/test/slow/array/197.php.opts
diff --git a/hphp/test/tcr/array/198.php b/hphp/test/slow/array/198.php
similarity index 100%
rename from hphp/test/tcr/array/198.php
rename to hphp/test/slow/array/198.php
diff --git a/hphp/test/tcr/array/198.php.expect b/hphp/test/slow/array/198.php.expect
similarity index 100%
rename from hphp/test/tcr/array/198.php.expect
rename to hphp/test/slow/array/198.php.expect
diff --git a/hphp/test/tcr/array/198.php.hphp_opts b/hphp/test/slow/array/198.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/198.php.hphp_opts
rename to hphp/test/slow/array/198.php.hphp_opts
diff --git a/hphp/test/tcr/array/198.php.opts b/hphp/test/slow/array/198.php.opts
similarity index 100%
rename from hphp/test/tcr/array/198.php.opts
rename to hphp/test/slow/array/198.php.opts
diff --git a/hphp/test/tcr/array/199.php b/hphp/test/slow/array/199.php
similarity index 100%
rename from hphp/test/tcr/array/199.php
rename to hphp/test/slow/array/199.php
diff --git a/hphp/test/tcr/array/199.php.expect b/hphp/test/slow/array/199.php.expect
similarity index 100%
rename from hphp/test/tcr/array/199.php.expect
rename to hphp/test/slow/array/199.php.expect
diff --git a/hphp/test/tcr/array/199.php.hphp_opts b/hphp/test/slow/array/199.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/199.php.hphp_opts
rename to hphp/test/slow/array/199.php.hphp_opts
diff --git a/hphp/test/tcr/array/199.php.opts b/hphp/test/slow/array/199.php.opts
similarity index 100%
rename from hphp/test/tcr/array/199.php.opts
rename to hphp/test/slow/array/199.php.opts
diff --git a/hphp/test/tcr/array/200.php b/hphp/test/slow/array/200.php
similarity index 100%
rename from hphp/test/tcr/array/200.php
rename to hphp/test/slow/array/200.php
diff --git a/hphp/test/tcr/array/200.php.expect b/hphp/test/slow/array/200.php.expect
similarity index 100%
rename from hphp/test/tcr/array/200.php.expect
rename to hphp/test/slow/array/200.php.expect
diff --git a/hphp/test/tcr/array/200.php.hphp_opts b/hphp/test/slow/array/200.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/200.php.hphp_opts
rename to hphp/test/slow/array/200.php.hphp_opts
diff --git a/hphp/test/tcr/array/200.php.opts b/hphp/test/slow/array/200.php.opts
similarity index 100%
rename from hphp/test/tcr/array/200.php.opts
rename to hphp/test/slow/array/200.php.opts
diff --git a/hphp/test/tcr/array/201.php b/hphp/test/slow/array/201.php
similarity index 100%
rename from hphp/test/tcr/array/201.php
rename to hphp/test/slow/array/201.php
diff --git a/hphp/test/tcr/array/201.php.expect b/hphp/test/slow/array/201.php.expect
similarity index 100%
rename from hphp/test/tcr/array/201.php.expect
rename to hphp/test/slow/array/201.php.expect
diff --git a/hphp/test/tcr/array/201.php.hphp_opts b/hphp/test/slow/array/201.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/201.php.hphp_opts
rename to hphp/test/slow/array/201.php.hphp_opts
diff --git a/hphp/test/tcr/array/201.php.opts b/hphp/test/slow/array/201.php.opts
similarity index 100%
rename from hphp/test/tcr/array/201.php.opts
rename to hphp/test/slow/array/201.php.opts
diff --git a/hphp/test/tcr/array/202.php b/hphp/test/slow/array/202.php
similarity index 100%
rename from hphp/test/tcr/array/202.php
rename to hphp/test/slow/array/202.php
diff --git a/hphp/test/tcr/array/202.php.expect b/hphp/test/slow/array/202.php.expect
similarity index 100%
rename from hphp/test/tcr/array/202.php.expect
rename to hphp/test/slow/array/202.php.expect
diff --git a/hphp/test/tcr/array/202.php.hphp_opts b/hphp/test/slow/array/202.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/202.php.hphp_opts
rename to hphp/test/slow/array/202.php.hphp_opts
diff --git a/hphp/test/tcr/array/202.php.opts b/hphp/test/slow/array/202.php.opts
similarity index 100%
rename from hphp/test/tcr/array/202.php.opts
rename to hphp/test/slow/array/202.php.opts
diff --git a/hphp/test/tcr/array/203.php b/hphp/test/slow/array/203.php
similarity index 100%
rename from hphp/test/tcr/array/203.php
rename to hphp/test/slow/array/203.php
diff --git a/hphp/test/tcr/array/203.php.expect b/hphp/test/slow/array/203.php.expect
similarity index 100%
rename from hphp/test/tcr/array/203.php.expect
rename to hphp/test/slow/array/203.php.expect
diff --git a/hphp/test/tcr/array/203.php.hphp_opts b/hphp/test/slow/array/203.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/203.php.hphp_opts
rename to hphp/test/slow/array/203.php.hphp_opts
diff --git a/hphp/test/tcr/array/203.php.opts b/hphp/test/slow/array/203.php.opts
similarity index 100%
rename from hphp/test/tcr/array/203.php.opts
rename to hphp/test/slow/array/203.php.opts
diff --git a/hphp/test/tcr/array/204.php b/hphp/test/slow/array/204.php
similarity index 100%
rename from hphp/test/tcr/array/204.php
rename to hphp/test/slow/array/204.php
diff --git a/hphp/test/tcr/array/204.php.expect b/hphp/test/slow/array/204.php.expect
similarity index 100%
rename from hphp/test/tcr/array/204.php.expect
rename to hphp/test/slow/array/204.php.expect
diff --git a/hphp/test/tcr/array/204.php.hphp_opts b/hphp/test/slow/array/204.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/204.php.hphp_opts
rename to hphp/test/slow/array/204.php.hphp_opts
diff --git a/hphp/test/tcr/array/204.php.opts b/hphp/test/slow/array/204.php.opts
similarity index 100%
rename from hphp/test/tcr/array/204.php.opts
rename to hphp/test/slow/array/204.php.opts
diff --git a/hphp/test/tcr/array/205.php b/hphp/test/slow/array/205.php
similarity index 100%
rename from hphp/test/tcr/array/205.php
rename to hphp/test/slow/array/205.php
diff --git a/hphp/test/tcr/array/205.php.expect b/hphp/test/slow/array/205.php.expect
similarity index 100%
rename from hphp/test/tcr/array/205.php.expect
rename to hphp/test/slow/array/205.php.expect
diff --git a/hphp/test/tcr/array/205.php.hphp_opts b/hphp/test/slow/array/205.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/205.php.hphp_opts
rename to hphp/test/slow/array/205.php.hphp_opts
diff --git a/hphp/test/tcr/array/205.php.opts b/hphp/test/slow/array/205.php.opts
similarity index 100%
rename from hphp/test/tcr/array/205.php.opts
rename to hphp/test/slow/array/205.php.opts
diff --git a/hphp/test/tcr/array/206.php b/hphp/test/slow/array/206.php
similarity index 100%
rename from hphp/test/tcr/array/206.php
rename to hphp/test/slow/array/206.php
diff --git a/hphp/test/tcr/array/206.php.expect b/hphp/test/slow/array/206.php.expect
similarity index 100%
rename from hphp/test/tcr/array/206.php.expect
rename to hphp/test/slow/array/206.php.expect
diff --git a/hphp/test/tcr/array/206.php.hphp_opts b/hphp/test/slow/array/206.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/206.php.hphp_opts
rename to hphp/test/slow/array/206.php.hphp_opts
diff --git a/hphp/test/tcr/array/206.php.opts b/hphp/test/slow/array/206.php.opts
similarity index 100%
rename from hphp/test/tcr/array/206.php.opts
rename to hphp/test/slow/array/206.php.opts
diff --git a/hphp/test/tcr/array/207.php b/hphp/test/slow/array/207.php
similarity index 100%
rename from hphp/test/tcr/array/207.php
rename to hphp/test/slow/array/207.php
diff --git a/hphp/test/tcr/array/207.php.expect b/hphp/test/slow/array/207.php.expect
similarity index 100%
rename from hphp/test/tcr/array/207.php.expect
rename to hphp/test/slow/array/207.php.expect
diff --git a/hphp/test/tcr/array/207.php.hphp_opts b/hphp/test/slow/array/207.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/207.php.hphp_opts
rename to hphp/test/slow/array/207.php.hphp_opts
diff --git a/hphp/test/tcr/array/207.php.opts b/hphp/test/slow/array/207.php.opts
similarity index 100%
rename from hphp/test/tcr/array/207.php.opts
rename to hphp/test/slow/array/207.php.opts
diff --git a/hphp/test/tcr/array/208.php b/hphp/test/slow/array/208.php
similarity index 100%
rename from hphp/test/tcr/array/208.php
rename to hphp/test/slow/array/208.php
diff --git a/hphp/test/tcr/array/208.php.expect b/hphp/test/slow/array/208.php.expect
similarity index 100%
rename from hphp/test/tcr/array/208.php.expect
rename to hphp/test/slow/array/208.php.expect
diff --git a/hphp/test/tcr/array/208.php.hphp_opts b/hphp/test/slow/array/208.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/208.php.hphp_opts
rename to hphp/test/slow/array/208.php.hphp_opts
diff --git a/hphp/test/tcr/array/208.php.opts b/hphp/test/slow/array/208.php.opts
similarity index 100%
rename from hphp/test/tcr/array/208.php.opts
rename to hphp/test/slow/array/208.php.opts
diff --git a/hphp/test/tcr/array/209.php b/hphp/test/slow/array/209.php
similarity index 100%
rename from hphp/test/tcr/array/209.php
rename to hphp/test/slow/array/209.php
diff --git a/hphp/test/tcr/array/209.php.expect b/hphp/test/slow/array/209.php.expect
similarity index 100%
rename from hphp/test/tcr/array/209.php.expect
rename to hphp/test/slow/array/209.php.expect
diff --git a/hphp/test/tcr/array/209.php.hphp_opts b/hphp/test/slow/array/209.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/209.php.hphp_opts
rename to hphp/test/slow/array/209.php.hphp_opts
diff --git a/hphp/test/tcr/array/209.php.opts b/hphp/test/slow/array/209.php.opts
similarity index 100%
rename from hphp/test/tcr/array/209.php.opts
rename to hphp/test/slow/array/209.php.opts
diff --git a/hphp/test/tcr/array/210.php b/hphp/test/slow/array/210.php
similarity index 100%
rename from hphp/test/tcr/array/210.php
rename to hphp/test/slow/array/210.php
diff --git a/hphp/test/tcr/array/210.php.expect b/hphp/test/slow/array/210.php.expect
similarity index 100%
rename from hphp/test/tcr/array/210.php.expect
rename to hphp/test/slow/array/210.php.expect
diff --git a/hphp/test/tcr/array/210.php.hphp_opts b/hphp/test/slow/array/210.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/210.php.hphp_opts
rename to hphp/test/slow/array/210.php.hphp_opts
diff --git a/hphp/test/tcr/array/210.php.opts b/hphp/test/slow/array/210.php.opts
similarity index 100%
rename from hphp/test/tcr/array/210.php.opts
rename to hphp/test/slow/array/210.php.opts
diff --git a/hphp/test/tcr/array/211.php b/hphp/test/slow/array/211.php
similarity index 100%
rename from hphp/test/tcr/array/211.php
rename to hphp/test/slow/array/211.php
diff --git a/hphp/test/tcr/array/211.php.expect b/hphp/test/slow/array/211.php.expect
similarity index 100%
rename from hphp/test/tcr/array/211.php.expect
rename to hphp/test/slow/array/211.php.expect
diff --git a/hphp/test/tcr/array/211.php.hphp_opts b/hphp/test/slow/array/211.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/211.php.hphp_opts
rename to hphp/test/slow/array/211.php.hphp_opts
diff --git a/hphp/test/tcr/array/211.php.opts b/hphp/test/slow/array/211.php.opts
similarity index 100%
rename from hphp/test/tcr/array/211.php.opts
rename to hphp/test/slow/array/211.php.opts
diff --git a/hphp/test/tcr/array/212.php b/hphp/test/slow/array/212.php
similarity index 100%
rename from hphp/test/tcr/array/212.php
rename to hphp/test/slow/array/212.php
diff --git a/hphp/test/tcr/array/212.php.expect b/hphp/test/slow/array/212.php.expect
similarity index 100%
rename from hphp/test/tcr/array/212.php.expect
rename to hphp/test/slow/array/212.php.expect
diff --git a/hphp/test/tcr/array/212.php.hphp_opts b/hphp/test/slow/array/212.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/212.php.hphp_opts
rename to hphp/test/slow/array/212.php.hphp_opts
diff --git a/hphp/test/tcr/array/212.php.opts b/hphp/test/slow/array/212.php.opts
similarity index 100%
rename from hphp/test/tcr/array/212.php.opts
rename to hphp/test/slow/array/212.php.opts
diff --git a/hphp/test/tcr/array/213.php b/hphp/test/slow/array/213.php
similarity index 100%
rename from hphp/test/tcr/array/213.php
rename to hphp/test/slow/array/213.php
diff --git a/hphp/test/tcr/array/213.php.expect b/hphp/test/slow/array/213.php.expect
similarity index 100%
rename from hphp/test/tcr/array/213.php.expect
rename to hphp/test/slow/array/213.php.expect
diff --git a/hphp/test/tcr/array/213.php.hphp_opts b/hphp/test/slow/array/213.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/213.php.hphp_opts
rename to hphp/test/slow/array/213.php.hphp_opts
diff --git a/hphp/test/tcr/array/213.php.opts b/hphp/test/slow/array/213.php.opts
similarity index 100%
rename from hphp/test/tcr/array/213.php.opts
rename to hphp/test/slow/array/213.php.opts
diff --git a/hphp/test/tcr/array/214.php b/hphp/test/slow/array/214.php
similarity index 100%
rename from hphp/test/tcr/array/214.php
rename to hphp/test/slow/array/214.php
diff --git a/hphp/test/tcr/array/214.php.expect b/hphp/test/slow/array/214.php.expect
similarity index 100%
rename from hphp/test/tcr/array/214.php.expect
rename to hphp/test/slow/array/214.php.expect
diff --git a/hphp/test/tcr/array/214.php.hphp_opts b/hphp/test/slow/array/214.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/214.php.hphp_opts
rename to hphp/test/slow/array/214.php.hphp_opts
diff --git a/hphp/test/tcr/array/214.php.opts b/hphp/test/slow/array/214.php.opts
similarity index 100%
rename from hphp/test/tcr/array/214.php.opts
rename to hphp/test/slow/array/214.php.opts
diff --git a/hphp/test/tcr/array/215.php b/hphp/test/slow/array/215.php
similarity index 100%
rename from hphp/test/tcr/array/215.php
rename to hphp/test/slow/array/215.php
diff --git a/hphp/test/tcr/array/215.php.expect b/hphp/test/slow/array/215.php.expect
similarity index 100%
rename from hphp/test/tcr/array/215.php.expect
rename to hphp/test/slow/array/215.php.expect
diff --git a/hphp/test/tcr/array/215.php.hphp_opts b/hphp/test/slow/array/215.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/215.php.hphp_opts
rename to hphp/test/slow/array/215.php.hphp_opts
diff --git a/hphp/test/tcr/array/215.php.opts b/hphp/test/slow/array/215.php.opts
similarity index 100%
rename from hphp/test/tcr/array/215.php.opts
rename to hphp/test/slow/array/215.php.opts
diff --git a/hphp/test/tcr/array/216.php b/hphp/test/slow/array/216.php
similarity index 100%
rename from hphp/test/tcr/array/216.php
rename to hphp/test/slow/array/216.php
diff --git a/hphp/test/tcr/array/216.php.expect b/hphp/test/slow/array/216.php.expect
similarity index 100%
rename from hphp/test/tcr/array/216.php.expect
rename to hphp/test/slow/array/216.php.expect
diff --git a/hphp/test/tcr/array/216.php.hphp_opts b/hphp/test/slow/array/216.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/216.php.hphp_opts
rename to hphp/test/slow/array/216.php.hphp_opts
diff --git a/hphp/test/tcr/array/216.php.opts b/hphp/test/slow/array/216.php.opts
similarity index 100%
rename from hphp/test/tcr/array/216.php.opts
rename to hphp/test/slow/array/216.php.opts
diff --git a/hphp/test/tcr/array/217.php b/hphp/test/slow/array/217.php
similarity index 100%
rename from hphp/test/tcr/array/217.php
rename to hphp/test/slow/array/217.php
diff --git a/hphp/test/tcr/array/217.php.expect b/hphp/test/slow/array/217.php.expect
similarity index 100%
rename from hphp/test/tcr/array/217.php.expect
rename to hphp/test/slow/array/217.php.expect
diff --git a/hphp/test/tcr/array/217.php.hphp_opts b/hphp/test/slow/array/217.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/217.php.hphp_opts
rename to hphp/test/slow/array/217.php.hphp_opts
diff --git a/hphp/test/tcr/array/217.php.opts b/hphp/test/slow/array/217.php.opts
similarity index 100%
rename from hphp/test/tcr/array/217.php.opts
rename to hphp/test/slow/array/217.php.opts
diff --git a/hphp/test/tcr/array/218.php b/hphp/test/slow/array/218.php
similarity index 100%
rename from hphp/test/tcr/array/218.php
rename to hphp/test/slow/array/218.php
diff --git a/hphp/test/tcr/array/218.php.expect b/hphp/test/slow/array/218.php.expect
similarity index 100%
rename from hphp/test/tcr/array/218.php.expect
rename to hphp/test/slow/array/218.php.expect
diff --git a/hphp/test/tcr/array/218.php.hphp_opts b/hphp/test/slow/array/218.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/218.php.hphp_opts
rename to hphp/test/slow/array/218.php.hphp_opts
diff --git a/hphp/test/tcr/array/218.php.opts b/hphp/test/slow/array/218.php.opts
similarity index 100%
rename from hphp/test/tcr/array/218.php.opts
rename to hphp/test/slow/array/218.php.opts
diff --git a/hphp/test/tcr/array/219.php b/hphp/test/slow/array/219.php
similarity index 100%
rename from hphp/test/tcr/array/219.php
rename to hphp/test/slow/array/219.php
diff --git a/hphp/test/tcr/array/219.php.expect b/hphp/test/slow/array/219.php.expect
similarity index 100%
rename from hphp/test/tcr/array/219.php.expect
rename to hphp/test/slow/array/219.php.expect
diff --git a/hphp/test/tcr/array/219.php.hphp_opts b/hphp/test/slow/array/219.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/219.php.hphp_opts
rename to hphp/test/slow/array/219.php.hphp_opts
diff --git a/hphp/test/tcr/array/219.php.opts b/hphp/test/slow/array/219.php.opts
similarity index 100%
rename from hphp/test/tcr/array/219.php.opts
rename to hphp/test/slow/array/219.php.opts
diff --git a/hphp/test/tcr/array/220.php b/hphp/test/slow/array/220.php
similarity index 100%
rename from hphp/test/tcr/array/220.php
rename to hphp/test/slow/array/220.php
diff --git a/hphp/test/tcr/array/220.php.expect b/hphp/test/slow/array/220.php.expect
similarity index 100%
rename from hphp/test/tcr/array/220.php.expect
rename to hphp/test/slow/array/220.php.expect
diff --git a/hphp/test/tcr/array/220.php.hphp_opts b/hphp/test/slow/array/220.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/220.php.hphp_opts
rename to hphp/test/slow/array/220.php.hphp_opts
diff --git a/hphp/test/tcr/array/220.php.opts b/hphp/test/slow/array/220.php.opts
similarity index 100%
rename from hphp/test/tcr/array/220.php.opts
rename to hphp/test/slow/array/220.php.opts
diff --git a/hphp/test/tcr/array/221.php b/hphp/test/slow/array/221.php
similarity index 100%
rename from hphp/test/tcr/array/221.php
rename to hphp/test/slow/array/221.php
diff --git a/hphp/test/tcr/array/221.php.expect b/hphp/test/slow/array/221.php.expect
similarity index 100%
rename from hphp/test/tcr/array/221.php.expect
rename to hphp/test/slow/array/221.php.expect
diff --git a/hphp/test/tcr/array/221.php.hphp_opts b/hphp/test/slow/array/221.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/221.php.hphp_opts
rename to hphp/test/slow/array/221.php.hphp_opts
diff --git a/hphp/test/tcr/array/221.php.opts b/hphp/test/slow/array/221.php.opts
similarity index 100%
rename from hphp/test/tcr/array/221.php.opts
rename to hphp/test/slow/array/221.php.opts
diff --git a/hphp/test/tcr/array/222.php b/hphp/test/slow/array/222.php
similarity index 100%
rename from hphp/test/tcr/array/222.php
rename to hphp/test/slow/array/222.php
diff --git a/hphp/test/tcr/array/222.php.expect b/hphp/test/slow/array/222.php.expect
similarity index 100%
rename from hphp/test/tcr/array/222.php.expect
rename to hphp/test/slow/array/222.php.expect
diff --git a/hphp/test/tcr/array/222.php.hphp_opts b/hphp/test/slow/array/222.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/222.php.hphp_opts
rename to hphp/test/slow/array/222.php.hphp_opts
diff --git a/hphp/test/tcr/array/222.php.opts b/hphp/test/slow/array/222.php.opts
similarity index 100%
rename from hphp/test/tcr/array/222.php.opts
rename to hphp/test/slow/array/222.php.opts
diff --git a/hphp/test/tcr/array/223.php b/hphp/test/slow/array/223.php
similarity index 100%
rename from hphp/test/tcr/array/223.php
rename to hphp/test/slow/array/223.php
diff --git a/hphp/test/tcr/array/223.php.expect b/hphp/test/slow/array/223.php.expect
similarity index 100%
rename from hphp/test/tcr/array/223.php.expect
rename to hphp/test/slow/array/223.php.expect
diff --git a/hphp/test/tcr/array/223.php.hphp_opts b/hphp/test/slow/array/223.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/223.php.hphp_opts
rename to hphp/test/slow/array/223.php.hphp_opts
diff --git a/hphp/test/tcr/array/223.php.opts b/hphp/test/slow/array/223.php.opts
similarity index 100%
rename from hphp/test/tcr/array/223.php.opts
rename to hphp/test/slow/array/223.php.opts
diff --git a/hphp/test/tcr/array/224.php b/hphp/test/slow/array/224.php
similarity index 100%
rename from hphp/test/tcr/array/224.php
rename to hphp/test/slow/array/224.php
diff --git a/hphp/test/tcr/array/224.php.expect b/hphp/test/slow/array/224.php.expect
similarity index 100%
rename from hphp/test/tcr/array/224.php.expect
rename to hphp/test/slow/array/224.php.expect
diff --git a/hphp/test/tcr/array/224.php.hphp_opts b/hphp/test/slow/array/224.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/224.php.hphp_opts
rename to hphp/test/slow/array/224.php.hphp_opts
diff --git a/hphp/test/tcr/array/224.php.opts b/hphp/test/slow/array/224.php.opts
similarity index 100%
rename from hphp/test/tcr/array/224.php.opts
rename to hphp/test/slow/array/224.php.opts
diff --git a/hphp/test/tcr/array/225.php b/hphp/test/slow/array/225.php
similarity index 100%
rename from hphp/test/tcr/array/225.php
rename to hphp/test/slow/array/225.php
diff --git a/hphp/test/tcr/array/225.php.expect b/hphp/test/slow/array/225.php.expect
similarity index 100%
rename from hphp/test/tcr/array/225.php.expect
rename to hphp/test/slow/array/225.php.expect
diff --git a/hphp/test/tcr/array/225.php.hphp_opts b/hphp/test/slow/array/225.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/225.php.hphp_opts
rename to hphp/test/slow/array/225.php.hphp_opts
diff --git a/hphp/test/tcr/array/225.php.opts b/hphp/test/slow/array/225.php.opts
similarity index 100%
rename from hphp/test/tcr/array/225.php.opts
rename to hphp/test/slow/array/225.php.opts
diff --git a/hphp/test/tcr/array/226.php b/hphp/test/slow/array/226.php
similarity index 100%
rename from hphp/test/tcr/array/226.php
rename to hphp/test/slow/array/226.php
diff --git a/hphp/test/tcr/array/226.php.expect b/hphp/test/slow/array/226.php.expect
similarity index 100%
rename from hphp/test/tcr/array/226.php.expect
rename to hphp/test/slow/array/226.php.expect
diff --git a/hphp/test/tcr/array/226.php.hphp_opts b/hphp/test/slow/array/226.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/226.php.hphp_opts
rename to hphp/test/slow/array/226.php.hphp_opts
diff --git a/hphp/test/tcr/array/226.php.opts b/hphp/test/slow/array/226.php.opts
similarity index 100%
rename from hphp/test/tcr/array/226.php.opts
rename to hphp/test/slow/array/226.php.opts
diff --git a/hphp/test/tcr/array/227.php b/hphp/test/slow/array/227.php
similarity index 100%
rename from hphp/test/tcr/array/227.php
rename to hphp/test/slow/array/227.php
diff --git a/hphp/test/tcr/array/227.php.expect b/hphp/test/slow/array/227.php.expect
similarity index 100%
rename from hphp/test/tcr/array/227.php.expect
rename to hphp/test/slow/array/227.php.expect
diff --git a/hphp/test/tcr/array/227.php.hphp_opts b/hphp/test/slow/array/227.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/227.php.hphp_opts
rename to hphp/test/slow/array/227.php.hphp_opts
diff --git a/hphp/test/tcr/array/227.php.opts b/hphp/test/slow/array/227.php.opts
similarity index 100%
rename from hphp/test/tcr/array/227.php.opts
rename to hphp/test/slow/array/227.php.opts
diff --git a/hphp/test/tcr/array/228.php b/hphp/test/slow/array/228.php
similarity index 100%
rename from hphp/test/tcr/array/228.php
rename to hphp/test/slow/array/228.php
diff --git a/hphp/test/tcr/array/228.php.expect b/hphp/test/slow/array/228.php.expect
similarity index 100%
rename from hphp/test/tcr/array/228.php.expect
rename to hphp/test/slow/array/228.php.expect
diff --git a/hphp/test/tcr/array/228.php.hphp_opts b/hphp/test/slow/array/228.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/228.php.hphp_opts
rename to hphp/test/slow/array/228.php.hphp_opts
diff --git a/hphp/test/tcr/array/228.php.opts b/hphp/test/slow/array/228.php.opts
similarity index 100%
rename from hphp/test/tcr/array/228.php.opts
rename to hphp/test/slow/array/228.php.opts
diff --git a/hphp/test/tcr/array/229.php b/hphp/test/slow/array/229.php
similarity index 100%
rename from hphp/test/tcr/array/229.php
rename to hphp/test/slow/array/229.php
diff --git a/hphp/test/tcr/array/229.php.expect b/hphp/test/slow/array/229.php.expect
similarity index 100%
rename from hphp/test/tcr/array/229.php.expect
rename to hphp/test/slow/array/229.php.expect
diff --git a/hphp/test/tcr/array/229.php.hphp_opts b/hphp/test/slow/array/229.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/229.php.hphp_opts
rename to hphp/test/slow/array/229.php.hphp_opts
diff --git a/hphp/test/tcr/array/229.php.opts b/hphp/test/slow/array/229.php.opts
similarity index 100%
rename from hphp/test/tcr/array/229.php.opts
rename to hphp/test/slow/array/229.php.opts
diff --git a/hphp/test/tcr/array/230.php b/hphp/test/slow/array/230.php
similarity index 100%
rename from hphp/test/tcr/array/230.php
rename to hphp/test/slow/array/230.php
diff --git a/hphp/test/tcr/array/230.php.expect b/hphp/test/slow/array/230.php.expect
similarity index 100%
rename from hphp/test/tcr/array/230.php.expect
rename to hphp/test/slow/array/230.php.expect
diff --git a/hphp/test/tcr/array/230.php.hphp_opts b/hphp/test/slow/array/230.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/230.php.hphp_opts
rename to hphp/test/slow/array/230.php.hphp_opts
diff --git a/hphp/test/tcr/array/230.php.opts b/hphp/test/slow/array/230.php.opts
similarity index 100%
rename from hphp/test/tcr/array/230.php.opts
rename to hphp/test/slow/array/230.php.opts
diff --git a/hphp/test/tcr/array/231.php b/hphp/test/slow/array/231.php
similarity index 100%
rename from hphp/test/tcr/array/231.php
rename to hphp/test/slow/array/231.php
diff --git a/hphp/test/tcr/array/231.php.expect b/hphp/test/slow/array/231.php.expect
similarity index 100%
rename from hphp/test/tcr/array/231.php.expect
rename to hphp/test/slow/array/231.php.expect
diff --git a/hphp/test/tcr/array/231.php.hphp_opts b/hphp/test/slow/array/231.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/231.php.hphp_opts
rename to hphp/test/slow/array/231.php.hphp_opts
diff --git a/hphp/test/tcr/array/231.php.opts b/hphp/test/slow/array/231.php.opts
similarity index 100%
rename from hphp/test/tcr/array/231.php.opts
rename to hphp/test/slow/array/231.php.opts
diff --git a/hphp/test/tcr/array/232.php b/hphp/test/slow/array/232.php
similarity index 100%
rename from hphp/test/tcr/array/232.php
rename to hphp/test/slow/array/232.php
diff --git a/hphp/test/tcr/array/232.php.expect b/hphp/test/slow/array/232.php.expect
similarity index 100%
rename from hphp/test/tcr/array/232.php.expect
rename to hphp/test/slow/array/232.php.expect
diff --git a/hphp/test/tcr/array/232.php.hphp_opts b/hphp/test/slow/array/232.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/232.php.hphp_opts
rename to hphp/test/slow/array/232.php.hphp_opts
diff --git a/hphp/test/tcr/array/232.php.opts b/hphp/test/slow/array/232.php.opts
similarity index 100%
rename from hphp/test/tcr/array/232.php.opts
rename to hphp/test/slow/array/232.php.opts
diff --git a/hphp/test/tcr/array/233.php b/hphp/test/slow/array/233.php
similarity index 100%
rename from hphp/test/tcr/array/233.php
rename to hphp/test/slow/array/233.php
diff --git a/hphp/test/tcr/array/233.php.expect b/hphp/test/slow/array/233.php.expect
similarity index 100%
rename from hphp/test/tcr/array/233.php.expect
rename to hphp/test/slow/array/233.php.expect
diff --git a/hphp/test/tcr/array/233.php.hphp_opts b/hphp/test/slow/array/233.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/233.php.hphp_opts
rename to hphp/test/slow/array/233.php.hphp_opts
diff --git a/hphp/test/tcr/array/233.php.opts b/hphp/test/slow/array/233.php.opts
similarity index 100%
rename from hphp/test/tcr/array/233.php.opts
rename to hphp/test/slow/array/233.php.opts
diff --git a/hphp/test/tcr/array/234.php b/hphp/test/slow/array/234.php
similarity index 100%
rename from hphp/test/tcr/array/234.php
rename to hphp/test/slow/array/234.php
diff --git a/hphp/test/tcr/array/234.php.expect b/hphp/test/slow/array/234.php.expect
similarity index 100%
rename from hphp/test/tcr/array/234.php.expect
rename to hphp/test/slow/array/234.php.expect
diff --git a/hphp/test/tcr/array/234.php.hphp_opts b/hphp/test/slow/array/234.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/234.php.hphp_opts
rename to hphp/test/slow/array/234.php.hphp_opts
diff --git a/hphp/test/tcr/array/234.php.opts b/hphp/test/slow/array/234.php.opts
similarity index 100%
rename from hphp/test/tcr/array/234.php.opts
rename to hphp/test/slow/array/234.php.opts
diff --git a/hphp/test/tcr/array/235.php b/hphp/test/slow/array/235.php
similarity index 100%
rename from hphp/test/tcr/array/235.php
rename to hphp/test/slow/array/235.php
diff --git a/hphp/test/tcr/array/235.php.expect b/hphp/test/slow/array/235.php.expect
similarity index 100%
rename from hphp/test/tcr/array/235.php.expect
rename to hphp/test/slow/array/235.php.expect
diff --git a/hphp/test/tcr/array/235.php.hphp_opts b/hphp/test/slow/array/235.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/235.php.hphp_opts
rename to hphp/test/slow/array/235.php.hphp_opts
diff --git a/hphp/test/tcr/array/235.php.opts b/hphp/test/slow/array/235.php.opts
similarity index 100%
rename from hphp/test/tcr/array/235.php.opts
rename to hphp/test/slow/array/235.php.opts
diff --git a/hphp/test/tcr/array/236.php b/hphp/test/slow/array/236.php
similarity index 100%
rename from hphp/test/tcr/array/236.php
rename to hphp/test/slow/array/236.php
diff --git a/hphp/test/tcr/array/236.php.expect b/hphp/test/slow/array/236.php.expect
similarity index 100%
rename from hphp/test/tcr/array/236.php.expect
rename to hphp/test/slow/array/236.php.expect
diff --git a/hphp/test/tcr/array/236.php.hphp_opts b/hphp/test/slow/array/236.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/236.php.hphp_opts
rename to hphp/test/slow/array/236.php.hphp_opts
diff --git a/hphp/test/tcr/array/236.php.opts b/hphp/test/slow/array/236.php.opts
similarity index 100%
rename from hphp/test/tcr/array/236.php.opts
rename to hphp/test/slow/array/236.php.opts
diff --git a/hphp/test/tcr/array/237.php b/hphp/test/slow/array/237.php
similarity index 100%
rename from hphp/test/tcr/array/237.php
rename to hphp/test/slow/array/237.php
diff --git a/hphp/test/tcr/array/237.php.expect b/hphp/test/slow/array/237.php.expect
similarity index 100%
rename from hphp/test/tcr/array/237.php.expect
rename to hphp/test/slow/array/237.php.expect
diff --git a/hphp/test/tcr/array/237.php.hphp_opts b/hphp/test/slow/array/237.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/237.php.hphp_opts
rename to hphp/test/slow/array/237.php.hphp_opts
diff --git a/hphp/test/tcr/array/237.php.opts b/hphp/test/slow/array/237.php.opts
similarity index 100%
rename from hphp/test/tcr/array/237.php.opts
rename to hphp/test/slow/array/237.php.opts
diff --git a/hphp/test/tcr/array/238.php b/hphp/test/slow/array/238.php
similarity index 100%
rename from hphp/test/tcr/array/238.php
rename to hphp/test/slow/array/238.php
diff --git a/hphp/test/tcr/array/238.php.expect b/hphp/test/slow/array/238.php.expect
similarity index 100%
rename from hphp/test/tcr/array/238.php.expect
rename to hphp/test/slow/array/238.php.expect
diff --git a/hphp/test/tcr/array/238.php.hphp_opts b/hphp/test/slow/array/238.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/238.php.hphp_opts
rename to hphp/test/slow/array/238.php.hphp_opts
diff --git a/hphp/test/tcr/array/238.php.opts b/hphp/test/slow/array/238.php.opts
similarity index 100%
rename from hphp/test/tcr/array/238.php.opts
rename to hphp/test/slow/array/238.php.opts
diff --git a/hphp/test/tcr/array/239.php b/hphp/test/slow/array/239.php
similarity index 100%
rename from hphp/test/tcr/array/239.php
rename to hphp/test/slow/array/239.php
diff --git a/hphp/test/tcr/array/239.php.expect b/hphp/test/slow/array/239.php.expect
similarity index 100%
rename from hphp/test/tcr/array/239.php.expect
rename to hphp/test/slow/array/239.php.expect
diff --git a/hphp/test/tcr/array/239.php.hphp_opts b/hphp/test/slow/array/239.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/239.php.hphp_opts
rename to hphp/test/slow/array/239.php.hphp_opts
diff --git a/hphp/test/tcr/array/239.php.opts b/hphp/test/slow/array/239.php.opts
similarity index 100%
rename from hphp/test/tcr/array/239.php.opts
rename to hphp/test/slow/array/239.php.opts
diff --git a/hphp/test/tcr/array/240.php b/hphp/test/slow/array/240.php
similarity index 100%
rename from hphp/test/tcr/array/240.php
rename to hphp/test/slow/array/240.php
diff --git a/hphp/test/tcr/array/240.php.expect b/hphp/test/slow/array/240.php.expect
similarity index 100%
rename from hphp/test/tcr/array/240.php.expect
rename to hphp/test/slow/array/240.php.expect
diff --git a/hphp/test/tcr/array/240.php.hphp_opts b/hphp/test/slow/array/240.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/240.php.hphp_opts
rename to hphp/test/slow/array/240.php.hphp_opts
diff --git a/hphp/test/tcr/array/240.php.opts b/hphp/test/slow/array/240.php.opts
similarity index 100%
rename from hphp/test/tcr/array/240.php.opts
rename to hphp/test/slow/array/240.php.opts
diff --git a/hphp/test/tcr/array/241.php b/hphp/test/slow/array/241.php
similarity index 100%
rename from hphp/test/tcr/array/241.php
rename to hphp/test/slow/array/241.php
diff --git a/hphp/test/tcr/array/241.php.expect b/hphp/test/slow/array/241.php.expect
similarity index 100%
rename from hphp/test/tcr/array/241.php.expect
rename to hphp/test/slow/array/241.php.expect
diff --git a/hphp/test/tcr/array/241.php.hphp_opts b/hphp/test/slow/array/241.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/241.php.hphp_opts
rename to hphp/test/slow/array/241.php.hphp_opts
diff --git a/hphp/test/tcr/array/241.php.opts b/hphp/test/slow/array/241.php.opts
similarity index 100%
rename from hphp/test/tcr/array/241.php.opts
rename to hphp/test/slow/array/241.php.opts
diff --git a/hphp/test/tcr/array/242.php b/hphp/test/slow/array/242.php
similarity index 100%
rename from hphp/test/tcr/array/242.php
rename to hphp/test/slow/array/242.php
diff --git a/hphp/test/tcr/array/242.php.expect b/hphp/test/slow/array/242.php.expect
similarity index 100%
rename from hphp/test/tcr/array/242.php.expect
rename to hphp/test/slow/array/242.php.expect
diff --git a/hphp/test/tcr/array/242.php.hphp_opts b/hphp/test/slow/array/242.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/242.php.hphp_opts
rename to hphp/test/slow/array/242.php.hphp_opts
diff --git a/hphp/test/tcr/array/242.php.opts b/hphp/test/slow/array/242.php.opts
similarity index 100%
rename from hphp/test/tcr/array/242.php.opts
rename to hphp/test/slow/array/242.php.opts
diff --git a/hphp/test/tcr/array/243.php b/hphp/test/slow/array/243.php
similarity index 100%
rename from hphp/test/tcr/array/243.php
rename to hphp/test/slow/array/243.php
diff --git a/hphp/test/tcr/array/243.php.expect b/hphp/test/slow/array/243.php.expect
similarity index 100%
rename from hphp/test/tcr/array/243.php.expect
rename to hphp/test/slow/array/243.php.expect
diff --git a/hphp/test/tcr/array/243.php.hphp_opts b/hphp/test/slow/array/243.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/243.php.hphp_opts
rename to hphp/test/slow/array/243.php.hphp_opts
diff --git a/hphp/test/tcr/array/243.php.opts b/hphp/test/slow/array/243.php.opts
similarity index 100%
rename from hphp/test/tcr/array/243.php.opts
rename to hphp/test/slow/array/243.php.opts
diff --git a/hphp/test/tcr/array/244.php b/hphp/test/slow/array/244.php
similarity index 100%
rename from hphp/test/tcr/array/244.php
rename to hphp/test/slow/array/244.php
diff --git a/hphp/test/tcr/array/244.php.expect b/hphp/test/slow/array/244.php.expect
similarity index 100%
rename from hphp/test/tcr/array/244.php.expect
rename to hphp/test/slow/array/244.php.expect
diff --git a/hphp/test/tcr/array/244.php.hphp_opts b/hphp/test/slow/array/244.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array/244.php.hphp_opts
rename to hphp/test/slow/array/244.php.hphp_opts
diff --git a/hphp/test/tcr/array/244.php.opts b/hphp/test/slow/array/244.php.opts
similarity index 100%
rename from hphp/test/tcr/array/244.php.opts
rename to hphp/test/slow/array/244.php.opts
diff --git a/hphp/test/tcr/array_access/434.php b/hphp/test/slow/array_access/434.php
similarity index 100%
rename from hphp/test/tcr/array_access/434.php
rename to hphp/test/slow/array_access/434.php
diff --git a/hphp/test/tcr/array_access/434.php.expect b/hphp/test/slow/array_access/434.php.expect
similarity index 100%
rename from hphp/test/tcr/array_access/434.php.expect
rename to hphp/test/slow/array_access/434.php.expect
diff --git a/hphp/test/tcr/array_access/435.php b/hphp/test/slow/array_access/435.php
similarity index 100%
rename from hphp/test/tcr/array_access/435.php
rename to hphp/test/slow/array_access/435.php
diff --git a/hphp/test/tcr/array_access/435.php.expect b/hphp/test/slow/array_access/435.php.expect
similarity index 100%
rename from hphp/test/tcr/array_access/435.php.expect
rename to hphp/test/slow/array_access/435.php.expect
diff --git a/hphp/test/tcr/array_access/436.php b/hphp/test/slow/array_access/436.php
similarity index 100%
rename from hphp/test/tcr/array_access/436.php
rename to hphp/test/slow/array_access/436.php
diff --git a/hphp/test/tcr/array_access/436.php.expect b/hphp/test/slow/array_access/436.php.expect
similarity index 100%
rename from hphp/test/tcr/array_access/436.php.expect
rename to hphp/test/slow/array_access/436.php.expect
diff --git a/hphp/test/tcr/array_access/437.php b/hphp/test/slow/array_access/437.php
similarity index 100%
rename from hphp/test/tcr/array_access/437.php
rename to hphp/test/slow/array_access/437.php
diff --git a/hphp/test/tcr/array_access/437.php.expect b/hphp/test/slow/array_access/437.php.expect
similarity index 100%
rename from hphp/test/tcr/array_access/437.php.expect
rename to hphp/test/slow/array_access/437.php.expect
diff --git a/hphp/test/tcr/array_access/438.php b/hphp/test/slow/array_access/438.php
similarity index 100%
rename from hphp/test/tcr/array_access/438.php
rename to hphp/test/slow/array_access/438.php
diff --git a/hphp/test/tcr/array_access/438.php.expect b/hphp/test/slow/array_access/438.php.expect
similarity index 100%
rename from hphp/test/tcr/array_access/438.php.expect
rename to hphp/test/slow/array_access/438.php.expect
diff --git a/hphp/test/tcr/array_assignment/502.php b/hphp/test/slow/array_assignment/502.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/502.php
rename to hphp/test/slow/array_assignment/502.php
diff --git a/hphp/test/tcr/array_assignment/502.php.expect b/hphp/test/slow/array_assignment/502.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/502.php.expect
rename to hphp/test/slow/array_assignment/502.php.expect
diff --git a/hphp/test/tcr/array_assignment/503.php b/hphp/test/slow/array_assignment/503.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/503.php
rename to hphp/test/slow/array_assignment/503.php
diff --git a/hphp/test/tcr/array_assignment/503.php.expect b/hphp/test/slow/array_assignment/503.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/503.php.expect
rename to hphp/test/slow/array_assignment/503.php.expect
diff --git a/hphp/test/tcr/array_assignment/504.php b/hphp/test/slow/array_assignment/504.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/504.php
rename to hphp/test/slow/array_assignment/504.php
diff --git a/hphp/test/tcr/array_assignment/504.php.expect b/hphp/test/slow/array_assignment/504.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/504.php.expect
rename to hphp/test/slow/array_assignment/504.php.expect
diff --git a/hphp/test/tcr/array_assignment/505.php b/hphp/test/slow/array_assignment/505.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/505.php
rename to hphp/test/slow/array_assignment/505.php
diff --git a/hphp/test/tcr/array_assignment/505.php.expect b/hphp/test/slow/array_assignment/505.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/505.php.expect
rename to hphp/test/slow/array_assignment/505.php.expect
diff --git a/hphp/test/tcr/array_assignment/506.php b/hphp/test/slow/array_assignment/506.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/506.php
rename to hphp/test/slow/array_assignment/506.php
diff --git a/hphp/test/tcr/array_assignment/506.php.expect b/hphp/test/slow/array_assignment/506.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/506.php.expect
rename to hphp/test/slow/array_assignment/506.php.expect
diff --git a/hphp/test/tcr/array_assignment/507.php b/hphp/test/slow/array_assignment/507.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/507.php
rename to hphp/test/slow/array_assignment/507.php
diff --git a/hphp/test/tcr/array_assignment/507.php.expect b/hphp/test/slow/array_assignment/507.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/507.php.expect
rename to hphp/test/slow/array_assignment/507.php.expect
diff --git a/hphp/test/tcr/array_assignment/508.php b/hphp/test/slow/array_assignment/508.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/508.php
rename to hphp/test/slow/array_assignment/508.php
diff --git a/hphp/test/tcr/array_assignment/508.php.expect b/hphp/test/slow/array_assignment/508.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/508.php.expect
rename to hphp/test/slow/array_assignment/508.php.expect
diff --git a/hphp/test/tcr/array_assignment/509.php b/hphp/test/slow/array_assignment/509.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/509.php
rename to hphp/test/slow/array_assignment/509.php
diff --git a/hphp/test/tcr/array_assignment/509.php.expect b/hphp/test/slow/array_assignment/509.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/509.php.expect
rename to hphp/test/slow/array_assignment/509.php.expect
diff --git a/hphp/test/tcr/array_assignment/510.php b/hphp/test/slow/array_assignment/510.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/510.php
rename to hphp/test/slow/array_assignment/510.php
diff --git a/hphp/test/tcr/array_assignment/510.php.expect b/hphp/test/slow/array_assignment/510.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/510.php.expect
rename to hphp/test/slow/array_assignment/510.php.expect
diff --git a/hphp/test/tcr/array_assignment/511.php b/hphp/test/slow/array_assignment/511.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/511.php
rename to hphp/test/slow/array_assignment/511.php
diff --git a/hphp/test/tcr/compilation/1249.php.expect b/hphp/test/slow/array_assignment/511.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1249.php.expect
rename to hphp/test/slow/array_assignment/511.php.expect
diff --git a/hphp/test/tcr/array_assignment/512.php b/hphp/test/slow/array_assignment/512.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/512.php
rename to hphp/test/slow/array_assignment/512.php
diff --git a/hphp/test/tcr/compilation/1251.php.expect b/hphp/test/slow/array_assignment/512.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1251.php.expect
rename to hphp/test/slow/array_assignment/512.php.expect
diff --git a/hphp/test/tcr/array_assignment/513.php b/hphp/test/slow/array_assignment/513.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/513.php
rename to hphp/test/slow/array_assignment/513.php
diff --git a/hphp/test/tcr/array_assignment/513.php.expect b/hphp/test/slow/array_assignment/513.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/513.php.expect
rename to hphp/test/slow/array_assignment/513.php.expect
diff --git a/hphp/test/tcr/array_assignment/514.php b/hphp/test/slow/array_assignment/514.php
similarity index 100%
rename from hphp/test/tcr/array_assignment/514.php
rename to hphp/test/slow/array_assignment/514.php
diff --git a/hphp/test/tcr/array_assignment/514.php.expect b/hphp/test/slow/array_assignment/514.php.expect
similarity index 100%
rename from hphp/test/tcr/array_assignment/514.php.expect
rename to hphp/test/slow/array_assignment/514.php.expect
diff --git a/hphp/test/tcr/array_copy/250.php b/hphp/test/slow/array_copy/250.php
similarity index 100%
rename from hphp/test/tcr/array_copy/250.php
rename to hphp/test/slow/array_copy/250.php
diff --git a/hphp/test/tcr/array_copy/250.php.expect b/hphp/test/slow/array_copy/250.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/250.php.expect
rename to hphp/test/slow/array_copy/250.php.expect
diff --git a/hphp/test/tcr/array_copy/251.php b/hphp/test/slow/array_copy/251.php
similarity index 100%
rename from hphp/test/tcr/array_copy/251.php
rename to hphp/test/slow/array_copy/251.php
diff --git a/hphp/test/tcr/array_copy/251.php.expect b/hphp/test/slow/array_copy/251.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/251.php.expect
rename to hphp/test/slow/array_copy/251.php.expect
diff --git a/hphp/test/tcr/array_copy/252.php b/hphp/test/slow/array_copy/252.php
similarity index 100%
rename from hphp/test/tcr/array_copy/252.php
rename to hphp/test/slow/array_copy/252.php
diff --git a/hphp/test/tcr/array_copy/252.php.expect b/hphp/test/slow/array_copy/252.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/252.php.expect
rename to hphp/test/slow/array_copy/252.php.expect
diff --git a/hphp/test/tcr/array_copy/253.php b/hphp/test/slow/array_copy/253.php
similarity index 100%
rename from hphp/test/tcr/array_copy/253.php
rename to hphp/test/slow/array_copy/253.php
diff --git a/hphp/test/tcr/array_copy/253.php.expect b/hphp/test/slow/array_copy/253.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/253.php.expect
rename to hphp/test/slow/array_copy/253.php.expect
diff --git a/hphp/test/tcr/array_copy/254.php b/hphp/test/slow/array_copy/254.php
similarity index 100%
rename from hphp/test/tcr/array_copy/254.php
rename to hphp/test/slow/array_copy/254.php
diff --git a/hphp/test/tcr/array_copy/254.php.expect b/hphp/test/slow/array_copy/254.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/254.php.expect
rename to hphp/test/slow/array_copy/254.php.expect
diff --git a/hphp/test/tcr/array_copy/255.php b/hphp/test/slow/array_copy/255.php
similarity index 100%
rename from hphp/test/tcr/array_copy/255.php
rename to hphp/test/slow/array_copy/255.php
diff --git a/hphp/test/tcr/array_copy/255.php.expect b/hphp/test/slow/array_copy/255.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/255.php.expect
rename to hphp/test/slow/array_copy/255.php.expect
diff --git a/hphp/test/tcr/array_copy/256.php b/hphp/test/slow/array_copy/256.php
similarity index 100%
rename from hphp/test/tcr/array_copy/256.php
rename to hphp/test/slow/array_copy/256.php
diff --git a/hphp/test/tcr/array_copy/256.php.expect b/hphp/test/slow/array_copy/256.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/256.php.expect
rename to hphp/test/slow/array_copy/256.php.expect
diff --git a/hphp/test/tcr/array_copy/257.php b/hphp/test/slow/array_copy/257.php
similarity index 100%
rename from hphp/test/tcr/array_copy/257.php
rename to hphp/test/slow/array_copy/257.php
diff --git a/hphp/test/tcr/array_copy/257.php.expect b/hphp/test/slow/array_copy/257.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/257.php.expect
rename to hphp/test/slow/array_copy/257.php.expect
diff --git a/hphp/test/tcr/array_copy/258.php b/hphp/test/slow/array_copy/258.php
similarity index 100%
rename from hphp/test/tcr/array_copy/258.php
rename to hphp/test/slow/array_copy/258.php
diff --git a/hphp/test/tcr/array_copy/258.php.expect b/hphp/test/slow/array_copy/258.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/258.php.expect
rename to hphp/test/slow/array_copy/258.php.expect
diff --git a/hphp/test/tcr/array_copy/259.php b/hphp/test/slow/array_copy/259.php
similarity index 100%
rename from hphp/test/tcr/array_copy/259.php
rename to hphp/test/slow/array_copy/259.php
diff --git a/hphp/test/tcr/array_copy/259.php.expect b/hphp/test/slow/array_copy/259.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/259.php.expect
rename to hphp/test/slow/array_copy/259.php.expect
diff --git a/hphp/test/tcr/array_copy/260.php b/hphp/test/slow/array_copy/260.php
similarity index 100%
rename from hphp/test/tcr/array_copy/260.php
rename to hphp/test/slow/array_copy/260.php
diff --git a/hphp/test/tcr/array_copy/260.php.expect b/hphp/test/slow/array_copy/260.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/260.php.expect
rename to hphp/test/slow/array_copy/260.php.expect
diff --git a/hphp/test/tcr/array_copy/261.php b/hphp/test/slow/array_copy/261.php
similarity index 100%
rename from hphp/test/tcr/array_copy/261.php
rename to hphp/test/slow/array_copy/261.php
diff --git a/hphp/test/tcr/array_copy/261.php.expect b/hphp/test/slow/array_copy/261.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/261.php.expect
rename to hphp/test/slow/array_copy/261.php.expect
diff --git a/hphp/test/tcr/array_copy/262.php b/hphp/test/slow/array_copy/262.php
similarity index 100%
rename from hphp/test/tcr/array_copy/262.php
rename to hphp/test/slow/array_copy/262.php
diff --git a/hphp/test/tcr/array_copy/262.php.expect b/hphp/test/slow/array_copy/262.php.expect
similarity index 100%
rename from hphp/test/tcr/array_copy/262.php.expect
rename to hphp/test/slow/array_copy/262.php.expect
diff --git a/hphp/test/tcr/array_cse/533.php b/hphp/test/slow/array_cse/533.php
similarity index 100%
rename from hphp/test/tcr/array_cse/533.php
rename to hphp/test/slow/array_cse/533.php
diff --git a/hphp/test/tcr/array_cse/533.php.expect b/hphp/test/slow/array_cse/533.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/533.php.expect
rename to hphp/test/slow/array_cse/533.php.expect
diff --git a/hphp/test/tcr/array_cse/533.php.hphp_opts b/hphp/test/slow/array_cse/533.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/533.php.hphp_opts
rename to hphp/test/slow/array_cse/533.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/533.php.opts b/hphp/test/slow/array_cse/533.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/533.php.opts
rename to hphp/test/slow/array_cse/533.php.opts
diff --git a/hphp/test/tcr/array_cse/534.php b/hphp/test/slow/array_cse/534.php
similarity index 100%
rename from hphp/test/tcr/array_cse/534.php
rename to hphp/test/slow/array_cse/534.php
diff --git a/hphp/test/tcr/array_cse/534.php.expect b/hphp/test/slow/array_cse/534.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/534.php.expect
rename to hphp/test/slow/array_cse/534.php.expect
diff --git a/hphp/test/tcr/array_cse/534.php.hphp_opts b/hphp/test/slow/array_cse/534.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/534.php.hphp_opts
rename to hphp/test/slow/array_cse/534.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/534.php.opts b/hphp/test/slow/array_cse/534.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/534.php.opts
rename to hphp/test/slow/array_cse/534.php.opts
diff --git a/hphp/test/tcr/array_cse/535.php b/hphp/test/slow/array_cse/535.php
similarity index 100%
rename from hphp/test/tcr/array_cse/535.php
rename to hphp/test/slow/array_cse/535.php
diff --git a/hphp/test/tcr/array_cse/535.php.expect b/hphp/test/slow/array_cse/535.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/535.php.expect
rename to hphp/test/slow/array_cse/535.php.expect
diff --git a/hphp/test/tcr/array_cse/535.php.hphp_opts b/hphp/test/slow/array_cse/535.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/535.php.hphp_opts
rename to hphp/test/slow/array_cse/535.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/535.php.opts b/hphp/test/slow/array_cse/535.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/535.php.opts
rename to hphp/test/slow/array_cse/535.php.opts
diff --git a/hphp/test/tcr/array_cse/536.php b/hphp/test/slow/array_cse/536.php
similarity index 100%
rename from hphp/test/tcr/array_cse/536.php
rename to hphp/test/slow/array_cse/536.php
diff --git a/hphp/test/tcr/array_cse/536.php.expect b/hphp/test/slow/array_cse/536.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/536.php.expect
rename to hphp/test/slow/array_cse/536.php.expect
diff --git a/hphp/test/tcr/array_cse/536.php.hphp_opts b/hphp/test/slow/array_cse/536.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/536.php.hphp_opts
rename to hphp/test/slow/array_cse/536.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/536.php.opts b/hphp/test/slow/array_cse/536.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/536.php.opts
rename to hphp/test/slow/array_cse/536.php.opts
diff --git a/hphp/test/tcr/array_cse/537.php b/hphp/test/slow/array_cse/537.php
similarity index 100%
rename from hphp/test/tcr/array_cse/537.php
rename to hphp/test/slow/array_cse/537.php
diff --git a/hphp/test/tcr/array_cse/537.php.expect b/hphp/test/slow/array_cse/537.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/537.php.expect
rename to hphp/test/slow/array_cse/537.php.expect
diff --git a/hphp/test/tcr/array_cse/537.php.hphp_opts b/hphp/test/slow/array_cse/537.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/537.php.hphp_opts
rename to hphp/test/slow/array_cse/537.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/537.php.opts b/hphp/test/slow/array_cse/537.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/537.php.opts
rename to hphp/test/slow/array_cse/537.php.opts
diff --git a/hphp/test/tcr/array_cse/538.php b/hphp/test/slow/array_cse/538.php
similarity index 100%
rename from hphp/test/tcr/array_cse/538.php
rename to hphp/test/slow/array_cse/538.php
diff --git a/hphp/test/tcr/array_cse/538.php.expect b/hphp/test/slow/array_cse/538.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/538.php.expect
rename to hphp/test/slow/array_cse/538.php.expect
diff --git a/hphp/test/tcr/array_cse/538.php.hphp_opts b/hphp/test/slow/array_cse/538.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/538.php.hphp_opts
rename to hphp/test/slow/array_cse/538.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/538.php.opts b/hphp/test/slow/array_cse/538.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/538.php.opts
rename to hphp/test/slow/array_cse/538.php.opts
diff --git a/hphp/test/tcr/array_cse/539.php b/hphp/test/slow/array_cse/539.php
similarity index 100%
rename from hphp/test/tcr/array_cse/539.php
rename to hphp/test/slow/array_cse/539.php
diff --git a/hphp/test/tcr/array_cse/539.php.expect b/hphp/test/slow/array_cse/539.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/539.php.expect
rename to hphp/test/slow/array_cse/539.php.expect
diff --git a/hphp/test/tcr/array_cse/539.php.hphp_opts b/hphp/test/slow/array_cse/539.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/539.php.hphp_opts
rename to hphp/test/slow/array_cse/539.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/539.php.opts b/hphp/test/slow/array_cse/539.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/539.php.opts
rename to hphp/test/slow/array_cse/539.php.opts
diff --git a/hphp/test/tcr/array_cse/540.php b/hphp/test/slow/array_cse/540.php
similarity index 100%
rename from hphp/test/tcr/array_cse/540.php
rename to hphp/test/slow/array_cse/540.php
diff --git a/hphp/test/tcr/array_cse/540.php.expect b/hphp/test/slow/array_cse/540.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/540.php.expect
rename to hphp/test/slow/array_cse/540.php.expect
diff --git a/hphp/test/tcr/array_cse/540.php.hphp_opts b/hphp/test/slow/array_cse/540.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/540.php.hphp_opts
rename to hphp/test/slow/array_cse/540.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/540.php.opts b/hphp/test/slow/array_cse/540.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/540.php.opts
rename to hphp/test/slow/array_cse/540.php.opts
diff --git a/hphp/test/tcr/array_cse/541.php b/hphp/test/slow/array_cse/541.php
similarity index 100%
rename from hphp/test/tcr/array_cse/541.php
rename to hphp/test/slow/array_cse/541.php
diff --git a/hphp/test/tcr/array_cse/541.php.expect b/hphp/test/slow/array_cse/541.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/541.php.expect
rename to hphp/test/slow/array_cse/541.php.expect
diff --git a/hphp/test/tcr/array_cse/541.php.hphp_opts b/hphp/test/slow/array_cse/541.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/541.php.hphp_opts
rename to hphp/test/slow/array_cse/541.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/541.php.opts b/hphp/test/slow/array_cse/541.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/541.php.opts
rename to hphp/test/slow/array_cse/541.php.opts
diff --git a/hphp/test/tcr/array_cse/542.php b/hphp/test/slow/array_cse/542.php
similarity index 100%
rename from hphp/test/tcr/array_cse/542.php
rename to hphp/test/slow/array_cse/542.php
diff --git a/hphp/test/tcr/array_cse/542.php.expect b/hphp/test/slow/array_cse/542.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/542.php.expect
rename to hphp/test/slow/array_cse/542.php.expect
diff --git a/hphp/test/tcr/array_cse/542.php.hphp_opts b/hphp/test/slow/array_cse/542.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/542.php.hphp_opts
rename to hphp/test/slow/array_cse/542.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/542.php.opts b/hphp/test/slow/array_cse/542.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/542.php.opts
rename to hphp/test/slow/array_cse/542.php.opts
diff --git a/hphp/test/tcr/array_cse/543.php b/hphp/test/slow/array_cse/543.php
similarity index 100%
rename from hphp/test/tcr/array_cse/543.php
rename to hphp/test/slow/array_cse/543.php
diff --git a/hphp/test/tcr/array_cse/543.php.expect b/hphp/test/slow/array_cse/543.php.expect
similarity index 100%
rename from hphp/test/tcr/array_cse/543.php.expect
rename to hphp/test/slow/array_cse/543.php.expect
diff --git a/hphp/test/tcr/array_cse/543.php.hphp_opts b/hphp/test/slow/array_cse/543.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/543.php.hphp_opts
rename to hphp/test/slow/array_cse/543.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/543.php.opts b/hphp/test/slow/array_cse/543.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/543.php.opts
rename to hphp/test/slow/array_cse/543.php.opts
diff --git a/hphp/test/tcr/array_cse/544.php b/hphp/test/slow/array_cse/544.php
similarity index 100%
rename from hphp/test/tcr/array_cse/544.php
rename to hphp/test/slow/array_cse/544.php
diff --git a/hphp/test/tcr/compilation/1253.php.expect b/hphp/test/slow/array_cse/544.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1253.php.expect
rename to hphp/test/slow/array_cse/544.php.expect
diff --git a/hphp/test/tcr/array_cse/544.php.hphp_opts b/hphp/test/slow/array_cse/544.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_cse/544.php.hphp_opts
rename to hphp/test/slow/array_cse/544.php.hphp_opts
diff --git a/hphp/test/tcr/array_cse/544.php.opts b/hphp/test/slow/array_cse/544.php.opts
similarity index 100%
rename from hphp/test/tcr/array_cse/544.php.opts
rename to hphp/test/slow/array_cse/544.php.opts
diff --git a/hphp/test/tcr/array_escalation/263.php b/hphp/test/slow/array_escalation/263.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/263.php
rename to hphp/test/slow/array_escalation/263.php
diff --git a/hphp/test/tcr/array_escalation/263.php.expect b/hphp/test/slow/array_escalation/263.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/263.php.expect
rename to hphp/test/slow/array_escalation/263.php.expect
diff --git a/hphp/test/tcr/array_escalation/264.php b/hphp/test/slow/array_escalation/264.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/264.php
rename to hphp/test/slow/array_escalation/264.php
diff --git a/hphp/test/tcr/array_escalation/264.php.expect b/hphp/test/slow/array_escalation/264.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/264.php.expect
rename to hphp/test/slow/array_escalation/264.php.expect
diff --git a/hphp/test/tcr/array_escalation/265.php b/hphp/test/slow/array_escalation/265.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/265.php
rename to hphp/test/slow/array_escalation/265.php
diff --git a/hphp/test/tcr/array_escalation/265.php.expect b/hphp/test/slow/array_escalation/265.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/265.php.expect
rename to hphp/test/slow/array_escalation/265.php.expect
diff --git a/hphp/test/tcr/array_escalation/266.php b/hphp/test/slow/array_escalation/266.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/266.php
rename to hphp/test/slow/array_escalation/266.php
diff --git a/hphp/test/tcr/array_escalation/266.php.expect b/hphp/test/slow/array_escalation/266.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/266.php.expect
rename to hphp/test/slow/array_escalation/266.php.expect
diff --git a/hphp/test/tcr/array_escalation/267.php b/hphp/test/slow/array_escalation/267.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/267.php
rename to hphp/test/slow/array_escalation/267.php
diff --git a/hphp/test/tcr/array_escalation/267.php.expect b/hphp/test/slow/array_escalation/267.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/267.php.expect
rename to hphp/test/slow/array_escalation/267.php.expect
diff --git a/hphp/test/tcr/array_escalation/268.php b/hphp/test/slow/array_escalation/268.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/268.php
rename to hphp/test/slow/array_escalation/268.php
diff --git a/hphp/test/tcr/array_escalation/268.php.expect b/hphp/test/slow/array_escalation/268.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/268.php.expect
rename to hphp/test/slow/array_escalation/268.php.expect
diff --git a/hphp/test/tcr/array_escalation/269.php b/hphp/test/slow/array_escalation/269.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/269.php
rename to hphp/test/slow/array_escalation/269.php
diff --git a/hphp/test/tcr/array_escalation/269.php.expect b/hphp/test/slow/array_escalation/269.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/269.php.expect
rename to hphp/test/slow/array_escalation/269.php.expect
diff --git a/hphp/test/tcr/array_escalation/270.php b/hphp/test/slow/array_escalation/270.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/270.php
rename to hphp/test/slow/array_escalation/270.php
diff --git a/hphp/test/tcr/array_escalation/270.php.expect b/hphp/test/slow/array_escalation/270.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/270.php.expect
rename to hphp/test/slow/array_escalation/270.php.expect
diff --git a/hphp/test/tcr/array_escalation/271.php b/hphp/test/slow/array_escalation/271.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/271.php
rename to hphp/test/slow/array_escalation/271.php
diff --git a/hphp/test/tcr/array_escalation/271.php.expect b/hphp/test/slow/array_escalation/271.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/271.php.expect
rename to hphp/test/slow/array_escalation/271.php.expect
diff --git a/hphp/test/tcr/array_escalation/272.php b/hphp/test/slow/array_escalation/272.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/272.php
rename to hphp/test/slow/array_escalation/272.php
diff --git a/hphp/test/tcr/array_escalation/272.php.expect b/hphp/test/slow/array_escalation/272.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/272.php.expect
rename to hphp/test/slow/array_escalation/272.php.expect
diff --git a/hphp/test/tcr/array_escalation/273.php b/hphp/test/slow/array_escalation/273.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/273.php
rename to hphp/test/slow/array_escalation/273.php
diff --git a/hphp/test/tcr/array_escalation/273.php.expect b/hphp/test/slow/array_escalation/273.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/273.php.expect
rename to hphp/test/slow/array_escalation/273.php.expect
diff --git a/hphp/test/tcr/array_escalation/274.php b/hphp/test/slow/array_escalation/274.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/274.php
rename to hphp/test/slow/array_escalation/274.php
diff --git a/hphp/test/tcr/array_escalation/274.php.expect b/hphp/test/slow/array_escalation/274.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/274.php.expect
rename to hphp/test/slow/array_escalation/274.php.expect
diff --git a/hphp/test/tcr/array_escalation/275.php b/hphp/test/slow/array_escalation/275.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/275.php
rename to hphp/test/slow/array_escalation/275.php
diff --git a/hphp/test/tcr/array_escalation/275.php.expect b/hphp/test/slow/array_escalation/275.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/275.php.expect
rename to hphp/test/slow/array_escalation/275.php.expect
diff --git a/hphp/test/tcr/array_escalation/276.php b/hphp/test/slow/array_escalation/276.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/276.php
rename to hphp/test/slow/array_escalation/276.php
diff --git a/hphp/test/tcr/array_escalation/276.php.expect b/hphp/test/slow/array_escalation/276.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/276.php.expect
rename to hphp/test/slow/array_escalation/276.php.expect
diff --git a/hphp/test/tcr/array_escalation/277.php b/hphp/test/slow/array_escalation/277.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/277.php
rename to hphp/test/slow/array_escalation/277.php
diff --git a/hphp/test/tcr/array_escalation/277.php.expect b/hphp/test/slow/array_escalation/277.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/277.php.expect
rename to hphp/test/slow/array_escalation/277.php.expect
diff --git a/hphp/test/tcr/array_escalation/278.php b/hphp/test/slow/array_escalation/278.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/278.php
rename to hphp/test/slow/array_escalation/278.php
diff --git a/hphp/test/tcr/array_escalation/278.php.expect b/hphp/test/slow/array_escalation/278.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/278.php.expect
rename to hphp/test/slow/array_escalation/278.php.expect
diff --git a/hphp/test/tcr/array_escalation/279.php b/hphp/test/slow/array_escalation/279.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/279.php
rename to hphp/test/slow/array_escalation/279.php
diff --git a/hphp/test/tcr/array_escalation/279.php.expect b/hphp/test/slow/array_escalation/279.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/279.php.expect
rename to hphp/test/slow/array_escalation/279.php.expect
diff --git a/hphp/test/tcr/array_escalation/280.php b/hphp/test/slow/array_escalation/280.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/280.php
rename to hphp/test/slow/array_escalation/280.php
diff --git a/hphp/test/tcr/array_escalation/280.php.expect b/hphp/test/slow/array_escalation/280.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/280.php.expect
rename to hphp/test/slow/array_escalation/280.php.expect
diff --git a/hphp/test/tcr/array_escalation/281.php b/hphp/test/slow/array_escalation/281.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/281.php
rename to hphp/test/slow/array_escalation/281.php
diff --git a/hphp/test/tcr/array_escalation/281.php.expect b/hphp/test/slow/array_escalation/281.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/281.php.expect
rename to hphp/test/slow/array_escalation/281.php.expect
diff --git a/hphp/test/tcr/array_escalation/282.php b/hphp/test/slow/array_escalation/282.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/282.php
rename to hphp/test/slow/array_escalation/282.php
diff --git a/hphp/test/tcr/array_escalation/282.php.expect b/hphp/test/slow/array_escalation/282.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/282.php.expect
rename to hphp/test/slow/array_escalation/282.php.expect
diff --git a/hphp/test/tcr/array_escalation/283.php b/hphp/test/slow/array_escalation/283.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/283.php
rename to hphp/test/slow/array_escalation/283.php
diff --git a/hphp/test/tcr/array_escalation/283.php.expect b/hphp/test/slow/array_escalation/283.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/283.php.expect
rename to hphp/test/slow/array_escalation/283.php.expect
diff --git a/hphp/test/tcr/array_escalation/284.php b/hphp/test/slow/array_escalation/284.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/284.php
rename to hphp/test/slow/array_escalation/284.php
diff --git a/hphp/test/tcr/array_escalation/284.php.expect b/hphp/test/slow/array_escalation/284.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/284.php.expect
rename to hphp/test/slow/array_escalation/284.php.expect
diff --git a/hphp/test/tcr/array_escalation/285.php b/hphp/test/slow/array_escalation/285.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/285.php
rename to hphp/test/slow/array_escalation/285.php
diff --git a/hphp/test/tcr/array_escalation/285.php.expect b/hphp/test/slow/array_escalation/285.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/285.php.expect
rename to hphp/test/slow/array_escalation/285.php.expect
diff --git a/hphp/test/tcr/array_escalation/286.php b/hphp/test/slow/array_escalation/286.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/286.php
rename to hphp/test/slow/array_escalation/286.php
diff --git a/hphp/test/tcr/array_escalation/286.php.expect b/hphp/test/slow/array_escalation/286.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/286.php.expect
rename to hphp/test/slow/array_escalation/286.php.expect
diff --git a/hphp/test/tcr/array_escalation/287.php b/hphp/test/slow/array_escalation/287.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/287.php
rename to hphp/test/slow/array_escalation/287.php
diff --git a/hphp/test/tcr/array_escalation/287.php.expect b/hphp/test/slow/array_escalation/287.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/287.php.expect
rename to hphp/test/slow/array_escalation/287.php.expect
diff --git a/hphp/test/tcr/array_escalation/288.php b/hphp/test/slow/array_escalation/288.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/288.php
rename to hphp/test/slow/array_escalation/288.php
diff --git a/hphp/test/tcr/array_escalation/288.php.expect b/hphp/test/slow/array_escalation/288.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/288.php.expect
rename to hphp/test/slow/array_escalation/288.php.expect
diff --git a/hphp/test/tcr/array_escalation/289.php b/hphp/test/slow/array_escalation/289.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/289.php
rename to hphp/test/slow/array_escalation/289.php
diff --git a/hphp/test/tcr/array_escalation/289.php.expect b/hphp/test/slow/array_escalation/289.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/289.php.expect
rename to hphp/test/slow/array_escalation/289.php.expect
diff --git a/hphp/test/tcr/array_escalation/290.php b/hphp/test/slow/array_escalation/290.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/290.php
rename to hphp/test/slow/array_escalation/290.php
diff --git a/hphp/test/tcr/array_escalation/290.php.expect b/hphp/test/slow/array_escalation/290.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/290.php.expect
rename to hphp/test/slow/array_escalation/290.php.expect
diff --git a/hphp/test/tcr/array_escalation/291.php b/hphp/test/slow/array_escalation/291.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/291.php
rename to hphp/test/slow/array_escalation/291.php
diff --git a/hphp/test/tcr/array_escalation/291.php.expect b/hphp/test/slow/array_escalation/291.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/291.php.expect
rename to hphp/test/slow/array_escalation/291.php.expect
diff --git a/hphp/test/tcr/array_escalation/292.php b/hphp/test/slow/array_escalation/292.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/292.php
rename to hphp/test/slow/array_escalation/292.php
diff --git a/hphp/test/tcr/array_escalation/292.php.expect b/hphp/test/slow/array_escalation/292.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/292.php.expect
rename to hphp/test/slow/array_escalation/292.php.expect
diff --git a/hphp/test/tcr/array_escalation/293.php b/hphp/test/slow/array_escalation/293.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/293.php
rename to hphp/test/slow/array_escalation/293.php
diff --git a/hphp/test/tcr/array_escalation/293.php.expect b/hphp/test/slow/array_escalation/293.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/293.php.expect
rename to hphp/test/slow/array_escalation/293.php.expect
diff --git a/hphp/test/tcr/array_escalation/294.php b/hphp/test/slow/array_escalation/294.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/294.php
rename to hphp/test/slow/array_escalation/294.php
diff --git a/hphp/test/tcr/array_escalation/294.php.expect b/hphp/test/slow/array_escalation/294.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/294.php.expect
rename to hphp/test/slow/array_escalation/294.php.expect
diff --git a/hphp/test/tcr/array_escalation/295.php b/hphp/test/slow/array_escalation/295.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/295.php
rename to hphp/test/slow/array_escalation/295.php
diff --git a/hphp/test/tcr/array_escalation/295.php.expect b/hphp/test/slow/array_escalation/295.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/295.php.expect
rename to hphp/test/slow/array_escalation/295.php.expect
diff --git a/hphp/test/tcr/array_escalation/296.php b/hphp/test/slow/array_escalation/296.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/296.php
rename to hphp/test/slow/array_escalation/296.php
diff --git a/hphp/test/tcr/array_escalation/296.php.expect b/hphp/test/slow/array_escalation/296.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/296.php.expect
rename to hphp/test/slow/array_escalation/296.php.expect
diff --git a/hphp/test/tcr/array_escalation/297.php b/hphp/test/slow/array_escalation/297.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/297.php
rename to hphp/test/slow/array_escalation/297.php
diff --git a/hphp/test/tcr/array_escalation/297.php.expect b/hphp/test/slow/array_escalation/297.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/297.php.expect
rename to hphp/test/slow/array_escalation/297.php.expect
diff --git a/hphp/test/tcr/array_escalation/298.php b/hphp/test/slow/array_escalation/298.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/298.php
rename to hphp/test/slow/array_escalation/298.php
diff --git a/hphp/test/tcr/array_escalation/298.php.expect b/hphp/test/slow/array_escalation/298.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/298.php.expect
rename to hphp/test/slow/array_escalation/298.php.expect
diff --git a/hphp/test/tcr/array_escalation/299.php b/hphp/test/slow/array_escalation/299.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/299.php
rename to hphp/test/slow/array_escalation/299.php
diff --git a/hphp/test/tcr/array_escalation/299.php.expect b/hphp/test/slow/array_escalation/299.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/299.php.expect
rename to hphp/test/slow/array_escalation/299.php.expect
diff --git a/hphp/test/tcr/array_escalation/300.php b/hphp/test/slow/array_escalation/300.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/300.php
rename to hphp/test/slow/array_escalation/300.php
diff --git a/hphp/test/tcr/array_escalation/300.php.expect b/hphp/test/slow/array_escalation/300.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/300.php.expect
rename to hphp/test/slow/array_escalation/300.php.expect
diff --git a/hphp/test/tcr/array_escalation/301.php b/hphp/test/slow/array_escalation/301.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/301.php
rename to hphp/test/slow/array_escalation/301.php
diff --git a/hphp/test/tcr/array_escalation/301.php.expect b/hphp/test/slow/array_escalation/301.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/301.php.expect
rename to hphp/test/slow/array_escalation/301.php.expect
diff --git a/hphp/test/tcr/array_escalation/302.php b/hphp/test/slow/array_escalation/302.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/302.php
rename to hphp/test/slow/array_escalation/302.php
diff --git a/hphp/test/tcr/array_escalation/302.php.expect b/hphp/test/slow/array_escalation/302.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/302.php.expect
rename to hphp/test/slow/array_escalation/302.php.expect
diff --git a/hphp/test/tcr/array_escalation/303.php b/hphp/test/slow/array_escalation/303.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/303.php
rename to hphp/test/slow/array_escalation/303.php
diff --git a/hphp/test/tcr/array_escalation/303.php.expect b/hphp/test/slow/array_escalation/303.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/303.php.expect
rename to hphp/test/slow/array_escalation/303.php.expect
diff --git a/hphp/test/tcr/array_escalation/304.php b/hphp/test/slow/array_escalation/304.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/304.php
rename to hphp/test/slow/array_escalation/304.php
diff --git a/hphp/test/tcr/array_escalation/304.php.expect b/hphp/test/slow/array_escalation/304.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/304.php.expect
rename to hphp/test/slow/array_escalation/304.php.expect
diff --git a/hphp/test/tcr/array_escalation/305.php b/hphp/test/slow/array_escalation/305.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/305.php
rename to hphp/test/slow/array_escalation/305.php
diff --git a/hphp/test/tcr/array_escalation/305.php.expect b/hphp/test/slow/array_escalation/305.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/305.php.expect
rename to hphp/test/slow/array_escalation/305.php.expect
diff --git a/hphp/test/tcr/array_escalation/306.php b/hphp/test/slow/array_escalation/306.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/306.php
rename to hphp/test/slow/array_escalation/306.php
diff --git a/hphp/test/tcr/array_escalation/306.php.expect b/hphp/test/slow/array_escalation/306.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/306.php.expect
rename to hphp/test/slow/array_escalation/306.php.expect
diff --git a/hphp/test/tcr/array_escalation/307.php b/hphp/test/slow/array_escalation/307.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/307.php
rename to hphp/test/slow/array_escalation/307.php
diff --git a/hphp/test/tcr/array_escalation/307.php.expect b/hphp/test/slow/array_escalation/307.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/307.php.expect
rename to hphp/test/slow/array_escalation/307.php.expect
diff --git a/hphp/test/tcr/array_escalation/308.php b/hphp/test/slow/array_escalation/308.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/308.php
rename to hphp/test/slow/array_escalation/308.php
diff --git a/hphp/test/tcr/array_escalation/308.php.expect b/hphp/test/slow/array_escalation/308.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/308.php.expect
rename to hphp/test/slow/array_escalation/308.php.expect
diff --git a/hphp/test/tcr/array_escalation/309.php b/hphp/test/slow/array_escalation/309.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/309.php
rename to hphp/test/slow/array_escalation/309.php
diff --git a/hphp/test/tcr/array_escalation/309.php.expect b/hphp/test/slow/array_escalation/309.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/309.php.expect
rename to hphp/test/slow/array_escalation/309.php.expect
diff --git a/hphp/test/tcr/array_escalation/310.php b/hphp/test/slow/array_escalation/310.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/310.php
rename to hphp/test/slow/array_escalation/310.php
diff --git a/hphp/test/tcr/array_escalation/310.php.expect b/hphp/test/slow/array_escalation/310.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/310.php.expect
rename to hphp/test/slow/array_escalation/310.php.expect
diff --git a/hphp/test/tcr/array_escalation/311.php b/hphp/test/slow/array_escalation/311.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/311.php
rename to hphp/test/slow/array_escalation/311.php
diff --git a/hphp/test/tcr/array_escalation/311.php.expect b/hphp/test/slow/array_escalation/311.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/311.php.expect
rename to hphp/test/slow/array_escalation/311.php.expect
diff --git a/hphp/test/tcr/array_escalation/312.php b/hphp/test/slow/array_escalation/312.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/312.php
rename to hphp/test/slow/array_escalation/312.php
diff --git a/hphp/test/tcr/array_escalation/312.php.expect b/hphp/test/slow/array_escalation/312.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/312.php.expect
rename to hphp/test/slow/array_escalation/312.php.expect
diff --git a/hphp/test/tcr/array_escalation/313.php b/hphp/test/slow/array_escalation/313.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/313.php
rename to hphp/test/slow/array_escalation/313.php
diff --git a/hphp/test/tcr/array_escalation/313.php.expect b/hphp/test/slow/array_escalation/313.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/313.php.expect
rename to hphp/test/slow/array_escalation/313.php.expect
diff --git a/hphp/test/tcr/array_escalation/314.php b/hphp/test/slow/array_escalation/314.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/314.php
rename to hphp/test/slow/array_escalation/314.php
diff --git a/hphp/test/tcr/array_escalation/314.php.expect b/hphp/test/slow/array_escalation/314.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/314.php.expect
rename to hphp/test/slow/array_escalation/314.php.expect
diff --git a/hphp/test/tcr/array_escalation/315.php b/hphp/test/slow/array_escalation/315.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/315.php
rename to hphp/test/slow/array_escalation/315.php
diff --git a/hphp/test/tcr/array_escalation/315.php.expect b/hphp/test/slow/array_escalation/315.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/315.php.expect
rename to hphp/test/slow/array_escalation/315.php.expect
diff --git a/hphp/test/tcr/array_escalation/316.php b/hphp/test/slow/array_escalation/316.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/316.php
rename to hphp/test/slow/array_escalation/316.php
diff --git a/hphp/test/tcr/array_escalation/316.php.expect b/hphp/test/slow/array_escalation/316.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/316.php.expect
rename to hphp/test/slow/array_escalation/316.php.expect
diff --git a/hphp/test/tcr/array_escalation/317.php b/hphp/test/slow/array_escalation/317.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/317.php
rename to hphp/test/slow/array_escalation/317.php
diff --git a/hphp/test/tcr/array_escalation/317.php.expect b/hphp/test/slow/array_escalation/317.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/317.php.expect
rename to hphp/test/slow/array_escalation/317.php.expect
diff --git a/hphp/test/tcr/array_escalation/318.php b/hphp/test/slow/array_escalation/318.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/318.php
rename to hphp/test/slow/array_escalation/318.php
diff --git a/hphp/test/tcr/array_escalation/318.php.expect b/hphp/test/slow/array_escalation/318.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/318.php.expect
rename to hphp/test/slow/array_escalation/318.php.expect
diff --git a/hphp/test/tcr/array_escalation/319.php b/hphp/test/slow/array_escalation/319.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/319.php
rename to hphp/test/slow/array_escalation/319.php
diff --git a/hphp/test/tcr/array_escalation/319.php.expect b/hphp/test/slow/array_escalation/319.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/319.php.expect
rename to hphp/test/slow/array_escalation/319.php.expect
diff --git a/hphp/test/tcr/array_escalation/320.php b/hphp/test/slow/array_escalation/320.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/320.php
rename to hphp/test/slow/array_escalation/320.php
diff --git a/hphp/test/tcr/array_escalation/320.php.expect b/hphp/test/slow/array_escalation/320.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/320.php.expect
rename to hphp/test/slow/array_escalation/320.php.expect
diff --git a/hphp/test/tcr/array_escalation/321.php b/hphp/test/slow/array_escalation/321.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/321.php
rename to hphp/test/slow/array_escalation/321.php
diff --git a/hphp/test/tcr/array_escalation/321.php.expect b/hphp/test/slow/array_escalation/321.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/321.php.expect
rename to hphp/test/slow/array_escalation/321.php.expect
diff --git a/hphp/test/tcr/array_escalation/322.php b/hphp/test/slow/array_escalation/322.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/322.php
rename to hphp/test/slow/array_escalation/322.php
diff --git a/hphp/test/tcr/array_escalation/322.php.expect b/hphp/test/slow/array_escalation/322.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/322.php.expect
rename to hphp/test/slow/array_escalation/322.php.expect
diff --git a/hphp/test/tcr/array_escalation/323.php b/hphp/test/slow/array_escalation/323.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/323.php
rename to hphp/test/slow/array_escalation/323.php
diff --git a/hphp/test/tcr/array_escalation/323.php.expect b/hphp/test/slow/array_escalation/323.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/323.php.expect
rename to hphp/test/slow/array_escalation/323.php.expect
diff --git a/hphp/test/tcr/array_escalation/324.php b/hphp/test/slow/array_escalation/324.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/324.php
rename to hphp/test/slow/array_escalation/324.php
diff --git a/hphp/test/tcr/array_escalation/324.php.expect b/hphp/test/slow/array_escalation/324.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/324.php.expect
rename to hphp/test/slow/array_escalation/324.php.expect
diff --git a/hphp/test/tcr/array_escalation/325.php b/hphp/test/slow/array_escalation/325.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/325.php
rename to hphp/test/slow/array_escalation/325.php
diff --git a/hphp/test/tcr/array_escalation/325.php.expect b/hphp/test/slow/array_escalation/325.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/325.php.expect
rename to hphp/test/slow/array_escalation/325.php.expect
diff --git a/hphp/test/tcr/array_escalation/326.php b/hphp/test/slow/array_escalation/326.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/326.php
rename to hphp/test/slow/array_escalation/326.php
diff --git a/hphp/test/tcr/array_escalation/326.php.expect b/hphp/test/slow/array_escalation/326.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/326.php.expect
rename to hphp/test/slow/array_escalation/326.php.expect
diff --git a/hphp/test/tcr/array_escalation/327.php b/hphp/test/slow/array_escalation/327.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/327.php
rename to hphp/test/slow/array_escalation/327.php
diff --git a/hphp/test/tcr/array_escalation/327.php.expect b/hphp/test/slow/array_escalation/327.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/327.php.expect
rename to hphp/test/slow/array_escalation/327.php.expect
diff --git a/hphp/test/tcr/array_escalation/328.php b/hphp/test/slow/array_escalation/328.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/328.php
rename to hphp/test/slow/array_escalation/328.php
diff --git a/hphp/test/tcr/array_escalation/328.php.expect b/hphp/test/slow/array_escalation/328.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/328.php.expect
rename to hphp/test/slow/array_escalation/328.php.expect
diff --git a/hphp/test/tcr/array_escalation/329.php b/hphp/test/slow/array_escalation/329.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/329.php
rename to hphp/test/slow/array_escalation/329.php
diff --git a/hphp/test/tcr/array_escalation/329.php.expect b/hphp/test/slow/array_escalation/329.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/329.php.expect
rename to hphp/test/slow/array_escalation/329.php.expect
diff --git a/hphp/test/tcr/array_escalation/330.php b/hphp/test/slow/array_escalation/330.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/330.php
rename to hphp/test/slow/array_escalation/330.php
diff --git a/hphp/test/tcr/array_escalation/330.php.expect b/hphp/test/slow/array_escalation/330.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/330.php.expect
rename to hphp/test/slow/array_escalation/330.php.expect
diff --git a/hphp/test/tcr/array_escalation/331.php b/hphp/test/slow/array_escalation/331.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/331.php
rename to hphp/test/slow/array_escalation/331.php
diff --git a/hphp/test/tcr/array_escalation/331.php.expect b/hphp/test/slow/array_escalation/331.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/331.php.expect
rename to hphp/test/slow/array_escalation/331.php.expect
diff --git a/hphp/test/tcr/array_escalation/332.php b/hphp/test/slow/array_escalation/332.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/332.php
rename to hphp/test/slow/array_escalation/332.php
diff --git a/hphp/test/tcr/array_escalation/332.php.expect b/hphp/test/slow/array_escalation/332.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/332.php.expect
rename to hphp/test/slow/array_escalation/332.php.expect
diff --git a/hphp/test/tcr/array_escalation/333.php b/hphp/test/slow/array_escalation/333.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/333.php
rename to hphp/test/slow/array_escalation/333.php
diff --git a/hphp/test/tcr/array_escalation/333.php.expect b/hphp/test/slow/array_escalation/333.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/333.php.expect
rename to hphp/test/slow/array_escalation/333.php.expect
diff --git a/hphp/test/tcr/array_escalation/334.php b/hphp/test/slow/array_escalation/334.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/334.php
rename to hphp/test/slow/array_escalation/334.php
diff --git a/hphp/test/tcr/array_escalation/334.php.expect b/hphp/test/slow/array_escalation/334.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/334.php.expect
rename to hphp/test/slow/array_escalation/334.php.expect
diff --git a/hphp/test/tcr/array_escalation/335.php b/hphp/test/slow/array_escalation/335.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/335.php
rename to hphp/test/slow/array_escalation/335.php
diff --git a/hphp/test/tcr/array_escalation/335.php.expect b/hphp/test/slow/array_escalation/335.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/335.php.expect
rename to hphp/test/slow/array_escalation/335.php.expect
diff --git a/hphp/test/tcr/array_escalation/336.php b/hphp/test/slow/array_escalation/336.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/336.php
rename to hphp/test/slow/array_escalation/336.php
diff --git a/hphp/test/tcr/array_escalation/336.php.expect b/hphp/test/slow/array_escalation/336.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/336.php.expect
rename to hphp/test/slow/array_escalation/336.php.expect
diff --git a/hphp/test/tcr/array_escalation/337.php b/hphp/test/slow/array_escalation/337.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/337.php
rename to hphp/test/slow/array_escalation/337.php
diff --git a/hphp/test/tcr/array_escalation/337.php.expect b/hphp/test/slow/array_escalation/337.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/337.php.expect
rename to hphp/test/slow/array_escalation/337.php.expect
diff --git a/hphp/test/tcr/array_escalation/338.php b/hphp/test/slow/array_escalation/338.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/338.php
rename to hphp/test/slow/array_escalation/338.php
diff --git a/hphp/test/tcr/array_escalation/338.php.expect b/hphp/test/slow/array_escalation/338.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/338.php.expect
rename to hphp/test/slow/array_escalation/338.php.expect
diff --git a/hphp/test/tcr/array_escalation/339.php b/hphp/test/slow/array_escalation/339.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/339.php
rename to hphp/test/slow/array_escalation/339.php
diff --git a/hphp/test/tcr/array_escalation/339.php.expect b/hphp/test/slow/array_escalation/339.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/339.php.expect
rename to hphp/test/slow/array_escalation/339.php.expect
diff --git a/hphp/test/tcr/array_escalation/340.php b/hphp/test/slow/array_escalation/340.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/340.php
rename to hphp/test/slow/array_escalation/340.php
diff --git a/hphp/test/tcr/array_escalation/340.php.expect b/hphp/test/slow/array_escalation/340.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/340.php.expect
rename to hphp/test/slow/array_escalation/340.php.expect
diff --git a/hphp/test/tcr/array_escalation/341.php b/hphp/test/slow/array_escalation/341.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/341.php
rename to hphp/test/slow/array_escalation/341.php
diff --git a/hphp/test/tcr/array_escalation/341.php.expect b/hphp/test/slow/array_escalation/341.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/341.php.expect
rename to hphp/test/slow/array_escalation/341.php.expect
diff --git a/hphp/test/tcr/array_escalation/342.php b/hphp/test/slow/array_escalation/342.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/342.php
rename to hphp/test/slow/array_escalation/342.php
diff --git a/hphp/test/tcr/array_escalation/342.php.expect b/hphp/test/slow/array_escalation/342.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/342.php.expect
rename to hphp/test/slow/array_escalation/342.php.expect
diff --git a/hphp/test/tcr/array_escalation/343.php b/hphp/test/slow/array_escalation/343.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/343.php
rename to hphp/test/slow/array_escalation/343.php
diff --git a/hphp/test/tcr/array_escalation/343.php.expect b/hphp/test/slow/array_escalation/343.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/343.php.expect
rename to hphp/test/slow/array_escalation/343.php.expect
diff --git a/hphp/test/tcr/array_escalation/344.php b/hphp/test/slow/array_escalation/344.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/344.php
rename to hphp/test/slow/array_escalation/344.php
diff --git a/hphp/test/tcr/array_escalation/344.php.expect b/hphp/test/slow/array_escalation/344.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/344.php.expect
rename to hphp/test/slow/array_escalation/344.php.expect
diff --git a/hphp/test/tcr/array_escalation/345.php b/hphp/test/slow/array_escalation/345.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/345.php
rename to hphp/test/slow/array_escalation/345.php
diff --git a/hphp/test/tcr/array_escalation/345.php.expect b/hphp/test/slow/array_escalation/345.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/345.php.expect
rename to hphp/test/slow/array_escalation/345.php.expect
diff --git a/hphp/test/tcr/array_escalation/346.php b/hphp/test/slow/array_escalation/346.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/346.php
rename to hphp/test/slow/array_escalation/346.php
diff --git a/hphp/test/tcr/array_escalation/346.php.expect b/hphp/test/slow/array_escalation/346.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/346.php.expect
rename to hphp/test/slow/array_escalation/346.php.expect
diff --git a/hphp/test/tcr/array_escalation/347.php b/hphp/test/slow/array_escalation/347.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/347.php
rename to hphp/test/slow/array_escalation/347.php
diff --git a/hphp/test/tcr/array_escalation/347.php.expect b/hphp/test/slow/array_escalation/347.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/347.php.expect
rename to hphp/test/slow/array_escalation/347.php.expect
diff --git a/hphp/test/tcr/array_escalation/348.php b/hphp/test/slow/array_escalation/348.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/348.php
rename to hphp/test/slow/array_escalation/348.php
diff --git a/hphp/test/tcr/array_escalation/348.php.expect b/hphp/test/slow/array_escalation/348.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/348.php.expect
rename to hphp/test/slow/array_escalation/348.php.expect
diff --git a/hphp/test/tcr/array_escalation/349.php b/hphp/test/slow/array_escalation/349.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/349.php
rename to hphp/test/slow/array_escalation/349.php
diff --git a/hphp/test/tcr/array_escalation/349.php.expect b/hphp/test/slow/array_escalation/349.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/349.php.expect
rename to hphp/test/slow/array_escalation/349.php.expect
diff --git a/hphp/test/tcr/array_escalation/350.php b/hphp/test/slow/array_escalation/350.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/350.php
rename to hphp/test/slow/array_escalation/350.php
diff --git a/hphp/test/tcr/array_escalation/350.php.expect b/hphp/test/slow/array_escalation/350.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/350.php.expect
rename to hphp/test/slow/array_escalation/350.php.expect
diff --git a/hphp/test/tcr/array_escalation/351.php b/hphp/test/slow/array_escalation/351.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/351.php
rename to hphp/test/slow/array_escalation/351.php
diff --git a/hphp/test/tcr/array_escalation/351.php.expect b/hphp/test/slow/array_escalation/351.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/351.php.expect
rename to hphp/test/slow/array_escalation/351.php.expect
diff --git a/hphp/test/tcr/array_escalation/352.php b/hphp/test/slow/array_escalation/352.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/352.php
rename to hphp/test/slow/array_escalation/352.php
diff --git a/hphp/test/tcr/array_escalation/352.php.expect b/hphp/test/slow/array_escalation/352.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/352.php.expect
rename to hphp/test/slow/array_escalation/352.php.expect
diff --git a/hphp/test/tcr/array_escalation/353.php b/hphp/test/slow/array_escalation/353.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/353.php
rename to hphp/test/slow/array_escalation/353.php
diff --git a/hphp/test/tcr/array_escalation/353.php.expect b/hphp/test/slow/array_escalation/353.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/353.php.expect
rename to hphp/test/slow/array_escalation/353.php.expect
diff --git a/hphp/test/tcr/array_escalation/354.php b/hphp/test/slow/array_escalation/354.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/354.php
rename to hphp/test/slow/array_escalation/354.php
diff --git a/hphp/test/tcr/array_escalation/354.php.expect b/hphp/test/slow/array_escalation/354.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/354.php.expect
rename to hphp/test/slow/array_escalation/354.php.expect
diff --git a/hphp/test/tcr/array_escalation/355.php b/hphp/test/slow/array_escalation/355.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/355.php
rename to hphp/test/slow/array_escalation/355.php
diff --git a/hphp/test/tcr/array_escalation/355.php.expect b/hphp/test/slow/array_escalation/355.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/355.php.expect
rename to hphp/test/slow/array_escalation/355.php.expect
diff --git a/hphp/test/tcr/array_escalation/356.php b/hphp/test/slow/array_escalation/356.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/356.php
rename to hphp/test/slow/array_escalation/356.php
diff --git a/hphp/test/tcr/array_escalation/356.php.expect b/hphp/test/slow/array_escalation/356.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/356.php.expect
rename to hphp/test/slow/array_escalation/356.php.expect
diff --git a/hphp/test/tcr/array_escalation/357.php b/hphp/test/slow/array_escalation/357.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/357.php
rename to hphp/test/slow/array_escalation/357.php
diff --git a/hphp/test/tcr/array_escalation/357.php.expect b/hphp/test/slow/array_escalation/357.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/357.php.expect
rename to hphp/test/slow/array_escalation/357.php.expect
diff --git a/hphp/test/tcr/array_escalation/358.php b/hphp/test/slow/array_escalation/358.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/358.php
rename to hphp/test/slow/array_escalation/358.php
diff --git a/hphp/test/tcr/array_escalation/358.php.expect b/hphp/test/slow/array_escalation/358.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/358.php.expect
rename to hphp/test/slow/array_escalation/358.php.expect
diff --git a/hphp/test/tcr/array_escalation/359.php b/hphp/test/slow/array_escalation/359.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/359.php
rename to hphp/test/slow/array_escalation/359.php
diff --git a/hphp/test/tcr/array_escalation/359.php.expect b/hphp/test/slow/array_escalation/359.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/359.php.expect
rename to hphp/test/slow/array_escalation/359.php.expect
diff --git a/hphp/test/tcr/array_escalation/360.php b/hphp/test/slow/array_escalation/360.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/360.php
rename to hphp/test/slow/array_escalation/360.php
diff --git a/hphp/test/tcr/array_escalation/360.php.expect b/hphp/test/slow/array_escalation/360.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/360.php.expect
rename to hphp/test/slow/array_escalation/360.php.expect
diff --git a/hphp/test/tcr/array_escalation/361.php b/hphp/test/slow/array_escalation/361.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/361.php
rename to hphp/test/slow/array_escalation/361.php
diff --git a/hphp/test/tcr/array_escalation/361.php.expect b/hphp/test/slow/array_escalation/361.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/361.php.expect
rename to hphp/test/slow/array_escalation/361.php.expect
diff --git a/hphp/test/tcr/array_escalation/362.php b/hphp/test/slow/array_escalation/362.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/362.php
rename to hphp/test/slow/array_escalation/362.php
diff --git a/hphp/test/tcr/array_escalation/362.php.expect b/hphp/test/slow/array_escalation/362.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/362.php.expect
rename to hphp/test/slow/array_escalation/362.php.expect
diff --git a/hphp/test/tcr/array_escalation/363.php b/hphp/test/slow/array_escalation/363.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/363.php
rename to hphp/test/slow/array_escalation/363.php
diff --git a/hphp/test/tcr/array_escalation/363.php.expect b/hphp/test/slow/array_escalation/363.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/363.php.expect
rename to hphp/test/slow/array_escalation/363.php.expect
diff --git a/hphp/test/tcr/array_escalation/364.php b/hphp/test/slow/array_escalation/364.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/364.php
rename to hphp/test/slow/array_escalation/364.php
diff --git a/hphp/test/tcr/array_escalation/364.php.expect b/hphp/test/slow/array_escalation/364.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/364.php.expect
rename to hphp/test/slow/array_escalation/364.php.expect
diff --git a/hphp/test/tcr/array_escalation/365.php b/hphp/test/slow/array_escalation/365.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/365.php
rename to hphp/test/slow/array_escalation/365.php
diff --git a/hphp/test/tcr/array_escalation/365.php.expect b/hphp/test/slow/array_escalation/365.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/365.php.expect
rename to hphp/test/slow/array_escalation/365.php.expect
diff --git a/hphp/test/tcr/array_escalation/366.php b/hphp/test/slow/array_escalation/366.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/366.php
rename to hphp/test/slow/array_escalation/366.php
diff --git a/hphp/test/tcr/array_escalation/366.php.expect b/hphp/test/slow/array_escalation/366.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/366.php.expect
rename to hphp/test/slow/array_escalation/366.php.expect
diff --git a/hphp/test/tcr/array_escalation/367.php b/hphp/test/slow/array_escalation/367.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/367.php
rename to hphp/test/slow/array_escalation/367.php
diff --git a/hphp/test/tcr/array_escalation/367.php.expect b/hphp/test/slow/array_escalation/367.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/367.php.expect
rename to hphp/test/slow/array_escalation/367.php.expect
diff --git a/hphp/test/tcr/array_escalation/368.php b/hphp/test/slow/array_escalation/368.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/368.php
rename to hphp/test/slow/array_escalation/368.php
diff --git a/hphp/test/tcr/array_escalation/368.php.expect b/hphp/test/slow/array_escalation/368.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/368.php.expect
rename to hphp/test/slow/array_escalation/368.php.expect
diff --git a/hphp/test/tcr/array_escalation/369.php b/hphp/test/slow/array_escalation/369.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/369.php
rename to hphp/test/slow/array_escalation/369.php
diff --git a/hphp/test/tcr/array_escalation/369.php.expect b/hphp/test/slow/array_escalation/369.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/369.php.expect
rename to hphp/test/slow/array_escalation/369.php.expect
diff --git a/hphp/test/tcr/array_escalation/370.php b/hphp/test/slow/array_escalation/370.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/370.php
rename to hphp/test/slow/array_escalation/370.php
diff --git a/hphp/test/tcr/array_escalation/370.php.expect b/hphp/test/slow/array_escalation/370.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/370.php.expect
rename to hphp/test/slow/array_escalation/370.php.expect
diff --git a/hphp/test/tcr/array_escalation/371.php b/hphp/test/slow/array_escalation/371.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/371.php
rename to hphp/test/slow/array_escalation/371.php
diff --git a/hphp/test/tcr/array_escalation/371.php.expect b/hphp/test/slow/array_escalation/371.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/371.php.expect
rename to hphp/test/slow/array_escalation/371.php.expect
diff --git a/hphp/test/tcr/array_escalation/372.php b/hphp/test/slow/array_escalation/372.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/372.php
rename to hphp/test/slow/array_escalation/372.php
diff --git a/hphp/test/tcr/array_escalation/372.php.expect b/hphp/test/slow/array_escalation/372.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/372.php.expect
rename to hphp/test/slow/array_escalation/372.php.expect
diff --git a/hphp/test/tcr/array_escalation/373.php b/hphp/test/slow/array_escalation/373.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/373.php
rename to hphp/test/slow/array_escalation/373.php
diff --git a/hphp/test/tcr/array_escalation/373.php.expect b/hphp/test/slow/array_escalation/373.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/373.php.expect
rename to hphp/test/slow/array_escalation/373.php.expect
diff --git a/hphp/test/tcr/array_escalation/374.php b/hphp/test/slow/array_escalation/374.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/374.php
rename to hphp/test/slow/array_escalation/374.php
diff --git a/hphp/test/tcr/array_escalation/374.php.expect b/hphp/test/slow/array_escalation/374.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/374.php.expect
rename to hphp/test/slow/array_escalation/374.php.expect
diff --git a/hphp/test/tcr/array_escalation/375.php b/hphp/test/slow/array_escalation/375.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/375.php
rename to hphp/test/slow/array_escalation/375.php
diff --git a/hphp/test/tcr/array_escalation/375.php.expect b/hphp/test/slow/array_escalation/375.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/375.php.expect
rename to hphp/test/slow/array_escalation/375.php.expect
diff --git a/hphp/test/tcr/array_escalation/376.php b/hphp/test/slow/array_escalation/376.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/376.php
rename to hphp/test/slow/array_escalation/376.php
diff --git a/hphp/test/tcr/array_escalation/376.php.expect b/hphp/test/slow/array_escalation/376.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/376.php.expect
rename to hphp/test/slow/array_escalation/376.php.expect
diff --git a/hphp/test/tcr/array_escalation/377.php b/hphp/test/slow/array_escalation/377.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/377.php
rename to hphp/test/slow/array_escalation/377.php
diff --git a/hphp/test/tcr/array_escalation/377.php.expect b/hphp/test/slow/array_escalation/377.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/377.php.expect
rename to hphp/test/slow/array_escalation/377.php.expect
diff --git a/hphp/test/tcr/array_escalation/378.php b/hphp/test/slow/array_escalation/378.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/378.php
rename to hphp/test/slow/array_escalation/378.php
diff --git a/hphp/test/tcr/array_escalation/378.php.expect b/hphp/test/slow/array_escalation/378.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/378.php.expect
rename to hphp/test/slow/array_escalation/378.php.expect
diff --git a/hphp/test/tcr/array_escalation/379.php b/hphp/test/slow/array_escalation/379.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/379.php
rename to hphp/test/slow/array_escalation/379.php
diff --git a/hphp/test/tcr/array_escalation/379.php.expect b/hphp/test/slow/array_escalation/379.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/379.php.expect
rename to hphp/test/slow/array_escalation/379.php.expect
diff --git a/hphp/test/tcr/array_escalation/380.php b/hphp/test/slow/array_escalation/380.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/380.php
rename to hphp/test/slow/array_escalation/380.php
diff --git a/hphp/test/tcr/array_escalation/380.php.expect b/hphp/test/slow/array_escalation/380.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/380.php.expect
rename to hphp/test/slow/array_escalation/380.php.expect
diff --git a/hphp/test/tcr/array_escalation/381.php b/hphp/test/slow/array_escalation/381.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/381.php
rename to hphp/test/slow/array_escalation/381.php
diff --git a/hphp/test/tcr/array_escalation/381.php.expect b/hphp/test/slow/array_escalation/381.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/381.php.expect
rename to hphp/test/slow/array_escalation/381.php.expect
diff --git a/hphp/test/tcr/array_escalation/382.php b/hphp/test/slow/array_escalation/382.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/382.php
rename to hphp/test/slow/array_escalation/382.php
diff --git a/hphp/test/tcr/array_escalation/382.php.expect b/hphp/test/slow/array_escalation/382.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/382.php.expect
rename to hphp/test/slow/array_escalation/382.php.expect
diff --git a/hphp/test/tcr/array_escalation/383.php b/hphp/test/slow/array_escalation/383.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/383.php
rename to hphp/test/slow/array_escalation/383.php
diff --git a/hphp/test/tcr/array_escalation/383.php.expect b/hphp/test/slow/array_escalation/383.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/383.php.expect
rename to hphp/test/slow/array_escalation/383.php.expect
diff --git a/hphp/test/tcr/array_escalation/384.php b/hphp/test/slow/array_escalation/384.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/384.php
rename to hphp/test/slow/array_escalation/384.php
diff --git a/hphp/test/tcr/array_escalation/384.php.expect b/hphp/test/slow/array_escalation/384.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/384.php.expect
rename to hphp/test/slow/array_escalation/384.php.expect
diff --git a/hphp/test/tcr/array_escalation/385.php b/hphp/test/slow/array_escalation/385.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/385.php
rename to hphp/test/slow/array_escalation/385.php
diff --git a/hphp/test/tcr/array_escalation/385.php.expect b/hphp/test/slow/array_escalation/385.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/385.php.expect
rename to hphp/test/slow/array_escalation/385.php.expect
diff --git a/hphp/test/tcr/array_escalation/386.php b/hphp/test/slow/array_escalation/386.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/386.php
rename to hphp/test/slow/array_escalation/386.php
diff --git a/hphp/test/tcr/array_escalation/386.php.expect b/hphp/test/slow/array_escalation/386.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/386.php.expect
rename to hphp/test/slow/array_escalation/386.php.expect
diff --git a/hphp/test/tcr/array_escalation/387.php b/hphp/test/slow/array_escalation/387.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/387.php
rename to hphp/test/slow/array_escalation/387.php
diff --git a/hphp/test/tcr/array_escalation/387.php.expect b/hphp/test/slow/array_escalation/387.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/387.php.expect
rename to hphp/test/slow/array_escalation/387.php.expect
diff --git a/hphp/test/tcr/array_escalation/388.php b/hphp/test/slow/array_escalation/388.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/388.php
rename to hphp/test/slow/array_escalation/388.php
diff --git a/hphp/test/tcr/array_escalation/388.php.expect b/hphp/test/slow/array_escalation/388.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/388.php.expect
rename to hphp/test/slow/array_escalation/388.php.expect
diff --git a/hphp/test/tcr/array_escalation/389.php b/hphp/test/slow/array_escalation/389.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/389.php
rename to hphp/test/slow/array_escalation/389.php
diff --git a/hphp/test/tcr/array_escalation/389.php.expect b/hphp/test/slow/array_escalation/389.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/389.php.expect
rename to hphp/test/slow/array_escalation/389.php.expect
diff --git a/hphp/test/tcr/array_escalation/390.php b/hphp/test/slow/array_escalation/390.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/390.php
rename to hphp/test/slow/array_escalation/390.php
diff --git a/hphp/test/tcr/array_escalation/390.php.expect b/hphp/test/slow/array_escalation/390.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/390.php.expect
rename to hphp/test/slow/array_escalation/390.php.expect
diff --git a/hphp/test/tcr/array_escalation/391.php b/hphp/test/slow/array_escalation/391.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/391.php
rename to hphp/test/slow/array_escalation/391.php
diff --git a/hphp/test/tcr/array_escalation/391.php.expect b/hphp/test/slow/array_escalation/391.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/391.php.expect
rename to hphp/test/slow/array_escalation/391.php.expect
diff --git a/hphp/test/tcr/array_escalation/392.php b/hphp/test/slow/array_escalation/392.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/392.php
rename to hphp/test/slow/array_escalation/392.php
diff --git a/hphp/test/tcr/array_escalation/392.php.expect b/hphp/test/slow/array_escalation/392.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/392.php.expect
rename to hphp/test/slow/array_escalation/392.php.expect
diff --git a/hphp/test/tcr/array_escalation/393.php b/hphp/test/slow/array_escalation/393.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/393.php
rename to hphp/test/slow/array_escalation/393.php
diff --git a/hphp/test/tcr/array_escalation/393.php.expect b/hphp/test/slow/array_escalation/393.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/393.php.expect
rename to hphp/test/slow/array_escalation/393.php.expect
diff --git a/hphp/test/tcr/array_escalation/394.php b/hphp/test/slow/array_escalation/394.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/394.php
rename to hphp/test/slow/array_escalation/394.php
diff --git a/hphp/test/tcr/array_escalation/394.php.expect b/hphp/test/slow/array_escalation/394.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/394.php.expect
rename to hphp/test/slow/array_escalation/394.php.expect
diff --git a/hphp/test/tcr/array_escalation/395.php b/hphp/test/slow/array_escalation/395.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/395.php
rename to hphp/test/slow/array_escalation/395.php
diff --git a/hphp/test/tcr/array_escalation/395.php.expect b/hphp/test/slow/array_escalation/395.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/395.php.expect
rename to hphp/test/slow/array_escalation/395.php.expect
diff --git a/hphp/test/tcr/array_escalation/396.php b/hphp/test/slow/array_escalation/396.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/396.php
rename to hphp/test/slow/array_escalation/396.php
diff --git a/hphp/test/tcr/array_escalation/396.php.expect b/hphp/test/slow/array_escalation/396.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/396.php.expect
rename to hphp/test/slow/array_escalation/396.php.expect
diff --git a/hphp/test/tcr/array_escalation/397.php b/hphp/test/slow/array_escalation/397.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/397.php
rename to hphp/test/slow/array_escalation/397.php
diff --git a/hphp/test/tcr/array_escalation/397.php.expect b/hphp/test/slow/array_escalation/397.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/397.php.expect
rename to hphp/test/slow/array_escalation/397.php.expect
diff --git a/hphp/test/tcr/array_escalation/398.php b/hphp/test/slow/array_escalation/398.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/398.php
rename to hphp/test/slow/array_escalation/398.php
diff --git a/hphp/test/tcr/array_escalation/398.php.expect b/hphp/test/slow/array_escalation/398.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/398.php.expect
rename to hphp/test/slow/array_escalation/398.php.expect
diff --git a/hphp/test/tcr/array_escalation/399.php b/hphp/test/slow/array_escalation/399.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/399.php
rename to hphp/test/slow/array_escalation/399.php
diff --git a/hphp/test/tcr/array_escalation/399.php.expect b/hphp/test/slow/array_escalation/399.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/399.php.expect
rename to hphp/test/slow/array_escalation/399.php.expect
diff --git a/hphp/test/tcr/array_escalation/400.php b/hphp/test/slow/array_escalation/400.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/400.php
rename to hphp/test/slow/array_escalation/400.php
diff --git a/hphp/test/tcr/array_escalation/400.php.expect b/hphp/test/slow/array_escalation/400.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/400.php.expect
rename to hphp/test/slow/array_escalation/400.php.expect
diff --git a/hphp/test/tcr/array_escalation/401.php b/hphp/test/slow/array_escalation/401.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/401.php
rename to hphp/test/slow/array_escalation/401.php
diff --git a/hphp/test/tcr/array_escalation/401.php.expect b/hphp/test/slow/array_escalation/401.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/401.php.expect
rename to hphp/test/slow/array_escalation/401.php.expect
diff --git a/hphp/test/tcr/array_escalation/402.php b/hphp/test/slow/array_escalation/402.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/402.php
rename to hphp/test/slow/array_escalation/402.php
diff --git a/hphp/test/tcr/array_escalation/402.php.expect b/hphp/test/slow/array_escalation/402.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/402.php.expect
rename to hphp/test/slow/array_escalation/402.php.expect
diff --git a/hphp/test/tcr/array_escalation/403.php b/hphp/test/slow/array_escalation/403.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/403.php
rename to hphp/test/slow/array_escalation/403.php
diff --git a/hphp/test/tcr/array_escalation/403.php.expect b/hphp/test/slow/array_escalation/403.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/403.php.expect
rename to hphp/test/slow/array_escalation/403.php.expect
diff --git a/hphp/test/tcr/array_escalation/404.php b/hphp/test/slow/array_escalation/404.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/404.php
rename to hphp/test/slow/array_escalation/404.php
diff --git a/hphp/test/tcr/array_escalation/404.php.expect b/hphp/test/slow/array_escalation/404.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/404.php.expect
rename to hphp/test/slow/array_escalation/404.php.expect
diff --git a/hphp/test/tcr/array_escalation/405.php b/hphp/test/slow/array_escalation/405.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/405.php
rename to hphp/test/slow/array_escalation/405.php
diff --git a/hphp/test/tcr/array_escalation/405.php.expect b/hphp/test/slow/array_escalation/405.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/405.php.expect
rename to hphp/test/slow/array_escalation/405.php.expect
diff --git a/hphp/test/tcr/array_escalation/406.php b/hphp/test/slow/array_escalation/406.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/406.php
rename to hphp/test/slow/array_escalation/406.php
diff --git a/hphp/test/tcr/array_escalation/406.php.expect b/hphp/test/slow/array_escalation/406.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/406.php.expect
rename to hphp/test/slow/array_escalation/406.php.expect
diff --git a/hphp/test/tcr/array_escalation/407.php b/hphp/test/slow/array_escalation/407.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/407.php
rename to hphp/test/slow/array_escalation/407.php
diff --git a/hphp/test/tcr/array_escalation/407.php.expect b/hphp/test/slow/array_escalation/407.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/407.php.expect
rename to hphp/test/slow/array_escalation/407.php.expect
diff --git a/hphp/test/tcr/array_escalation/408.php b/hphp/test/slow/array_escalation/408.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/408.php
rename to hphp/test/slow/array_escalation/408.php
diff --git a/hphp/test/tcr/array_escalation/408.php.expect b/hphp/test/slow/array_escalation/408.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/408.php.expect
rename to hphp/test/slow/array_escalation/408.php.expect
diff --git a/hphp/test/tcr/array_escalation/409.php b/hphp/test/slow/array_escalation/409.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/409.php
rename to hphp/test/slow/array_escalation/409.php
diff --git a/hphp/test/tcr/array_escalation/409.php.expect b/hphp/test/slow/array_escalation/409.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/409.php.expect
rename to hphp/test/slow/array_escalation/409.php.expect
diff --git a/hphp/test/tcr/array_escalation/410.php b/hphp/test/slow/array_escalation/410.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/410.php
rename to hphp/test/slow/array_escalation/410.php
diff --git a/hphp/test/tcr/array_escalation/410.php.expect b/hphp/test/slow/array_escalation/410.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/410.php.expect
rename to hphp/test/slow/array_escalation/410.php.expect
diff --git a/hphp/test/tcr/array_escalation/411.php b/hphp/test/slow/array_escalation/411.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/411.php
rename to hphp/test/slow/array_escalation/411.php
diff --git a/hphp/test/tcr/array_escalation/411.php.expect b/hphp/test/slow/array_escalation/411.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/411.php.expect
rename to hphp/test/slow/array_escalation/411.php.expect
diff --git a/hphp/test/tcr/array_escalation/412.php b/hphp/test/slow/array_escalation/412.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/412.php
rename to hphp/test/slow/array_escalation/412.php
diff --git a/hphp/test/tcr/array_escalation/412.php.expect b/hphp/test/slow/array_escalation/412.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/412.php.expect
rename to hphp/test/slow/array_escalation/412.php.expect
diff --git a/hphp/test/tcr/array_escalation/413.php b/hphp/test/slow/array_escalation/413.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/413.php
rename to hphp/test/slow/array_escalation/413.php
diff --git a/hphp/test/tcr/array_escalation/413.php.expect b/hphp/test/slow/array_escalation/413.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/413.php.expect
rename to hphp/test/slow/array_escalation/413.php.expect
diff --git a/hphp/test/tcr/array_escalation/414.php b/hphp/test/slow/array_escalation/414.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/414.php
rename to hphp/test/slow/array_escalation/414.php
diff --git a/hphp/test/tcr/array_escalation/414.php.expect b/hphp/test/slow/array_escalation/414.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/414.php.expect
rename to hphp/test/slow/array_escalation/414.php.expect
diff --git a/hphp/test/tcr/array_escalation/415.php b/hphp/test/slow/array_escalation/415.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/415.php
rename to hphp/test/slow/array_escalation/415.php
diff --git a/hphp/test/tcr/array_escalation/415.php.expect b/hphp/test/slow/array_escalation/415.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/415.php.expect
rename to hphp/test/slow/array_escalation/415.php.expect
diff --git a/hphp/test/tcr/array_escalation/416.php b/hphp/test/slow/array_escalation/416.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/416.php
rename to hphp/test/slow/array_escalation/416.php
diff --git a/hphp/test/tcr/array_escalation/416.php.expect b/hphp/test/slow/array_escalation/416.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/416.php.expect
rename to hphp/test/slow/array_escalation/416.php.expect
diff --git a/hphp/test/tcr/array_escalation/417.php b/hphp/test/slow/array_escalation/417.php
similarity index 100%
rename from hphp/test/tcr/array_escalation/417.php
rename to hphp/test/slow/array_escalation/417.php
diff --git a/hphp/test/tcr/array_escalation/417.php.expect b/hphp/test/slow/array_escalation/417.php.expect
similarity index 100%
rename from hphp/test/tcr/array_escalation/417.php.expect
rename to hphp/test/slow/array_escalation/417.php.expect
diff --git a/hphp/test/tcr/array_for_each/447.php b/hphp/test/slow/array_for_each/447.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/447.php
rename to hphp/test/slow/array_for_each/447.php
diff --git a/hphp/test/tcr/array_for_each/447.php.expect b/hphp/test/slow/array_for_each/447.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/447.php.expect
rename to hphp/test/slow/array_for_each/447.php.expect
diff --git a/hphp/test/tcr/array_for_each/447.php.hphp_opts b/hphp/test/slow/array_for_each/447.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/447.php.hphp_opts
rename to hphp/test/slow/array_for_each/447.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/447.php.opts b/hphp/test/slow/array_for_each/447.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/447.php.opts
rename to hphp/test/slow/array_for_each/447.php.opts
diff --git a/hphp/test/tcr/array_for_each/448.php b/hphp/test/slow/array_for_each/448.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/448.php
rename to hphp/test/slow/array_for_each/448.php
diff --git a/hphp/test/tcr/array_for_each/448.php.expect b/hphp/test/slow/array_for_each/448.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/448.php.expect
rename to hphp/test/slow/array_for_each/448.php.expect
diff --git a/hphp/test/tcr/array_for_each/448.php.hphp_opts b/hphp/test/slow/array_for_each/448.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/448.php.hphp_opts
rename to hphp/test/slow/array_for_each/448.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/448.php.opts b/hphp/test/slow/array_for_each/448.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/448.php.opts
rename to hphp/test/slow/array_for_each/448.php.opts
diff --git a/hphp/test/tcr/array_for_each/449.php b/hphp/test/slow/array_for_each/449.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/449.php
rename to hphp/test/slow/array_for_each/449.php
diff --git a/hphp/test/tcr/array_for_each/449.php.expect b/hphp/test/slow/array_for_each/449.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/449.php.expect
rename to hphp/test/slow/array_for_each/449.php.expect
diff --git a/hphp/test/tcr/array_for_each/449.php.hphp_opts b/hphp/test/slow/array_for_each/449.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/449.php.hphp_opts
rename to hphp/test/slow/array_for_each/449.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/449.php.opts b/hphp/test/slow/array_for_each/449.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/449.php.opts
rename to hphp/test/slow/array_for_each/449.php.opts
diff --git a/hphp/test/tcr/array_for_each/450.php b/hphp/test/slow/array_for_each/450.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/450.php
rename to hphp/test/slow/array_for_each/450.php
diff --git a/hphp/test/tcr/array_for_each/450.php.expect b/hphp/test/slow/array_for_each/450.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/450.php.expect
rename to hphp/test/slow/array_for_each/450.php.expect
diff --git a/hphp/test/tcr/array_for_each/450.php.hphp_opts b/hphp/test/slow/array_for_each/450.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/450.php.hphp_opts
rename to hphp/test/slow/array_for_each/450.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/450.php.opts b/hphp/test/slow/array_for_each/450.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/450.php.opts
rename to hphp/test/slow/array_for_each/450.php.opts
diff --git a/hphp/test/tcr/array_for_each/451.php b/hphp/test/slow/array_for_each/451.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/451.php
rename to hphp/test/slow/array_for_each/451.php
diff --git a/hphp/test/tcr/array_for_each/451.php.expect b/hphp/test/slow/array_for_each/451.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/451.php.expect
rename to hphp/test/slow/array_for_each/451.php.expect
diff --git a/hphp/test/tcr/array_for_each/451.php.hphp_opts b/hphp/test/slow/array_for_each/451.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/451.php.hphp_opts
rename to hphp/test/slow/array_for_each/451.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/451.php.opts b/hphp/test/slow/array_for_each/451.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/451.php.opts
rename to hphp/test/slow/array_for_each/451.php.opts
diff --git a/hphp/test/tcr/array_for_each/452.php b/hphp/test/slow/array_for_each/452.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/452.php
rename to hphp/test/slow/array_for_each/452.php
diff --git a/hphp/test/tcr/array_for_each/452.php.expect b/hphp/test/slow/array_for_each/452.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/452.php.expect
rename to hphp/test/slow/array_for_each/452.php.expect
diff --git a/hphp/test/tcr/array_for_each/452.php.hphp_opts b/hphp/test/slow/array_for_each/452.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/452.php.hphp_opts
rename to hphp/test/slow/array_for_each/452.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/452.php.opts b/hphp/test/slow/array_for_each/452.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/452.php.opts
rename to hphp/test/slow/array_for_each/452.php.opts
diff --git a/hphp/test/tcr/array_for_each/453.php b/hphp/test/slow/array_for_each/453.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/453.php
rename to hphp/test/slow/array_for_each/453.php
diff --git a/hphp/test/tcr/array_for_each/453.php.expect b/hphp/test/slow/array_for_each/453.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/453.php.expect
rename to hphp/test/slow/array_for_each/453.php.expect
diff --git a/hphp/test/tcr/array_for_each/453.php.hphp_opts b/hphp/test/slow/array_for_each/453.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/453.php.hphp_opts
rename to hphp/test/slow/array_for_each/453.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/453.php.opts b/hphp/test/slow/array_for_each/453.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/453.php.opts
rename to hphp/test/slow/array_for_each/453.php.opts
diff --git a/hphp/test/tcr/array_for_each/454.php b/hphp/test/slow/array_for_each/454.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/454.php
rename to hphp/test/slow/array_for_each/454.php
diff --git a/hphp/test/tcr/array_for_each/454.php.expect b/hphp/test/slow/array_for_each/454.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/454.php.expect
rename to hphp/test/slow/array_for_each/454.php.expect
diff --git a/hphp/test/tcr/array_for_each/454.php.hphp_opts b/hphp/test/slow/array_for_each/454.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/454.php.hphp_opts
rename to hphp/test/slow/array_for_each/454.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/454.php.opts b/hphp/test/slow/array_for_each/454.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/454.php.opts
rename to hphp/test/slow/array_for_each/454.php.opts
diff --git a/hphp/test/tcr/array_for_each/455.php b/hphp/test/slow/array_for_each/455.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/455.php
rename to hphp/test/slow/array_for_each/455.php
diff --git a/hphp/test/tcr/array_for_each/455.php.expect b/hphp/test/slow/array_for_each/455.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/455.php.expect
rename to hphp/test/slow/array_for_each/455.php.expect
diff --git a/hphp/test/tcr/array_for_each/455.php.hphp_opts b/hphp/test/slow/array_for_each/455.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/455.php.hphp_opts
rename to hphp/test/slow/array_for_each/455.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/455.php.opts b/hphp/test/slow/array_for_each/455.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/455.php.opts
rename to hphp/test/slow/array_for_each/455.php.opts
diff --git a/hphp/test/tcr/array_for_each/456.php b/hphp/test/slow/array_for_each/456.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/456.php
rename to hphp/test/slow/array_for_each/456.php
diff --git a/hphp/test/tcr/array_for_each/456.php.expect b/hphp/test/slow/array_for_each/456.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/456.php.expect
rename to hphp/test/slow/array_for_each/456.php.expect
diff --git a/hphp/test/tcr/array_for_each/456.php.hphp_opts b/hphp/test/slow/array_for_each/456.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/456.php.hphp_opts
rename to hphp/test/slow/array_for_each/456.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/456.php.opts b/hphp/test/slow/array_for_each/456.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/456.php.opts
rename to hphp/test/slow/array_for_each/456.php.opts
diff --git a/hphp/test/tcr/array_for_each/457.php b/hphp/test/slow/array_for_each/457.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/457.php
rename to hphp/test/slow/array_for_each/457.php
diff --git a/hphp/test/tcr/array_for_each/457.php.expect b/hphp/test/slow/array_for_each/457.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/457.php.expect
rename to hphp/test/slow/array_for_each/457.php.expect
diff --git a/hphp/test/tcr/array_for_each/457.php.hphp_opts b/hphp/test/slow/array_for_each/457.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/457.php.hphp_opts
rename to hphp/test/slow/array_for_each/457.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/457.php.opts b/hphp/test/slow/array_for_each/457.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/457.php.opts
rename to hphp/test/slow/array_for_each/457.php.opts
diff --git a/hphp/test/tcr/array_for_each/458.php b/hphp/test/slow/array_for_each/458.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/458.php
rename to hphp/test/slow/array_for_each/458.php
diff --git a/hphp/test/tcr/array_for_each/458.php.expect b/hphp/test/slow/array_for_each/458.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/458.php.expect
rename to hphp/test/slow/array_for_each/458.php.expect
diff --git a/hphp/test/tcr/array_for_each/458.php.hphp_opts b/hphp/test/slow/array_for_each/458.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/458.php.hphp_opts
rename to hphp/test/slow/array_for_each/458.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/458.php.opts b/hphp/test/slow/array_for_each/458.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/458.php.opts
rename to hphp/test/slow/array_for_each/458.php.opts
diff --git a/hphp/test/tcr/array_for_each/459.php b/hphp/test/slow/array_for_each/459.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/459.php
rename to hphp/test/slow/array_for_each/459.php
diff --git a/hphp/test/tcr/array_for_each/459.php.expect b/hphp/test/slow/array_for_each/459.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/459.php.expect
rename to hphp/test/slow/array_for_each/459.php.expect
diff --git a/hphp/test/tcr/array_for_each/459.php.hphp_opts b/hphp/test/slow/array_for_each/459.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/459.php.hphp_opts
rename to hphp/test/slow/array_for_each/459.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/459.php.opts b/hphp/test/slow/array_for_each/459.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/459.php.opts
rename to hphp/test/slow/array_for_each/459.php.opts
diff --git a/hphp/test/tcr/array_for_each/460.php b/hphp/test/slow/array_for_each/460.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/460.php
rename to hphp/test/slow/array_for_each/460.php
diff --git a/hphp/test/tcr/array_for_each/460.php.expect b/hphp/test/slow/array_for_each/460.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/460.php.expect
rename to hphp/test/slow/array_for_each/460.php.expect
diff --git a/hphp/test/tcr/array_for_each/460.php.hphp_opts b/hphp/test/slow/array_for_each/460.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/460.php.hphp_opts
rename to hphp/test/slow/array_for_each/460.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/460.php.opts b/hphp/test/slow/array_for_each/460.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/460.php.opts
rename to hphp/test/slow/array_for_each/460.php.opts
diff --git a/hphp/test/tcr/array_for_each/461.php b/hphp/test/slow/array_for_each/461.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/461.php
rename to hphp/test/slow/array_for_each/461.php
diff --git a/hphp/test/tcr/array_for_each/461.php.expect b/hphp/test/slow/array_for_each/461.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/461.php.expect
rename to hphp/test/slow/array_for_each/461.php.expect
diff --git a/hphp/test/tcr/array_for_each/461.php.hphp_opts b/hphp/test/slow/array_for_each/461.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/461.php.hphp_opts
rename to hphp/test/slow/array_for_each/461.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/461.php.opts b/hphp/test/slow/array_for_each/461.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/461.php.opts
rename to hphp/test/slow/array_for_each/461.php.opts
diff --git a/hphp/test/tcr/array_for_each/462.php b/hphp/test/slow/array_for_each/462.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/462.php
rename to hphp/test/slow/array_for_each/462.php
diff --git a/hphp/test/tcr/array_for_each/462.php.expect b/hphp/test/slow/array_for_each/462.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/462.php.expect
rename to hphp/test/slow/array_for_each/462.php.expect
diff --git a/hphp/test/tcr/array_for_each/462.php.hphp_opts b/hphp/test/slow/array_for_each/462.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/462.php.hphp_opts
rename to hphp/test/slow/array_for_each/462.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/462.php.opts b/hphp/test/slow/array_for_each/462.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/462.php.opts
rename to hphp/test/slow/array_for_each/462.php.opts
diff --git a/hphp/test/tcr/array_for_each/463.php b/hphp/test/slow/array_for_each/463.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/463.php
rename to hphp/test/slow/array_for_each/463.php
diff --git a/hphp/test/tcr/array_for_each/463.php.expect b/hphp/test/slow/array_for_each/463.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/463.php.expect
rename to hphp/test/slow/array_for_each/463.php.expect
diff --git a/hphp/test/tcr/array_for_each/463.php.hphp_opts b/hphp/test/slow/array_for_each/463.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/463.php.hphp_opts
rename to hphp/test/slow/array_for_each/463.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/463.php.opts b/hphp/test/slow/array_for_each/463.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/463.php.opts
rename to hphp/test/slow/array_for_each/463.php.opts
diff --git a/hphp/test/tcr/array_for_each/464.php b/hphp/test/slow/array_for_each/464.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/464.php
rename to hphp/test/slow/array_for_each/464.php
diff --git a/hphp/test/tcr/array_for_each/464.php.expect b/hphp/test/slow/array_for_each/464.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/464.php.expect
rename to hphp/test/slow/array_for_each/464.php.expect
diff --git a/hphp/test/tcr/array_for_each/464.php.hphp_opts b/hphp/test/slow/array_for_each/464.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/464.php.hphp_opts
rename to hphp/test/slow/array_for_each/464.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/464.php.opts b/hphp/test/slow/array_for_each/464.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/464.php.opts
rename to hphp/test/slow/array_for_each/464.php.opts
diff --git a/hphp/test/tcr/array_for_each/465.php b/hphp/test/slow/array_for_each/465.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/465.php
rename to hphp/test/slow/array_for_each/465.php
diff --git a/hphp/test/tcr/array_for_each/465.php.expect b/hphp/test/slow/array_for_each/465.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/465.php.expect
rename to hphp/test/slow/array_for_each/465.php.expect
diff --git a/hphp/test/tcr/array_for_each/465.php.hphp_opts b/hphp/test/slow/array_for_each/465.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/465.php.hphp_opts
rename to hphp/test/slow/array_for_each/465.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/465.php.opts b/hphp/test/slow/array_for_each/465.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/465.php.opts
rename to hphp/test/slow/array_for_each/465.php.opts
diff --git a/hphp/test/tcr/array_for_each/466.php b/hphp/test/slow/array_for_each/466.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/466.php
rename to hphp/test/slow/array_for_each/466.php
diff --git a/hphp/test/tcr/array_for_each/466.php.expect b/hphp/test/slow/array_for_each/466.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/466.php.expect
rename to hphp/test/slow/array_for_each/466.php.expect
diff --git a/hphp/test/tcr/array_for_each/466.php.hphp_opts b/hphp/test/slow/array_for_each/466.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/466.php.hphp_opts
rename to hphp/test/slow/array_for_each/466.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/466.php.opts b/hphp/test/slow/array_for_each/466.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/466.php.opts
rename to hphp/test/slow/array_for_each/466.php.opts
diff --git a/hphp/test/tcr/array_for_each/467.php b/hphp/test/slow/array_for_each/467.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/467.php
rename to hphp/test/slow/array_for_each/467.php
diff --git a/hphp/test/tcr/array_for_each/467.php.expect b/hphp/test/slow/array_for_each/467.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/467.php.expect
rename to hphp/test/slow/array_for_each/467.php.expect
diff --git a/hphp/test/tcr/array_for_each/467.php.hphp_opts b/hphp/test/slow/array_for_each/467.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/467.php.hphp_opts
rename to hphp/test/slow/array_for_each/467.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/467.php.opts b/hphp/test/slow/array_for_each/467.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/467.php.opts
rename to hphp/test/slow/array_for_each/467.php.opts
diff --git a/hphp/test/tcr/array_for_each/468.php b/hphp/test/slow/array_for_each/468.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/468.php
rename to hphp/test/slow/array_for_each/468.php
diff --git a/hphp/test/tcr/array_for_each/468.php.expect b/hphp/test/slow/array_for_each/468.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/468.php.expect
rename to hphp/test/slow/array_for_each/468.php.expect
diff --git a/hphp/test/tcr/array_for_each/468.php.hphp_opts b/hphp/test/slow/array_for_each/468.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/468.php.hphp_opts
rename to hphp/test/slow/array_for_each/468.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/468.php.opts b/hphp/test/slow/array_for_each/468.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/468.php.opts
rename to hphp/test/slow/array_for_each/468.php.opts
diff --git a/hphp/test/tcr/array_for_each/469.php b/hphp/test/slow/array_for_each/469.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/469.php
rename to hphp/test/slow/array_for_each/469.php
diff --git a/hphp/test/tcr/array_for_each/469.php.expect b/hphp/test/slow/array_for_each/469.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/469.php.expect
rename to hphp/test/slow/array_for_each/469.php.expect
diff --git a/hphp/test/tcr/array_for_each/469.php.hphp_opts b/hphp/test/slow/array_for_each/469.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/469.php.hphp_opts
rename to hphp/test/slow/array_for_each/469.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/469.php.opts b/hphp/test/slow/array_for_each/469.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/469.php.opts
rename to hphp/test/slow/array_for_each/469.php.opts
diff --git a/hphp/test/tcr/array_for_each/470.php b/hphp/test/slow/array_for_each/470.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/470.php
rename to hphp/test/slow/array_for_each/470.php
diff --git a/hphp/test/tcr/array_for_each/470.php.expect b/hphp/test/slow/array_for_each/470.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/470.php.expect
rename to hphp/test/slow/array_for_each/470.php.expect
diff --git a/hphp/test/tcr/array_for_each/470.php.hphp_opts b/hphp/test/slow/array_for_each/470.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/470.php.hphp_opts
rename to hphp/test/slow/array_for_each/470.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/470.php.opts b/hphp/test/slow/array_for_each/470.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/470.php.opts
rename to hphp/test/slow/array_for_each/470.php.opts
diff --git a/hphp/test/tcr/array_for_each/471.php b/hphp/test/slow/array_for_each/471.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/471.php
rename to hphp/test/slow/array_for_each/471.php
diff --git a/hphp/test/tcr/array_for_each/471.php.expect b/hphp/test/slow/array_for_each/471.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/471.php.expect
rename to hphp/test/slow/array_for_each/471.php.expect
diff --git a/hphp/test/tcr/array_for_each/471.php.hphp_opts b/hphp/test/slow/array_for_each/471.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/471.php.hphp_opts
rename to hphp/test/slow/array_for_each/471.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/471.php.opts b/hphp/test/slow/array_for_each/471.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/471.php.opts
rename to hphp/test/slow/array_for_each/471.php.opts
diff --git a/hphp/test/tcr/array_for_each/472.php b/hphp/test/slow/array_for_each/472.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/472.php
rename to hphp/test/slow/array_for_each/472.php
diff --git a/hphp/test/tcr/array_for_each/472.php.expect b/hphp/test/slow/array_for_each/472.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/472.php.expect
rename to hphp/test/slow/array_for_each/472.php.expect
diff --git a/hphp/test/tcr/array_for_each/472.php.hphp_opts b/hphp/test/slow/array_for_each/472.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/472.php.hphp_opts
rename to hphp/test/slow/array_for_each/472.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/472.php.opts b/hphp/test/slow/array_for_each/472.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/472.php.opts
rename to hphp/test/slow/array_for_each/472.php.opts
diff --git a/hphp/test/tcr/array_for_each/473.php b/hphp/test/slow/array_for_each/473.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/473.php
rename to hphp/test/slow/array_for_each/473.php
diff --git a/hphp/test/tcr/array_for_each/473.php.expect b/hphp/test/slow/array_for_each/473.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/473.php.expect
rename to hphp/test/slow/array_for_each/473.php.expect
diff --git a/hphp/test/tcr/array_for_each/473.php.hphp_opts b/hphp/test/slow/array_for_each/473.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/473.php.hphp_opts
rename to hphp/test/slow/array_for_each/473.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/473.php.opts b/hphp/test/slow/array_for_each/473.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/473.php.opts
rename to hphp/test/slow/array_for_each/473.php.opts
diff --git a/hphp/test/tcr/array_for_each/474.php b/hphp/test/slow/array_for_each/474.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/474.php
rename to hphp/test/slow/array_for_each/474.php
diff --git a/hphp/test/tcr/array_for_each/474.php.expect b/hphp/test/slow/array_for_each/474.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/474.php.expect
rename to hphp/test/slow/array_for_each/474.php.expect
diff --git a/hphp/test/tcr/array_for_each/474.php.hphp_opts b/hphp/test/slow/array_for_each/474.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/474.php.hphp_opts
rename to hphp/test/slow/array_for_each/474.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/474.php.opts b/hphp/test/slow/array_for_each/474.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/474.php.opts
rename to hphp/test/slow/array_for_each/474.php.opts
diff --git a/hphp/test/tcr/array_for_each/475.php b/hphp/test/slow/array_for_each/475.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/475.php
rename to hphp/test/slow/array_for_each/475.php
diff --git a/hphp/test/tcr/array_for_each/475.php.expect b/hphp/test/slow/array_for_each/475.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/475.php.expect
rename to hphp/test/slow/array_for_each/475.php.expect
diff --git a/hphp/test/tcr/array_for_each/475.php.hphp_opts b/hphp/test/slow/array_for_each/475.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/475.php.hphp_opts
rename to hphp/test/slow/array_for_each/475.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/475.php.opts b/hphp/test/slow/array_for_each/475.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/475.php.opts
rename to hphp/test/slow/array_for_each/475.php.opts
diff --git a/hphp/test/tcr/array_for_each/476.php b/hphp/test/slow/array_for_each/476.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/476.php
rename to hphp/test/slow/array_for_each/476.php
diff --git a/hphp/test/tcr/array_for_each/476.php.expect b/hphp/test/slow/array_for_each/476.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/476.php.expect
rename to hphp/test/slow/array_for_each/476.php.expect
diff --git a/hphp/test/tcr/array_for_each/476.php.hphp_opts b/hphp/test/slow/array_for_each/476.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/476.php.hphp_opts
rename to hphp/test/slow/array_for_each/476.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/476.php.opts b/hphp/test/slow/array_for_each/476.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/476.php.opts
rename to hphp/test/slow/array_for_each/476.php.opts
diff --git a/hphp/test/tcr/array_for_each/477.php b/hphp/test/slow/array_for_each/477.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/477.php
rename to hphp/test/slow/array_for_each/477.php
diff --git a/hphp/test/tcr/array_for_each/477.php.expect b/hphp/test/slow/array_for_each/477.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/477.php.expect
rename to hphp/test/slow/array_for_each/477.php.expect
diff --git a/hphp/test/tcr/array_for_each/477.php.hphp_opts b/hphp/test/slow/array_for_each/477.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/477.php.hphp_opts
rename to hphp/test/slow/array_for_each/477.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/477.php.opts b/hphp/test/slow/array_for_each/477.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/477.php.opts
rename to hphp/test/slow/array_for_each/477.php.opts
diff --git a/hphp/test/tcr/array_for_each/478.php b/hphp/test/slow/array_for_each/478.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/478.php
rename to hphp/test/slow/array_for_each/478.php
diff --git a/hphp/test/tcr/array_for_each/478.php.expect b/hphp/test/slow/array_for_each/478.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/478.php.expect
rename to hphp/test/slow/array_for_each/478.php.expect
diff --git a/hphp/test/tcr/array_for_each/478.php.hphp_opts b/hphp/test/slow/array_for_each/478.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/478.php.hphp_opts
rename to hphp/test/slow/array_for_each/478.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/478.php.opts b/hphp/test/slow/array_for_each/478.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/478.php.opts
rename to hphp/test/slow/array_for_each/478.php.opts
diff --git a/hphp/test/tcr/array_for_each/479.php b/hphp/test/slow/array_for_each/479.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/479.php
rename to hphp/test/slow/array_for_each/479.php
diff --git a/hphp/test/tcr/array_for_each/479.php.expect b/hphp/test/slow/array_for_each/479.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/479.php.expect
rename to hphp/test/slow/array_for_each/479.php.expect
diff --git a/hphp/test/tcr/array_for_each/479.php.hphp_opts b/hphp/test/slow/array_for_each/479.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/479.php.hphp_opts
rename to hphp/test/slow/array_for_each/479.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/479.php.opts b/hphp/test/slow/array_for_each/479.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/479.php.opts
rename to hphp/test/slow/array_for_each/479.php.opts
diff --git a/hphp/test/tcr/array_for_each/480.php b/hphp/test/slow/array_for_each/480.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/480.php
rename to hphp/test/slow/array_for_each/480.php
diff --git a/hphp/test/tcr/array_for_each/480.php.expect b/hphp/test/slow/array_for_each/480.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/480.php.expect
rename to hphp/test/slow/array_for_each/480.php.expect
diff --git a/hphp/test/tcr/array_for_each/480.php.hphp_opts b/hphp/test/slow/array_for_each/480.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/480.php.hphp_opts
rename to hphp/test/slow/array_for_each/480.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/480.php.opts b/hphp/test/slow/array_for_each/480.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/480.php.opts
rename to hphp/test/slow/array_for_each/480.php.opts
diff --git a/hphp/test/tcr/array_for_each/481.php b/hphp/test/slow/array_for_each/481.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/481.php
rename to hphp/test/slow/array_for_each/481.php
diff --git a/hphp/test/tcr/array_for_each/481.php.expect b/hphp/test/slow/array_for_each/481.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/481.php.expect
rename to hphp/test/slow/array_for_each/481.php.expect
diff --git a/hphp/test/tcr/array_for_each/481.php.hphp_opts b/hphp/test/slow/array_for_each/481.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/481.php.hphp_opts
rename to hphp/test/slow/array_for_each/481.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/481.php.opts b/hphp/test/slow/array_for_each/481.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/481.php.opts
rename to hphp/test/slow/array_for_each/481.php.opts
diff --git a/hphp/test/tcr/array_for_each/482.php b/hphp/test/slow/array_for_each/482.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/482.php
rename to hphp/test/slow/array_for_each/482.php
diff --git a/hphp/test/tcr/array_for_each/482.php.expect b/hphp/test/slow/array_for_each/482.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/482.php.expect
rename to hphp/test/slow/array_for_each/482.php.expect
diff --git a/hphp/test/tcr/array_for_each/482.php.hphp_opts b/hphp/test/slow/array_for_each/482.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/482.php.hphp_opts
rename to hphp/test/slow/array_for_each/482.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/482.php.opts b/hphp/test/slow/array_for_each/482.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/482.php.opts
rename to hphp/test/slow/array_for_each/482.php.opts
diff --git a/hphp/test/tcr/array_for_each/483.php b/hphp/test/slow/array_for_each/483.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/483.php
rename to hphp/test/slow/array_for_each/483.php
diff --git a/hphp/test/tcr/array_for_each/483.php.expect b/hphp/test/slow/array_for_each/483.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/483.php.expect
rename to hphp/test/slow/array_for_each/483.php.expect
diff --git a/hphp/test/tcr/array_for_each/483.php.hphp_opts b/hphp/test/slow/array_for_each/483.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/483.php.hphp_opts
rename to hphp/test/slow/array_for_each/483.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/483.php.opts b/hphp/test/slow/array_for_each/483.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/483.php.opts
rename to hphp/test/slow/array_for_each/483.php.opts
diff --git a/hphp/test/tcr/array_for_each/484.php b/hphp/test/slow/array_for_each/484.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/484.php
rename to hphp/test/slow/array_for_each/484.php
diff --git a/hphp/test/tcr/array_for_each/484.php.expect b/hphp/test/slow/array_for_each/484.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/484.php.expect
rename to hphp/test/slow/array_for_each/484.php.expect
diff --git a/hphp/test/tcr/array_for_each/484.php.hphp_opts b/hphp/test/slow/array_for_each/484.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/484.php.hphp_opts
rename to hphp/test/slow/array_for_each/484.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/484.php.opts b/hphp/test/slow/array_for_each/484.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/484.php.opts
rename to hphp/test/slow/array_for_each/484.php.opts
diff --git a/hphp/test/tcr/array_for_each/485.php b/hphp/test/slow/array_for_each/485.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/485.php
rename to hphp/test/slow/array_for_each/485.php
diff --git a/hphp/test/tcr/array_for_each/485.php.expect b/hphp/test/slow/array_for_each/485.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/485.php.expect
rename to hphp/test/slow/array_for_each/485.php.expect
diff --git a/hphp/test/tcr/array_for_each/485.php.hphp_opts b/hphp/test/slow/array_for_each/485.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/485.php.hphp_opts
rename to hphp/test/slow/array_for_each/485.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/485.php.opts b/hphp/test/slow/array_for_each/485.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/485.php.opts
rename to hphp/test/slow/array_for_each/485.php.opts
diff --git a/hphp/test/tcr/array_for_each/486.php b/hphp/test/slow/array_for_each/486.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/486.php
rename to hphp/test/slow/array_for_each/486.php
diff --git a/hphp/test/tcr/array_for_each/486.php.expect b/hphp/test/slow/array_for_each/486.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/486.php.expect
rename to hphp/test/slow/array_for_each/486.php.expect
diff --git a/hphp/test/tcr/array_for_each/486.php.hphp_opts b/hphp/test/slow/array_for_each/486.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/486.php.hphp_opts
rename to hphp/test/slow/array_for_each/486.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/486.php.opts b/hphp/test/slow/array_for_each/486.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/486.php.opts
rename to hphp/test/slow/array_for_each/486.php.opts
diff --git a/hphp/test/tcr/array_for_each/487.php b/hphp/test/slow/array_for_each/487.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/487.php
rename to hphp/test/slow/array_for_each/487.php
diff --git a/hphp/test/tcr/array_for_each/487.php.expect b/hphp/test/slow/array_for_each/487.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/487.php.expect
rename to hphp/test/slow/array_for_each/487.php.expect
diff --git a/hphp/test/tcr/array_for_each/487.php.hphp_opts b/hphp/test/slow/array_for_each/487.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/487.php.hphp_opts
rename to hphp/test/slow/array_for_each/487.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/487.php.opts b/hphp/test/slow/array_for_each/487.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/487.php.opts
rename to hphp/test/slow/array_for_each/487.php.opts
diff --git a/hphp/test/tcr/array_for_each/488.php b/hphp/test/slow/array_for_each/488.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/488.php
rename to hphp/test/slow/array_for_each/488.php
diff --git a/hphp/test/tcr/array_for_each/488.php.expect b/hphp/test/slow/array_for_each/488.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/488.php.expect
rename to hphp/test/slow/array_for_each/488.php.expect
diff --git a/hphp/test/tcr/array_for_each/488.php.hphp_opts b/hphp/test/slow/array_for_each/488.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/488.php.hphp_opts
rename to hphp/test/slow/array_for_each/488.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/488.php.opts b/hphp/test/slow/array_for_each/488.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/488.php.opts
rename to hphp/test/slow/array_for_each/488.php.opts
diff --git a/hphp/test/tcr/array_for_each/489.php b/hphp/test/slow/array_for_each/489.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/489.php
rename to hphp/test/slow/array_for_each/489.php
diff --git a/hphp/test/tcr/array_for_each/489.php.expect b/hphp/test/slow/array_for_each/489.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/489.php.expect
rename to hphp/test/slow/array_for_each/489.php.expect
diff --git a/hphp/test/tcr/array_for_each/489.php.hphp_opts b/hphp/test/slow/array_for_each/489.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/489.php.hphp_opts
rename to hphp/test/slow/array_for_each/489.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/489.php.opts b/hphp/test/slow/array_for_each/489.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/489.php.opts
rename to hphp/test/slow/array_for_each/489.php.opts
diff --git a/hphp/test/tcr/array_for_each/490.php b/hphp/test/slow/array_for_each/490.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/490.php
rename to hphp/test/slow/array_for_each/490.php
diff --git a/hphp/test/tcr/array_for_each/490.php.expect b/hphp/test/slow/array_for_each/490.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/490.php.expect
rename to hphp/test/slow/array_for_each/490.php.expect
diff --git a/hphp/test/tcr/array_for_each/490.php.hphp_opts b/hphp/test/slow/array_for_each/490.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/490.php.hphp_opts
rename to hphp/test/slow/array_for_each/490.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/490.php.opts b/hphp/test/slow/array_for_each/490.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/490.php.opts
rename to hphp/test/slow/array_for_each/490.php.opts
diff --git a/hphp/test/tcr/array_for_each/491.php b/hphp/test/slow/array_for_each/491.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/491.php
rename to hphp/test/slow/array_for_each/491.php
diff --git a/hphp/test/tcr/array_for_each/491.php.expect b/hphp/test/slow/array_for_each/491.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/491.php.expect
rename to hphp/test/slow/array_for_each/491.php.expect
diff --git a/hphp/test/tcr/array_for_each/491.php.hphp_opts b/hphp/test/slow/array_for_each/491.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/491.php.hphp_opts
rename to hphp/test/slow/array_for_each/491.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/491.php.opts b/hphp/test/slow/array_for_each/491.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/491.php.opts
rename to hphp/test/slow/array_for_each/491.php.opts
diff --git a/hphp/test/tcr/array_for_each/492.php b/hphp/test/slow/array_for_each/492.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/492.php
rename to hphp/test/slow/array_for_each/492.php
diff --git a/hphp/test/tcr/array_for_each/492.php.expect b/hphp/test/slow/array_for_each/492.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/492.php.expect
rename to hphp/test/slow/array_for_each/492.php.expect
diff --git a/hphp/test/tcr/array_for_each/492.php.hphp_opts b/hphp/test/slow/array_for_each/492.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/492.php.hphp_opts
rename to hphp/test/slow/array_for_each/492.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/492.php.opts b/hphp/test/slow/array_for_each/492.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/492.php.opts
rename to hphp/test/slow/array_for_each/492.php.opts
diff --git a/hphp/test/tcr/array_for_each/493.php b/hphp/test/slow/array_for_each/493.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/493.php
rename to hphp/test/slow/array_for_each/493.php
diff --git a/hphp/test/tcr/array_for_each/493.php.expect b/hphp/test/slow/array_for_each/493.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/493.php.expect
rename to hphp/test/slow/array_for_each/493.php.expect
diff --git a/hphp/test/tcr/array_for_each/493.php.hphp_opts b/hphp/test/slow/array_for_each/493.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/493.php.hphp_opts
rename to hphp/test/slow/array_for_each/493.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/493.php.opts b/hphp/test/slow/array_for_each/493.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/493.php.opts
rename to hphp/test/slow/array_for_each/493.php.opts
diff --git a/hphp/test/tcr/array_for_each/494.php b/hphp/test/slow/array_for_each/494.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/494.php
rename to hphp/test/slow/array_for_each/494.php
diff --git a/hphp/test/tcr/array_for_each/494.php.expect b/hphp/test/slow/array_for_each/494.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/494.php.expect
rename to hphp/test/slow/array_for_each/494.php.expect
diff --git a/hphp/test/tcr/array_for_each/494.php.hphp_opts b/hphp/test/slow/array_for_each/494.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/494.php.hphp_opts
rename to hphp/test/slow/array_for_each/494.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/494.php.opts b/hphp/test/slow/array_for_each/494.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/494.php.opts
rename to hphp/test/slow/array_for_each/494.php.opts
diff --git a/hphp/test/tcr/array_for_each/495.php b/hphp/test/slow/array_for_each/495.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/495.php
rename to hphp/test/slow/array_for_each/495.php
diff --git a/hphp/test/tcr/array_for_each/495.php.expect b/hphp/test/slow/array_for_each/495.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/495.php.expect
rename to hphp/test/slow/array_for_each/495.php.expect
diff --git a/hphp/test/tcr/array_for_each/495.php.hphp_opts b/hphp/test/slow/array_for_each/495.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/495.php.hphp_opts
rename to hphp/test/slow/array_for_each/495.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/495.php.opts b/hphp/test/slow/array_for_each/495.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/495.php.opts
rename to hphp/test/slow/array_for_each/495.php.opts
diff --git a/hphp/test/tcr/array_for_each/496.php b/hphp/test/slow/array_for_each/496.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/496.php
rename to hphp/test/slow/array_for_each/496.php
diff --git a/hphp/test/tcr/array_for_each/496.php.expect b/hphp/test/slow/array_for_each/496.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/496.php.expect
rename to hphp/test/slow/array_for_each/496.php.expect
diff --git a/hphp/test/tcr/array_for_each/496.php.hphp_opts b/hphp/test/slow/array_for_each/496.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/496.php.hphp_opts
rename to hphp/test/slow/array_for_each/496.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/496.php.opts b/hphp/test/slow/array_for_each/496.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/496.php.opts
rename to hphp/test/slow/array_for_each/496.php.opts
diff --git a/hphp/test/tcr/array_for_each/497.php b/hphp/test/slow/array_for_each/497.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/497.php
rename to hphp/test/slow/array_for_each/497.php
diff --git a/hphp/test/tcr/array_for_each/497.php.expect b/hphp/test/slow/array_for_each/497.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/497.php.expect
rename to hphp/test/slow/array_for_each/497.php.expect
diff --git a/hphp/test/tcr/array_for_each/497.php.hphp_opts b/hphp/test/slow/array_for_each/497.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/497.php.hphp_opts
rename to hphp/test/slow/array_for_each/497.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/497.php.opts b/hphp/test/slow/array_for_each/497.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/497.php.opts
rename to hphp/test/slow/array_for_each/497.php.opts
diff --git a/hphp/test/tcr/array_for_each/498.php b/hphp/test/slow/array_for_each/498.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/498.php
rename to hphp/test/slow/array_for_each/498.php
diff --git a/hphp/test/tcr/array_for_each/498.php.expect b/hphp/test/slow/array_for_each/498.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/498.php.expect
rename to hphp/test/slow/array_for_each/498.php.expect
diff --git a/hphp/test/tcr/array_for_each/498.php.hphp_opts b/hphp/test/slow/array_for_each/498.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/498.php.hphp_opts
rename to hphp/test/slow/array_for_each/498.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/498.php.opts b/hphp/test/slow/array_for_each/498.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/498.php.opts
rename to hphp/test/slow/array_for_each/498.php.opts
diff --git a/hphp/test/tcr/array_for_each/499.php b/hphp/test/slow/array_for_each/499.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/499.php
rename to hphp/test/slow/array_for_each/499.php
diff --git a/hphp/test/tcr/array_for_each/499.php.expect b/hphp/test/slow/array_for_each/499.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/499.php.expect
rename to hphp/test/slow/array_for_each/499.php.expect
diff --git a/hphp/test/tcr/array_for_each/499.php.hphp_opts b/hphp/test/slow/array_for_each/499.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/499.php.hphp_opts
rename to hphp/test/slow/array_for_each/499.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/499.php.opts b/hphp/test/slow/array_for_each/499.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/499.php.opts
rename to hphp/test/slow/array_for_each/499.php.opts
diff --git a/hphp/test/tcr/array_for_each/500.php b/hphp/test/slow/array_for_each/500.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/500.php
rename to hphp/test/slow/array_for_each/500.php
diff --git a/hphp/test/tcr/array_for_each/500.php.expect b/hphp/test/slow/array_for_each/500.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/500.php.expect
rename to hphp/test/slow/array_for_each/500.php.expect
diff --git a/hphp/test/tcr/array_for_each/500.php.hphp_opts b/hphp/test/slow/array_for_each/500.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/500.php.hphp_opts
rename to hphp/test/slow/array_for_each/500.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/500.php.opts b/hphp/test/slow/array_for_each/500.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/500.php.opts
rename to hphp/test/slow/array_for_each/500.php.opts
diff --git a/hphp/test/tcr/array_for_each/501.php b/hphp/test/slow/array_for_each/501.php
similarity index 100%
rename from hphp/test/tcr/array_for_each/501.php
rename to hphp/test/slow/array_for_each/501.php
diff --git a/hphp/test/tcr/array_for_each/501.php.expect b/hphp/test/slow/array_for_each/501.php.expect
similarity index 100%
rename from hphp/test/tcr/array_for_each/501.php.expect
rename to hphp/test/slow/array_for_each/501.php.expect
diff --git a/hphp/test/tcr/array_for_each/501.php.hphp_opts b/hphp/test/slow/array_for_each/501.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/501.php.hphp_opts
rename to hphp/test/slow/array_for_each/501.php.hphp_opts
diff --git a/hphp/test/tcr/array_for_each/501.php.opts b/hphp/test/slow/array_for_each/501.php.opts
similarity index 100%
rename from hphp/test/tcr/array_for_each/501.php.opts
rename to hphp/test/slow/array_for_each/501.php.opts
diff --git a/hphp/test/tcr/array_functions/515.php b/hphp/test/slow/array_functions/515.php
similarity index 100%
rename from hphp/test/tcr/array_functions/515.php
rename to hphp/test/slow/array_functions/515.php
diff --git a/hphp/test/tcr/array_functions/515.php.expect b/hphp/test/slow/array_functions/515.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/515.php.expect
rename to hphp/test/slow/array_functions/515.php.expect
diff --git a/hphp/test/tcr/array_functions/516.php b/hphp/test/slow/array_functions/516.php
similarity index 100%
rename from hphp/test/tcr/array_functions/516.php
rename to hphp/test/slow/array_functions/516.php
diff --git a/hphp/test/tcr/array_functions/516.php.expect b/hphp/test/slow/array_functions/516.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/516.php.expect
rename to hphp/test/slow/array_functions/516.php.expect
diff --git a/hphp/test/tcr/array_functions/517.php b/hphp/test/slow/array_functions/517.php
similarity index 100%
rename from hphp/test/tcr/array_functions/517.php
rename to hphp/test/slow/array_functions/517.php
diff --git a/hphp/test/tcr/array_functions/517.php.expect b/hphp/test/slow/array_functions/517.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/517.php.expect
rename to hphp/test/slow/array_functions/517.php.expect
diff --git a/hphp/test/tcr/array_functions/518.php b/hphp/test/slow/array_functions/518.php
similarity index 100%
rename from hphp/test/tcr/array_functions/518.php
rename to hphp/test/slow/array_functions/518.php
diff --git a/hphp/test/tcr/array_functions/518.php.expect b/hphp/test/slow/array_functions/518.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/518.php.expect
rename to hphp/test/slow/array_functions/518.php.expect
diff --git a/hphp/test/tcr/array_functions/519.php b/hphp/test/slow/array_functions/519.php
similarity index 100%
rename from hphp/test/tcr/array_functions/519.php
rename to hphp/test/slow/array_functions/519.php
diff --git a/hphp/test/tcr/array_functions/519.php.expect b/hphp/test/slow/array_functions/519.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/519.php.expect
rename to hphp/test/slow/array_functions/519.php.expect
diff --git a/hphp/test/tcr/array_functions/520.php b/hphp/test/slow/array_functions/520.php
similarity index 100%
rename from hphp/test/tcr/array_functions/520.php
rename to hphp/test/slow/array_functions/520.php
diff --git a/hphp/test/tcr/array_functions/520.php.expect b/hphp/test/slow/array_functions/520.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/520.php.expect
rename to hphp/test/slow/array_functions/520.php.expect
diff --git a/hphp/test/tcr/array_functions/521.php b/hphp/test/slow/array_functions/521.php
similarity index 100%
rename from hphp/test/tcr/array_functions/521.php
rename to hphp/test/slow/array_functions/521.php
diff --git a/hphp/test/tcr/array_functions/521.php.expect b/hphp/test/slow/array_functions/521.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/521.php.expect
rename to hphp/test/slow/array_functions/521.php.expect
diff --git a/hphp/test/tcr/array_functions/522.php b/hphp/test/slow/array_functions/522.php
similarity index 100%
rename from hphp/test/tcr/array_functions/522.php
rename to hphp/test/slow/array_functions/522.php
diff --git a/hphp/test/tcr/array_functions/522.php.expect b/hphp/test/slow/array_functions/522.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/522.php.expect
rename to hphp/test/slow/array_functions/522.php.expect
diff --git a/hphp/test/tcr/array_functions/523.php b/hphp/test/slow/array_functions/523.php
similarity index 100%
rename from hphp/test/tcr/array_functions/523.php
rename to hphp/test/slow/array_functions/523.php
diff --git a/hphp/test/tcr/array_functions/523.php.expect b/hphp/test/slow/array_functions/523.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/523.php.expect
rename to hphp/test/slow/array_functions/523.php.expect
diff --git a/hphp/test/tcr/array_functions/524.php b/hphp/test/slow/array_functions/524.php
similarity index 100%
rename from hphp/test/tcr/array_functions/524.php
rename to hphp/test/slow/array_functions/524.php
diff --git a/hphp/test/tcr/array_functions/524.php.expect b/hphp/test/slow/array_functions/524.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/524.php.expect
rename to hphp/test/slow/array_functions/524.php.expect
diff --git a/hphp/test/tcr/array_functions/525.php b/hphp/test/slow/array_functions/525.php
similarity index 100%
rename from hphp/test/tcr/array_functions/525.php
rename to hphp/test/slow/array_functions/525.php
diff --git a/hphp/test/tcr/array_functions/525.php.expect b/hphp/test/slow/array_functions/525.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/525.php.expect
rename to hphp/test/slow/array_functions/525.php.expect
diff --git a/hphp/test/tcr/array_functions/526.php b/hphp/test/slow/array_functions/526.php
similarity index 100%
rename from hphp/test/tcr/array_functions/526.php
rename to hphp/test/slow/array_functions/526.php
diff --git a/hphp/test/tcr/array_functions/526.php.expect b/hphp/test/slow/array_functions/526.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/526.php.expect
rename to hphp/test/slow/array_functions/526.php.expect
diff --git a/hphp/test/tcr/array_functions/527.php b/hphp/test/slow/array_functions/527.php
similarity index 100%
rename from hphp/test/tcr/array_functions/527.php
rename to hphp/test/slow/array_functions/527.php
diff --git a/hphp/test/tcr/array_functions/527.php.expect b/hphp/test/slow/array_functions/527.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/527.php.expect
rename to hphp/test/slow/array_functions/527.php.expect
diff --git a/hphp/test/tcr/array_functions/528.php b/hphp/test/slow/array_functions/528.php
similarity index 100%
rename from hphp/test/tcr/array_functions/528.php
rename to hphp/test/slow/array_functions/528.php
diff --git a/hphp/test/tcr/array_functions/528.php.expect b/hphp/test/slow/array_functions/528.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/528.php.expect
rename to hphp/test/slow/array_functions/528.php.expect
diff --git a/hphp/test/tcr/array_functions/529.php b/hphp/test/slow/array_functions/529.php
similarity index 100%
rename from hphp/test/tcr/array_functions/529.php
rename to hphp/test/slow/array_functions/529.php
diff --git a/hphp/test/tcr/array_functions/529.php.expect b/hphp/test/slow/array_functions/529.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/529.php.expect
rename to hphp/test/slow/array_functions/529.php.expect
diff --git a/hphp/test/tcr/array_functions/530.php b/hphp/test/slow/array_functions/530.php
similarity index 100%
rename from hphp/test/tcr/array_functions/530.php
rename to hphp/test/slow/array_functions/530.php
diff --git a/hphp/test/tcr/array_functions/530.php.expect b/hphp/test/slow/array_functions/530.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/530.php.expect
rename to hphp/test/slow/array_functions/530.php.expect
diff --git a/hphp/test/tcr/array_functions/531.php b/hphp/test/slow/array_functions/531.php
similarity index 100%
rename from hphp/test/tcr/array_functions/531.php
rename to hphp/test/slow/array_functions/531.php
diff --git a/hphp/test/tcr/array_functions/531.php.expect b/hphp/test/slow/array_functions/531.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/531.php.expect
rename to hphp/test/slow/array_functions/531.php.expect
diff --git a/hphp/test/tcr/array_functions/532.php b/hphp/test/slow/array_functions/532.php
similarity index 100%
rename from hphp/test/tcr/array_functions/532.php
rename to hphp/test/slow/array_functions/532.php
diff --git a/hphp/test/tcr/array_functions/532.php.expect b/hphp/test/slow/array_functions/532.php.expect
similarity index 100%
rename from hphp/test/tcr/array_functions/532.php.expect
rename to hphp/test/slow/array_functions/532.php.expect
diff --git a/hphp/test/tcr/array_init/245.php b/hphp/test/slow/array_init/245.php
similarity index 100%
rename from hphp/test/tcr/array_init/245.php
rename to hphp/test/slow/array_init/245.php
diff --git a/hphp/test/tcr/array_init/245.php.expect b/hphp/test/slow/array_init/245.php.expect
similarity index 100%
rename from hphp/test/tcr/array_init/245.php.expect
rename to hphp/test/slow/array_init/245.php.expect
diff --git a/hphp/test/tcr/array_init/246.php b/hphp/test/slow/array_init/246.php
similarity index 100%
rename from hphp/test/tcr/array_init/246.php
rename to hphp/test/slow/array_init/246.php
diff --git a/hphp/test/tcr/compilation/1255.php.expect b/hphp/test/slow/array_init/246.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1255.php.expect
rename to hphp/test/slow/array_init/246.php.expect
diff --git a/hphp/test/tcr/array_init/247.php b/hphp/test/slow/array_init/247.php
similarity index 100%
rename from hphp/test/tcr/array_init/247.php
rename to hphp/test/slow/array_init/247.php
diff --git a/hphp/test/tcr/array_init/247.php.expect b/hphp/test/slow/array_init/247.php.expect
similarity index 100%
rename from hphp/test/tcr/array_init/247.php.expect
rename to hphp/test/slow/array_init/247.php.expect
diff --git a/hphp/test/tcr/array_init/248.php b/hphp/test/slow/array_init/248.php
similarity index 100%
rename from hphp/test/tcr/array_init/248.php
rename to hphp/test/slow/array_init/248.php
diff --git a/hphp/test/tcr/array_init/248.php.expect b/hphp/test/slow/array_init/248.php.expect
similarity index 100%
rename from hphp/test/tcr/array_init/248.php.expect
rename to hphp/test/slow/array_init/248.php.expect
diff --git a/hphp/test/tcr/array_init/249.php b/hphp/test/slow/array_init/249.php
similarity index 100%
rename from hphp/test/tcr/array_init/249.php
rename to hphp/test/slow/array_init/249.php
diff --git a/hphp/test/tcr/array_init/249.php.expect b/hphp/test/slow/array_init/249.php.expect
similarity index 100%
rename from hphp/test/tcr/array_init/249.php.expect
rename to hphp/test/slow/array_init/249.php.expect
diff --git a/hphp/test/tcr/array_iterator/439.php b/hphp/test/slow/array_iterator/439.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/439.php
rename to hphp/test/slow/array_iterator/439.php
diff --git a/hphp/test/tcr/array_iterator/439.php.expect b/hphp/test/slow/array_iterator/439.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/439.php.expect
rename to hphp/test/slow/array_iterator/439.php.expect
diff --git a/hphp/test/tcr/array_iterator/439.php.hphp_opts b/hphp/test/slow/array_iterator/439.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/439.php.hphp_opts
rename to hphp/test/slow/array_iterator/439.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/439.php.opts b/hphp/test/slow/array_iterator/439.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/439.php.opts
rename to hphp/test/slow/array_iterator/439.php.opts
diff --git a/hphp/test/tcr/array_iterator/440.php b/hphp/test/slow/array_iterator/440.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/440.php
rename to hphp/test/slow/array_iterator/440.php
diff --git a/hphp/test/tcr/array_iterator/440.php.expect b/hphp/test/slow/array_iterator/440.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/440.php.expect
rename to hphp/test/slow/array_iterator/440.php.expect
diff --git a/hphp/test/tcr/array_iterator/440.php.hphp_opts b/hphp/test/slow/array_iterator/440.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/440.php.hphp_opts
rename to hphp/test/slow/array_iterator/440.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/440.php.opts b/hphp/test/slow/array_iterator/440.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/440.php.opts
rename to hphp/test/slow/array_iterator/440.php.opts
diff --git a/hphp/test/tcr/array_iterator/441.php b/hphp/test/slow/array_iterator/441.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/441.php
rename to hphp/test/slow/array_iterator/441.php
diff --git a/hphp/test/tcr/array_iterator/441.php.expect b/hphp/test/slow/array_iterator/441.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/441.php.expect
rename to hphp/test/slow/array_iterator/441.php.expect
diff --git a/hphp/test/tcr/array_iterator/441.php.hphp_opts b/hphp/test/slow/array_iterator/441.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/441.php.hphp_opts
rename to hphp/test/slow/array_iterator/441.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/441.php.opts b/hphp/test/slow/array_iterator/441.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/441.php.opts
rename to hphp/test/slow/array_iterator/441.php.opts
diff --git a/hphp/test/tcr/array_iterator/442.php b/hphp/test/slow/array_iterator/442.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/442.php
rename to hphp/test/slow/array_iterator/442.php
diff --git a/hphp/test/tcr/array_iterator/442.php.expect b/hphp/test/slow/array_iterator/442.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/442.php.expect
rename to hphp/test/slow/array_iterator/442.php.expect
diff --git a/hphp/test/tcr/array_iterator/442.php.hphp_opts b/hphp/test/slow/array_iterator/442.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/442.php.hphp_opts
rename to hphp/test/slow/array_iterator/442.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/442.php.opts b/hphp/test/slow/array_iterator/442.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/442.php.opts
rename to hphp/test/slow/array_iterator/442.php.opts
diff --git a/hphp/test/tcr/array_iterator/443.php b/hphp/test/slow/array_iterator/443.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/443.php
rename to hphp/test/slow/array_iterator/443.php
diff --git a/hphp/test/tcr/array_iterator/443.php.expect b/hphp/test/slow/array_iterator/443.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/443.php.expect
rename to hphp/test/slow/array_iterator/443.php.expect
diff --git a/hphp/test/tcr/array_iterator/443.php.hphp_opts b/hphp/test/slow/array_iterator/443.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/443.php.hphp_opts
rename to hphp/test/slow/array_iterator/443.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/443.php.opts b/hphp/test/slow/array_iterator/443.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/443.php.opts
rename to hphp/test/slow/array_iterator/443.php.opts
diff --git a/hphp/test/tcr/array_iterator/444.php b/hphp/test/slow/array_iterator/444.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/444.php
rename to hphp/test/slow/array_iterator/444.php
diff --git a/hphp/test/tcr/array_iterator/444.php.expect b/hphp/test/slow/array_iterator/444.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/444.php.expect
rename to hphp/test/slow/array_iterator/444.php.expect
diff --git a/hphp/test/tcr/array_iterator/444.php.hphp_opts b/hphp/test/slow/array_iterator/444.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/444.php.hphp_opts
rename to hphp/test/slow/array_iterator/444.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/444.php.opts b/hphp/test/slow/array_iterator/444.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/444.php.opts
rename to hphp/test/slow/array_iterator/444.php.opts
diff --git a/hphp/test/tcr/array_iterator/445.php b/hphp/test/slow/array_iterator/445.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/445.php
rename to hphp/test/slow/array_iterator/445.php
diff --git a/hphp/test/tcr/array_iterator/445.php.expect b/hphp/test/slow/array_iterator/445.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/445.php.expect
rename to hphp/test/slow/array_iterator/445.php.expect
diff --git a/hphp/test/tcr/array_iterator/445.php.hphp_opts b/hphp/test/slow/array_iterator/445.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/445.php.hphp_opts
rename to hphp/test/slow/array_iterator/445.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/445.php.opts b/hphp/test/slow/array_iterator/445.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/445.php.opts
rename to hphp/test/slow/array_iterator/445.php.opts
diff --git a/hphp/test/tcr/array_iterator/446.php b/hphp/test/slow/array_iterator/446.php
similarity index 100%
rename from hphp/test/tcr/array_iterator/446.php
rename to hphp/test/slow/array_iterator/446.php
diff --git a/hphp/test/tcr/array_iterator/446.php.expect b/hphp/test/slow/array_iterator/446.php.expect
similarity index 100%
rename from hphp/test/tcr/array_iterator/446.php.expect
rename to hphp/test/slow/array_iterator/446.php.expect
diff --git a/hphp/test/tcr/array_iterator/446.php.hphp_opts b/hphp/test/slow/array_iterator/446.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/446.php.hphp_opts
rename to hphp/test/slow/array_iterator/446.php.hphp_opts
diff --git a/hphp/test/tcr/array_iterator/446.php.opts b/hphp/test/slow/array_iterator/446.php.opts
similarity index 100%
rename from hphp/test/tcr/array_iterator/446.php.opts
rename to hphp/test/slow/array_iterator/446.php.opts
diff --git a/hphp/test/tcr/array_offset/418.php b/hphp/test/slow/array_offset/418.php
similarity index 100%
rename from hphp/test/tcr/array_offset/418.php
rename to hphp/test/slow/array_offset/418.php
diff --git a/hphp/test/tcr/compilation/1256.php.expect b/hphp/test/slow/array_offset/418.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1256.php.expect
rename to hphp/test/slow/array_offset/418.php.expect
diff --git a/hphp/test/tcr/array_offset/419.php b/hphp/test/slow/array_offset/419.php
similarity index 100%
rename from hphp/test/tcr/array_offset/419.php
rename to hphp/test/slow/array_offset/419.php
diff --git a/hphp/test/tcr/array_offset/419.php.expect b/hphp/test/slow/array_offset/419.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/419.php.expect
rename to hphp/test/slow/array_offset/419.php.expect
diff --git a/hphp/test/tcr/array_offset/420.php b/hphp/test/slow/array_offset/420.php
similarity index 100%
rename from hphp/test/tcr/array_offset/420.php
rename to hphp/test/slow/array_offset/420.php
diff --git a/hphp/test/tcr/array_offset/420.php.expect b/hphp/test/slow/array_offset/420.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/420.php.expect
rename to hphp/test/slow/array_offset/420.php.expect
diff --git a/hphp/test/tcr/array_offset/421.php b/hphp/test/slow/array_offset/421.php
similarity index 100%
rename from hphp/test/tcr/array_offset/421.php
rename to hphp/test/slow/array_offset/421.php
diff --git a/hphp/test/tcr/array_offset/421.php.expect b/hphp/test/slow/array_offset/421.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/421.php.expect
rename to hphp/test/slow/array_offset/421.php.expect
diff --git a/hphp/test/tcr/array_offset/422.php b/hphp/test/slow/array_offset/422.php
similarity index 100%
rename from hphp/test/tcr/array_offset/422.php
rename to hphp/test/slow/array_offset/422.php
diff --git a/hphp/test/tcr/array_offset/422.php.expect b/hphp/test/slow/array_offset/422.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/422.php.expect
rename to hphp/test/slow/array_offset/422.php.expect
diff --git a/hphp/test/tcr/array_offset/423.php b/hphp/test/slow/array_offset/423.php
similarity index 100%
rename from hphp/test/tcr/array_offset/423.php
rename to hphp/test/slow/array_offset/423.php
diff --git a/hphp/test/tcr/array_offset/423.php.expect b/hphp/test/slow/array_offset/423.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/423.php.expect
rename to hphp/test/slow/array_offset/423.php.expect
diff --git a/hphp/test/tcr/array_offset/424.php b/hphp/test/slow/array_offset/424.php
similarity index 100%
rename from hphp/test/tcr/array_offset/424.php
rename to hphp/test/slow/array_offset/424.php
diff --git a/hphp/test/tcr/array_offset/424.php.expect b/hphp/test/slow/array_offset/424.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/424.php.expect
rename to hphp/test/slow/array_offset/424.php.expect
diff --git a/hphp/test/tcr/array_offset/425.php b/hphp/test/slow/array_offset/425.php
similarity index 100%
rename from hphp/test/tcr/array_offset/425.php
rename to hphp/test/slow/array_offset/425.php
diff --git a/hphp/test/tcr/array_offset/425.php.expect b/hphp/test/slow/array_offset/425.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/425.php.expect
rename to hphp/test/slow/array_offset/425.php.expect
diff --git a/hphp/test/tcr/array_offset/426.php b/hphp/test/slow/array_offset/426.php
similarity index 100%
rename from hphp/test/tcr/array_offset/426.php
rename to hphp/test/slow/array_offset/426.php
diff --git a/hphp/test/tcr/array_offset/426.php.expect b/hphp/test/slow/array_offset/426.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/426.php.expect
rename to hphp/test/slow/array_offset/426.php.expect
diff --git a/hphp/test/tcr/array_offset/427.php b/hphp/test/slow/array_offset/427.php
similarity index 100%
rename from hphp/test/tcr/array_offset/427.php
rename to hphp/test/slow/array_offset/427.php
diff --git a/hphp/test/tcr/array_offset/427.php.expect b/hphp/test/slow/array_offset/427.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/427.php.expect
rename to hphp/test/slow/array_offset/427.php.expect
diff --git a/hphp/test/tcr/array_offset/428.php b/hphp/test/slow/array_offset/428.php
similarity index 100%
rename from hphp/test/tcr/array_offset/428.php
rename to hphp/test/slow/array_offset/428.php
diff --git a/hphp/test/tcr/array_offset/428.php.expect b/hphp/test/slow/array_offset/428.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/428.php.expect
rename to hphp/test/slow/array_offset/428.php.expect
diff --git a/hphp/test/tcr/array_offset/429.php b/hphp/test/slow/array_offset/429.php
similarity index 100%
rename from hphp/test/tcr/array_offset/429.php
rename to hphp/test/slow/array_offset/429.php
diff --git a/hphp/test/tcr/array_offset/429.php.expect b/hphp/test/slow/array_offset/429.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/429.php.expect
rename to hphp/test/slow/array_offset/429.php.expect
diff --git a/hphp/test/tcr/array_offset/430.php b/hphp/test/slow/array_offset/430.php
similarity index 100%
rename from hphp/test/tcr/array_offset/430.php
rename to hphp/test/slow/array_offset/430.php
diff --git a/hphp/test/tcr/array_offset/430.php.expect b/hphp/test/slow/array_offset/430.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/430.php.expect
rename to hphp/test/slow/array_offset/430.php.expect
diff --git a/hphp/test/tcr/array_offset/431.php b/hphp/test/slow/array_offset/431.php
similarity index 100%
rename from hphp/test/tcr/array_offset/431.php
rename to hphp/test/slow/array_offset/431.php
diff --git a/hphp/test/tcr/array_offset/431.php.expect b/hphp/test/slow/array_offset/431.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/431.php.expect
rename to hphp/test/slow/array_offset/431.php.expect
diff --git a/hphp/test/tcr/array_offset/432.php b/hphp/test/slow/array_offset/432.php
similarity index 100%
rename from hphp/test/tcr/array_offset/432.php
rename to hphp/test/slow/array_offset/432.php
diff --git a/hphp/test/tcr/array_offset/432.php.expect b/hphp/test/slow/array_offset/432.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/432.php.expect
rename to hphp/test/slow/array_offset/432.php.expect
diff --git a/hphp/test/tcr/array_offset/433.php b/hphp/test/slow/array_offset/433.php
similarity index 100%
rename from hphp/test/tcr/array_offset/433.php
rename to hphp/test/slow/array_offset/433.php
diff --git a/hphp/test/tcr/array_offset/433.php.expect b/hphp/test/slow/array_offset/433.php.expect
similarity index 100%
rename from hphp/test/tcr/array_offset/433.php.expect
rename to hphp/test/slow/array_offset/433.php.expect
diff --git a/hphp/test/tcr/assert_options/1372.php b/hphp/test/slow/assert_options/1372.php
similarity index 100%
rename from hphp/test/tcr/assert_options/1372.php
rename to hphp/test/slow/assert_options/1372.php
diff --git a/hphp/test/tcr/assert_options/1372.php.expect b/hphp/test/slow/assert_options/1372.php.expect
similarity index 100%
rename from hphp/test/tcr/assert_options/1372.php.expect
rename to hphp/test/slow/assert_options/1372.php.expect
diff --git a/hphp/test/tcr/assignment/1703.php b/hphp/test/slow/assignment/1703.php
similarity index 100%
rename from hphp/test/tcr/assignment/1703.php
rename to hphp/test/slow/assignment/1703.php
diff --git a/hphp/test/tcr/assignment/1703.php.expect b/hphp/test/slow/assignment/1703.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1703.php.expect
rename to hphp/test/slow/assignment/1703.php.expect
diff --git a/hphp/test/tcr/assignment/1704.php b/hphp/test/slow/assignment/1704.php
similarity index 100%
rename from hphp/test/tcr/assignment/1704.php
rename to hphp/test/slow/assignment/1704.php
diff --git a/hphp/test/tcr/assignment/1704.php.expect b/hphp/test/slow/assignment/1704.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1704.php.expect
rename to hphp/test/slow/assignment/1704.php.expect
diff --git a/hphp/test/tcr/assignment/1705.php b/hphp/test/slow/assignment/1705.php
similarity index 100%
rename from hphp/test/tcr/assignment/1705.php
rename to hphp/test/slow/assignment/1705.php
diff --git a/hphp/test/tcr/assignment/1705.php.expect b/hphp/test/slow/assignment/1705.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1705.php.expect
rename to hphp/test/slow/assignment/1705.php.expect
diff --git a/hphp/test/tcr/assignment/1706.php b/hphp/test/slow/assignment/1706.php
similarity index 100%
rename from hphp/test/tcr/assignment/1706.php
rename to hphp/test/slow/assignment/1706.php
diff --git a/hphp/test/tcr/assignment/1706.php.expect b/hphp/test/slow/assignment/1706.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1706.php.expect
rename to hphp/test/slow/assignment/1706.php.expect
diff --git a/hphp/test/tcr/assignment/1707.php b/hphp/test/slow/assignment/1707.php
similarity index 100%
rename from hphp/test/tcr/assignment/1707.php
rename to hphp/test/slow/assignment/1707.php
diff --git a/hphp/test/tcr/assignment/1707.php.expect b/hphp/test/slow/assignment/1707.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1707.php.expect
rename to hphp/test/slow/assignment/1707.php.expect
diff --git a/hphp/test/tcr/assignment/1708.php b/hphp/test/slow/assignment/1708.php
similarity index 100%
rename from hphp/test/tcr/assignment/1708.php
rename to hphp/test/slow/assignment/1708.php
diff --git a/hphp/test/tcr/assignment/1708.php.expect b/hphp/test/slow/assignment/1708.php.expect
similarity index 100%
rename from hphp/test/tcr/assignment/1708.php.expect
rename to hphp/test/slow/assignment/1708.php.expect
diff --git a/hphp/test/tcr/auto_inline_5.hphp_opts b/hphp/test/slow/auto_inline_5.hphp_opts
similarity index 100%
rename from hphp/test/tcr/auto_inline_5.hphp_opts
rename to hphp/test/slow/auto_inline_5.hphp_opts
diff --git a/hphp/test/tcr/bad_function_calls/1709.php b/hphp/test/slow/bad_function_calls/1709.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1709.php
rename to hphp/test/slow/bad_function_calls/1709.php
diff --git a/hphp/test/tcr/compilation/1257.php.expect b/hphp/test/slow/bad_function_calls/1709.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1257.php.expect
rename to hphp/test/slow/bad_function_calls/1709.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1710.php b/hphp/test/slow/bad_function_calls/1710.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1710.php
rename to hphp/test/slow/bad_function_calls/1710.php
diff --git a/hphp/test/tcr/bad_function_calls/1710.php.expect b/hphp/test/slow/bad_function_calls/1710.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1710.php.expect
rename to hphp/test/slow/bad_function_calls/1710.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1711.php b/hphp/test/slow/bad_function_calls/1711.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1711.php
rename to hphp/test/slow/bad_function_calls/1711.php
diff --git a/hphp/test/tcr/bad_function_calls/1711.php.expect b/hphp/test/slow/bad_function_calls/1711.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1711.php.expect
rename to hphp/test/slow/bad_function_calls/1711.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1712.php b/hphp/test/slow/bad_function_calls/1712.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1712.php
rename to hphp/test/slow/bad_function_calls/1712.php
diff --git a/hphp/test/tcr/compilation/1258.php.expect b/hphp/test/slow/bad_function_calls/1712.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1258.php.expect
rename to hphp/test/slow/bad_function_calls/1712.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1713.php b/hphp/test/slow/bad_function_calls/1713.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1713.php
rename to hphp/test/slow/bad_function_calls/1713.php
diff --git a/hphp/test/tcr/bad_function_calls/1713.php.expect b/hphp/test/slow/bad_function_calls/1713.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1713.php.expect
rename to hphp/test/slow/bad_function_calls/1713.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1714.php b/hphp/test/slow/bad_function_calls/1714.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1714.php
rename to hphp/test/slow/bad_function_calls/1714.php
diff --git a/hphp/test/tcr/bad_function_calls/1714.php.expect b/hphp/test/slow/bad_function_calls/1714.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1714.php.expect
rename to hphp/test/slow/bad_function_calls/1714.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1715.php b/hphp/test/slow/bad_function_calls/1715.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1715.php
rename to hphp/test/slow/bad_function_calls/1715.php
diff --git a/hphp/test/tcr/bad_function_calls/1715.php.expect b/hphp/test/slow/bad_function_calls/1715.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1715.php.expect
rename to hphp/test/slow/bad_function_calls/1715.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1716.php b/hphp/test/slow/bad_function_calls/1716.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1716.php
rename to hphp/test/slow/bad_function_calls/1716.php
diff --git a/hphp/test/tcr/bad_function_calls/1716.php.expect b/hphp/test/slow/bad_function_calls/1716.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1716.php.expect
rename to hphp/test/slow/bad_function_calls/1716.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1717.php b/hphp/test/slow/bad_function_calls/1717.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1717.php
rename to hphp/test/slow/bad_function_calls/1717.php
diff --git a/hphp/test/tcr/bad_function_calls/1717.php.expect b/hphp/test/slow/bad_function_calls/1717.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1717.php.expect
rename to hphp/test/slow/bad_function_calls/1717.php.expect
diff --git a/hphp/test/tcr/bad_function_calls/1718.php b/hphp/test/slow/bad_function_calls/1718.php
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1718.php
rename to hphp/test/slow/bad_function_calls/1718.php
diff --git a/hphp/test/tcr/bad_function_calls/1718.php.expect b/hphp/test/slow/bad_function_calls/1718.php.expect
similarity index 100%
rename from hphp/test/tcr/bad_function_calls/1718.php.expect
rename to hphp/test/slow/bad_function_calls/1718.php.expect
diff --git a/hphp/test/tcr/boolean/81.php b/hphp/test/slow/boolean/81.php
similarity index 100%
rename from hphp/test/tcr/boolean/81.php
rename to hphp/test/slow/boolean/81.php
diff --git a/hphp/test/tcr/boolean/81.php.expect b/hphp/test/slow/boolean/81.php.expect
similarity index 100%
rename from hphp/test/tcr/boolean/81.php.expect
rename to hphp/test/slow/boolean/81.php.expect
diff --git a/hphp/test/tcr/boolean/82.php b/hphp/test/slow/boolean/82.php
similarity index 100%
rename from hphp/test/tcr/boolean/82.php
rename to hphp/test/slow/boolean/82.php
diff --git a/hphp/test/tcr/boolean/82.php.expect b/hphp/test/slow/boolean/82.php.expect
similarity index 100%
rename from hphp/test/tcr/boolean/82.php.expect
rename to hphp/test/slow/boolean/82.php.expect
diff --git a/hphp/test/tcr/boolean/83.php b/hphp/test/slow/boolean/83.php
similarity index 100%
rename from hphp/test/tcr/boolean/83.php
rename to hphp/test/slow/boolean/83.php
diff --git a/hphp/test/tcr/boolean/83.php.expect b/hphp/test/slow/boolean/83.php.expect
similarity index 100%
rename from hphp/test/tcr/boolean/83.php.expect
rename to hphp/test/slow/boolean/83.php.expect
diff --git a/hphp/test/tcr/break_statement/1415.php b/hphp/test/slow/break_statement/1415.php
similarity index 100%
rename from hphp/test/tcr/break_statement/1415.php
rename to hphp/test/slow/break_statement/1415.php
diff --git a/hphp/test/tcr/break_statement/1415.php.expect b/hphp/test/slow/break_statement/1415.php.expect
similarity index 100%
rename from hphp/test/tcr/break_statement/1415.php.expect
rename to hphp/test/slow/break_statement/1415.php.expect
diff --git a/hphp/test/tcr/call_static/1889.php b/hphp/test/slow/call_static/1889.php
similarity index 100%
rename from hphp/test/tcr/call_static/1889.php
rename to hphp/test/slow/call_static/1889.php
diff --git a/hphp/test/tcr/call_static/1889.php.expect b/hphp/test/slow/call_static/1889.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1889.php.expect
rename to hphp/test/slow/call_static/1889.php.expect
diff --git a/hphp/test/tcr/call_static/1890.php b/hphp/test/slow/call_static/1890.php
similarity index 100%
rename from hphp/test/tcr/call_static/1890.php
rename to hphp/test/slow/call_static/1890.php
diff --git a/hphp/test/tcr/call_static/1890.php.expect b/hphp/test/slow/call_static/1890.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1890.php.expect
rename to hphp/test/slow/call_static/1890.php.expect
diff --git a/hphp/test/tcr/call_static/1891.php b/hphp/test/slow/call_static/1891.php
similarity index 100%
rename from hphp/test/tcr/call_static/1891.php
rename to hphp/test/slow/call_static/1891.php
diff --git a/hphp/test/tcr/call_static/1891.php.expect b/hphp/test/slow/call_static/1891.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1891.php.expect
rename to hphp/test/slow/call_static/1891.php.expect
diff --git a/hphp/test/tcr/call_static/1892.php b/hphp/test/slow/call_static/1892.php
similarity index 100%
rename from hphp/test/tcr/call_static/1892.php
rename to hphp/test/slow/call_static/1892.php
diff --git a/hphp/test/tcr/call_static/1892.php.expect b/hphp/test/slow/call_static/1892.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1892.php.expect
rename to hphp/test/slow/call_static/1892.php.expect
diff --git a/hphp/test/tcr/call_static/1893.php b/hphp/test/slow/call_static/1893.php
similarity index 100%
rename from hphp/test/tcr/call_static/1893.php
rename to hphp/test/slow/call_static/1893.php
diff --git a/hphp/test/tcr/call_static/1893.php.expect b/hphp/test/slow/call_static/1893.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1893.php.expect
rename to hphp/test/slow/call_static/1893.php.expect
diff --git a/hphp/test/tcr/call_static/1894.php b/hphp/test/slow/call_static/1894.php
similarity index 100%
rename from hphp/test/tcr/call_static/1894.php
rename to hphp/test/slow/call_static/1894.php
diff --git a/hphp/test/tcr/call_static/1894.php.expect b/hphp/test/slow/call_static/1894.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1894.php.expect
rename to hphp/test/slow/call_static/1894.php.expect
diff --git a/hphp/test/tcr/call_static/1895.php b/hphp/test/slow/call_static/1895.php
similarity index 100%
rename from hphp/test/tcr/call_static/1895.php
rename to hphp/test/slow/call_static/1895.php
diff --git a/hphp/test/tcr/call_static/1895.php.expect b/hphp/test/slow/call_static/1895.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1895.php.expect
rename to hphp/test/slow/call_static/1895.php.expect
diff --git a/hphp/test/tcr/call_static/1896.php b/hphp/test/slow/call_static/1896.php
similarity index 100%
rename from hphp/test/tcr/call_static/1896.php
rename to hphp/test/slow/call_static/1896.php
diff --git a/hphp/test/tcr/call_static/1896.php.expect b/hphp/test/slow/call_static/1896.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1896.php.expect
rename to hphp/test/slow/call_static/1896.php.expect
diff --git a/hphp/test/tcr/call_static/1897.php b/hphp/test/slow/call_static/1897.php
similarity index 100%
rename from hphp/test/tcr/call_static/1897.php
rename to hphp/test/slow/call_static/1897.php
diff --git a/hphp/test/tcr/call_static/1897.php.expect b/hphp/test/slow/call_static/1897.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1897.php.expect
rename to hphp/test/slow/call_static/1897.php.expect
diff --git a/hphp/test/tcr/call_static/1898.php b/hphp/test/slow/call_static/1898.php
similarity index 100%
rename from hphp/test/tcr/call_static/1898.php
rename to hphp/test/slow/call_static/1898.php
diff --git a/hphp/test/tcr/call_static/1898.php.expect b/hphp/test/slow/call_static/1898.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1898.php.expect
rename to hphp/test/slow/call_static/1898.php.expect
diff --git a/hphp/test/tcr/call_static/1899.php b/hphp/test/slow/call_static/1899.php
similarity index 100%
rename from hphp/test/tcr/call_static/1899.php
rename to hphp/test/slow/call_static/1899.php
diff --git a/hphp/test/tcr/call_static/1899.php.expect b/hphp/test/slow/call_static/1899.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1899.php.expect
rename to hphp/test/slow/call_static/1899.php.expect
diff --git a/hphp/test/tcr/call_static/1900.php b/hphp/test/slow/call_static/1900.php
similarity index 100%
rename from hphp/test/tcr/call_static/1900.php
rename to hphp/test/slow/call_static/1900.php
diff --git a/hphp/test/tcr/call_static/1900.php.expect b/hphp/test/slow/call_static/1900.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1900.php.expect
rename to hphp/test/slow/call_static/1900.php.expect
diff --git a/hphp/test/tcr/call_static/1901.php b/hphp/test/slow/call_static/1901.php
similarity index 100%
rename from hphp/test/tcr/call_static/1901.php
rename to hphp/test/slow/call_static/1901.php
diff --git a/hphp/test/tcr/call_static/1901.php.expect b/hphp/test/slow/call_static/1901.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1901.php.expect
rename to hphp/test/slow/call_static/1901.php.expect
diff --git a/hphp/test/tcr/call_static/1902.php b/hphp/test/slow/call_static/1902.php
similarity index 100%
rename from hphp/test/tcr/call_static/1902.php
rename to hphp/test/slow/call_static/1902.php
diff --git a/hphp/test/tcr/call_static/1902.php.expect b/hphp/test/slow/call_static/1902.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1902.php.expect
rename to hphp/test/slow/call_static/1902.php.expect
diff --git a/hphp/test/tcr/call_static/1903.php b/hphp/test/slow/call_static/1903.php
similarity index 100%
rename from hphp/test/tcr/call_static/1903.php
rename to hphp/test/slow/call_static/1903.php
diff --git a/hphp/test/tcr/call_static/1903.php.expect b/hphp/test/slow/call_static/1903.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1903.php.expect
rename to hphp/test/slow/call_static/1903.php.expect
diff --git a/hphp/test/tcr/call_static/1904.php b/hphp/test/slow/call_static/1904.php
similarity index 100%
rename from hphp/test/tcr/call_static/1904.php
rename to hphp/test/slow/call_static/1904.php
diff --git a/hphp/test/tcr/call_static/1904.php.expect b/hphp/test/slow/call_static/1904.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1904.php.expect
rename to hphp/test/slow/call_static/1904.php.expect
diff --git a/hphp/test/tcr/call_static/1905.php b/hphp/test/slow/call_static/1905.php
similarity index 100%
rename from hphp/test/tcr/call_static/1905.php
rename to hphp/test/slow/call_static/1905.php
diff --git a/hphp/test/tcr/call_static/1905.php.expect b/hphp/test/slow/call_static/1905.php.expect
similarity index 100%
rename from hphp/test/tcr/call_static/1905.php.expect
rename to hphp/test/slow/call_static/1905.php.expect
diff --git a/hphp/test/tcr/class_constant/1604.php b/hphp/test/slow/class_constant/1604.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1604.php
rename to hphp/test/slow/class_constant/1604.php
diff --git a/hphp/test/tcr/class_constant/1604.php.expect b/hphp/test/slow/class_constant/1604.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1604.php.expect
rename to hphp/test/slow/class_constant/1604.php.expect
diff --git a/hphp/test/tcr/class_constant/1605.php b/hphp/test/slow/class_constant/1605.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1605.php
rename to hphp/test/slow/class_constant/1605.php
diff --git a/hphp/test/tcr/class_constant/1605.php.expect b/hphp/test/slow/class_constant/1605.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1605.php.expect
rename to hphp/test/slow/class_constant/1605.php.expect
diff --git a/hphp/test/tcr/class_constant/1606.php b/hphp/test/slow/class_constant/1606.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1606.php
rename to hphp/test/slow/class_constant/1606.php
diff --git a/hphp/test/tcr/class_constant/1606.php.expect b/hphp/test/slow/class_constant/1606.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1606.php.expect
rename to hphp/test/slow/class_constant/1606.php.expect
diff --git a/hphp/test/tcr/class_constant/1607.php b/hphp/test/slow/class_constant/1607.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1607.php
rename to hphp/test/slow/class_constant/1607.php
diff --git a/hphp/test/tcr/class_constant/1607.php.expect b/hphp/test/slow/class_constant/1607.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1607.php.expect
rename to hphp/test/slow/class_constant/1607.php.expect
diff --git a/hphp/test/tcr/class_constant/1608.php b/hphp/test/slow/class_constant/1608.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1608.php
rename to hphp/test/slow/class_constant/1608.php
diff --git a/hphp/test/tcr/compilation/1259.php.expect b/hphp/test/slow/class_constant/1608.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1259.php.expect
rename to hphp/test/slow/class_constant/1608.php.expect
diff --git a/hphp/test/tcr/class_constant/1609.php b/hphp/test/slow/class_constant/1609.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1609.php
rename to hphp/test/slow/class_constant/1609.php
diff --git a/hphp/test/tcr/class_constant/1609.php.expect b/hphp/test/slow/class_constant/1609.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1609.php.expect
rename to hphp/test/slow/class_constant/1609.php.expect
diff --git a/hphp/test/tcr/class_constant/1610.php b/hphp/test/slow/class_constant/1610.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1610.php
rename to hphp/test/slow/class_constant/1610.php
diff --git a/hphp/test/tcr/class_constant/1610.php.expect b/hphp/test/slow/class_constant/1610.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1610.php.expect
rename to hphp/test/slow/class_constant/1610.php.expect
diff --git a/hphp/test/tcr/class_constant/1611.php b/hphp/test/slow/class_constant/1611.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1611.php
rename to hphp/test/slow/class_constant/1611.php
diff --git a/hphp/test/tcr/class_constant/1611.php.expect b/hphp/test/slow/class_constant/1611.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1611.php.expect
rename to hphp/test/slow/class_constant/1611.php.expect
diff --git a/hphp/test/tcr/class_constant/1612.php b/hphp/test/slow/class_constant/1612.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1612.php
rename to hphp/test/slow/class_constant/1612.php
diff --git a/hphp/test/tcr/class_constant/1612.php.expect b/hphp/test/slow/class_constant/1612.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1612.php.expect
rename to hphp/test/slow/class_constant/1612.php.expect
diff --git a/hphp/test/tcr/class_constant/1613.php b/hphp/test/slow/class_constant/1613.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1613.php
rename to hphp/test/slow/class_constant/1613.php
diff --git a/hphp/test/tcr/class_constant/1613.php.expect b/hphp/test/slow/class_constant/1613.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1613.php.expect
rename to hphp/test/slow/class_constant/1613.php.expect
diff --git a/hphp/test/tcr/class_constant/1614.php b/hphp/test/slow/class_constant/1614.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1614.php
rename to hphp/test/slow/class_constant/1614.php
diff --git a/hphp/test/tcr/class_constant/1614.php.expect b/hphp/test/slow/class_constant/1614.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1614.php.expect
rename to hphp/test/slow/class_constant/1614.php.expect
diff --git a/hphp/test/tcr/class_constant/1615.php b/hphp/test/slow/class_constant/1615.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1615.php
rename to hphp/test/slow/class_constant/1615.php
diff --git a/hphp/test/tcr/class_constant/1615.php.expect b/hphp/test/slow/class_constant/1615.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1615.php.expect
rename to hphp/test/slow/class_constant/1615.php.expect
diff --git a/hphp/test/tcr/class_constant/1616.php b/hphp/test/slow/class_constant/1616.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1616.php
rename to hphp/test/slow/class_constant/1616.php
diff --git a/hphp/test/tcr/class_constant/1616.php.expect b/hphp/test/slow/class_constant/1616.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1616.php.expect
rename to hphp/test/slow/class_constant/1616.php.expect
diff --git a/hphp/test/tcr/class_constant/1617.php b/hphp/test/slow/class_constant/1617.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1617.php
rename to hphp/test/slow/class_constant/1617.php
diff --git a/hphp/test/tcr/class_constant/1617.php.expect b/hphp/test/slow/class_constant/1617.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1617.php.expect
rename to hphp/test/slow/class_constant/1617.php.expect
diff --git a/hphp/test/tcr/class_constant/1618.php b/hphp/test/slow/class_constant/1618.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1618.php
rename to hphp/test/slow/class_constant/1618.php
diff --git a/hphp/test/tcr/class_constant/1618.php.expect b/hphp/test/slow/class_constant/1618.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1618.php.expect
rename to hphp/test/slow/class_constant/1618.php.expect
diff --git a/hphp/test/tcr/class_constant/1619.php b/hphp/test/slow/class_constant/1619.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1619.php
rename to hphp/test/slow/class_constant/1619.php
diff --git a/hphp/test/tcr/class_constant/1619.php.expect b/hphp/test/slow/class_constant/1619.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1619.php.expect
rename to hphp/test/slow/class_constant/1619.php.expect
diff --git a/hphp/test/tcr/class_constant/1620.php b/hphp/test/slow/class_constant/1620.php
similarity index 100%
rename from hphp/test/tcr/class_constant/1620.php
rename to hphp/test/slow/class_constant/1620.php
diff --git a/hphp/test/tcr/class_constant/1620.php.expect b/hphp/test/slow/class_constant/1620.php.expect
similarity index 100%
rename from hphp/test/tcr/class_constant/1620.php.expect
rename to hphp/test/slow/class_constant/1620.php.expect
diff --git a/hphp/test/tcr/class_method/738.php b/hphp/test/slow/class_method/738.php
similarity index 100%
rename from hphp/test/tcr/class_method/738.php
rename to hphp/test/slow/class_method/738.php
diff --git a/hphp/test/tcr/class_method/738.php.expect b/hphp/test/slow/class_method/738.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/738.php.expect
rename to hphp/test/slow/class_method/738.php.expect
diff --git a/hphp/test/tcr/class_method/739.php b/hphp/test/slow/class_method/739.php
similarity index 100%
rename from hphp/test/tcr/class_method/739.php
rename to hphp/test/slow/class_method/739.php
diff --git a/hphp/test/tcr/class_method/739.php.expect b/hphp/test/slow/class_method/739.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/739.php.expect
rename to hphp/test/slow/class_method/739.php.expect
diff --git a/hphp/test/tcr/class_method/740.php b/hphp/test/slow/class_method/740.php
similarity index 100%
rename from hphp/test/tcr/class_method/740.php
rename to hphp/test/slow/class_method/740.php
diff --git a/hphp/test/tcr/class_method/740.php.expect b/hphp/test/slow/class_method/740.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/740.php.expect
rename to hphp/test/slow/class_method/740.php.expect
diff --git a/hphp/test/tcr/class_method/741.php b/hphp/test/slow/class_method/741.php
similarity index 100%
rename from hphp/test/tcr/class_method/741.php
rename to hphp/test/slow/class_method/741.php
diff --git a/hphp/test/tcr/class_method/741.php.expect b/hphp/test/slow/class_method/741.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/741.php.expect
rename to hphp/test/slow/class_method/741.php.expect
diff --git a/hphp/test/tcr/class_method/742.php b/hphp/test/slow/class_method/742.php
similarity index 100%
rename from hphp/test/tcr/class_method/742.php
rename to hphp/test/slow/class_method/742.php
diff --git a/hphp/test/tcr/class_method/742.php.expect b/hphp/test/slow/class_method/742.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/742.php.expect
rename to hphp/test/slow/class_method/742.php.expect
diff --git a/hphp/test/tcr/class_method/743.php b/hphp/test/slow/class_method/743.php
similarity index 100%
rename from hphp/test/tcr/class_method/743.php
rename to hphp/test/slow/class_method/743.php
diff --git a/hphp/test/tcr/class_method/743.php.expect b/hphp/test/slow/class_method/743.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/743.php.expect
rename to hphp/test/slow/class_method/743.php.expect
diff --git a/hphp/test/tcr/class_method/744.php b/hphp/test/slow/class_method/744.php
similarity index 100%
rename from hphp/test/tcr/class_method/744.php
rename to hphp/test/slow/class_method/744.php
diff --git a/hphp/test/tcr/class_method/744.php.expect b/hphp/test/slow/class_method/744.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/744.php.expect
rename to hphp/test/slow/class_method/744.php.expect
diff --git a/hphp/test/tcr/class_method/745.php b/hphp/test/slow/class_method/745.php
similarity index 100%
rename from hphp/test/tcr/class_method/745.php
rename to hphp/test/slow/class_method/745.php
diff --git a/hphp/test/tcr/class_method/745.php.expect b/hphp/test/slow/class_method/745.php.expect
similarity index 100%
rename from hphp/test/tcr/class_method/745.php.expect
rename to hphp/test/slow/class_method/745.php.expect
diff --git a/hphp/test/tcr/clone/1497.php b/hphp/test/slow/clone/1497.php
similarity index 100%
rename from hphp/test/tcr/clone/1497.php
rename to hphp/test/slow/clone/1497.php
diff --git a/hphp/test/tcr/clone/1497.php.expect b/hphp/test/slow/clone/1497.php.expect
similarity index 100%
rename from hphp/test/tcr/clone/1497.php.expect
rename to hphp/test/slow/clone/1497.php.expect
diff --git a/hphp/test/tcr/clone/1498.php b/hphp/test/slow/clone/1498.php
similarity index 100%
rename from hphp/test/tcr/clone/1498.php
rename to hphp/test/slow/clone/1498.php
diff --git a/hphp/test/tcr/clone/1498.php.expect b/hphp/test/slow/clone/1498.php.expect
similarity index 100%
rename from hphp/test/tcr/clone/1498.php.expect
rename to hphp/test/slow/clone/1498.php.expect
diff --git a/hphp/test/tcr/closure/1918.php b/hphp/test/slow/closure/1918.php
similarity index 100%
rename from hphp/test/tcr/closure/1918.php
rename to hphp/test/slow/closure/1918.php
diff --git a/hphp/test/tcr/closure/1918.php.expect b/hphp/test/slow/closure/1918.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1918.php.expect
rename to hphp/test/slow/closure/1918.php.expect
diff --git a/hphp/test/tcr/closure/1919.php b/hphp/test/slow/closure/1919.php
similarity index 100%
rename from hphp/test/tcr/closure/1919.php
rename to hphp/test/slow/closure/1919.php
diff --git a/hphp/test/tcr/closure/1919.php.expect b/hphp/test/slow/closure/1919.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1919.php.expect
rename to hphp/test/slow/closure/1919.php.expect
diff --git a/hphp/test/tcr/closure/1920.php b/hphp/test/slow/closure/1920.php
similarity index 100%
rename from hphp/test/tcr/closure/1920.php
rename to hphp/test/slow/closure/1920.php
diff --git a/hphp/test/tcr/closure/1920.php.expect b/hphp/test/slow/closure/1920.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1920.php.expect
rename to hphp/test/slow/closure/1920.php.expect
diff --git a/hphp/test/tcr/closure/1921.php b/hphp/test/slow/closure/1921.php
similarity index 100%
rename from hphp/test/tcr/closure/1921.php
rename to hphp/test/slow/closure/1921.php
diff --git a/hphp/test/tcr/closure/1921.php.expect b/hphp/test/slow/closure/1921.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1921.php.expect
rename to hphp/test/slow/closure/1921.php.expect
diff --git a/hphp/test/tcr/closure/1922.php b/hphp/test/slow/closure/1922.php
similarity index 100%
rename from hphp/test/tcr/closure/1922.php
rename to hphp/test/slow/closure/1922.php
diff --git a/hphp/test/tcr/closure/1922.php.expect b/hphp/test/slow/closure/1922.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1922.php.expect
rename to hphp/test/slow/closure/1922.php.expect
diff --git a/hphp/test/tcr/closure/1923.php b/hphp/test/slow/closure/1923.php
similarity index 100%
rename from hphp/test/tcr/closure/1923.php
rename to hphp/test/slow/closure/1923.php
diff --git a/hphp/test/tcr/closure/1923.php.expect b/hphp/test/slow/closure/1923.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1923.php.expect
rename to hphp/test/slow/closure/1923.php.expect
diff --git a/hphp/test/tcr/closure/1924.php b/hphp/test/slow/closure/1924.php
similarity index 100%
rename from hphp/test/tcr/closure/1924.php
rename to hphp/test/slow/closure/1924.php
diff --git a/hphp/test/tcr/closure/1924.php.expect b/hphp/test/slow/closure/1924.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1924.php.expect
rename to hphp/test/slow/closure/1924.php.expect
diff --git a/hphp/test/tcr/closure/1925.php b/hphp/test/slow/closure/1925.php
similarity index 100%
rename from hphp/test/tcr/closure/1925.php
rename to hphp/test/slow/closure/1925.php
diff --git a/hphp/test/tcr/closure/1925.php.expect b/hphp/test/slow/closure/1925.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1925.php.expect
rename to hphp/test/slow/closure/1925.php.expect
diff --git a/hphp/test/tcr/closure/1926.php b/hphp/test/slow/closure/1926.php
similarity index 100%
rename from hphp/test/tcr/closure/1926.php
rename to hphp/test/slow/closure/1926.php
diff --git a/hphp/test/tcr/closure/1926.php.expect b/hphp/test/slow/closure/1926.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1926.php.expect
rename to hphp/test/slow/closure/1926.php.expect
diff --git a/hphp/test/tcr/closure/1927.php b/hphp/test/slow/closure/1927.php
similarity index 100%
rename from hphp/test/tcr/closure/1927.php
rename to hphp/test/slow/closure/1927.php
diff --git a/hphp/test/tcr/closure/1927.php.expect b/hphp/test/slow/closure/1927.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1927.php.expect
rename to hphp/test/slow/closure/1927.php.expect
diff --git a/hphp/test/tcr/closure/1928.php b/hphp/test/slow/closure/1928.php
similarity index 100%
rename from hphp/test/tcr/closure/1928.php
rename to hphp/test/slow/closure/1928.php
diff --git a/hphp/test/tcr/closure/1928.php.expect b/hphp/test/slow/closure/1928.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1928.php.expect
rename to hphp/test/slow/closure/1928.php.expect
diff --git a/hphp/test/tcr/closure/1929.php b/hphp/test/slow/closure/1929.php
similarity index 100%
rename from hphp/test/tcr/closure/1929.php
rename to hphp/test/slow/closure/1929.php
diff --git a/hphp/test/tcr/closure/1929.php.expect b/hphp/test/slow/closure/1929.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1929.php.expect
rename to hphp/test/slow/closure/1929.php.expect
diff --git a/hphp/test/tcr/closure/1930.php b/hphp/test/slow/closure/1930.php
similarity index 100%
rename from hphp/test/tcr/closure/1930.php
rename to hphp/test/slow/closure/1930.php
diff --git a/hphp/test/tcr/closure/1930.php.expect b/hphp/test/slow/closure/1930.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1930.php.expect
rename to hphp/test/slow/closure/1930.php.expect
diff --git a/hphp/test/tcr/closure/1931.php b/hphp/test/slow/closure/1931.php
similarity index 100%
rename from hphp/test/tcr/closure/1931.php
rename to hphp/test/slow/closure/1931.php
diff --git a/hphp/test/tcr/closure/1931.php.expect b/hphp/test/slow/closure/1931.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1931.php.expect
rename to hphp/test/slow/closure/1931.php.expect
diff --git a/hphp/test/tcr/closure/1932.php b/hphp/test/slow/closure/1932.php
similarity index 100%
rename from hphp/test/tcr/closure/1932.php
rename to hphp/test/slow/closure/1932.php
diff --git a/hphp/test/tcr/closure/1932.php.expect b/hphp/test/slow/closure/1932.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1932.php.expect
rename to hphp/test/slow/closure/1932.php.expect
diff --git a/hphp/test/tcr/closure/1933.php b/hphp/test/slow/closure/1933.php
similarity index 100%
rename from hphp/test/tcr/closure/1933.php
rename to hphp/test/slow/closure/1933.php
diff --git a/hphp/test/tcr/compilation/1260.php.expect b/hphp/test/slow/closure/1933.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1260.php.expect
rename to hphp/test/slow/closure/1933.php.expect
diff --git a/hphp/test/tcr/closure/1934.php b/hphp/test/slow/closure/1934.php
similarity index 100%
rename from hphp/test/tcr/closure/1934.php
rename to hphp/test/slow/closure/1934.php
diff --git a/hphp/test/tcr/closure/1934.php.expect b/hphp/test/slow/closure/1934.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1934.php.expect
rename to hphp/test/slow/closure/1934.php.expect
diff --git a/hphp/test/tcr/closure/1935.php b/hphp/test/slow/closure/1935.php
similarity index 100%
rename from hphp/test/tcr/closure/1935.php
rename to hphp/test/slow/closure/1935.php
diff --git a/hphp/test/tcr/closure/1935.php.expect b/hphp/test/slow/closure/1935.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1935.php.expect
rename to hphp/test/slow/closure/1935.php.expect
diff --git a/hphp/test/tcr/closure/1936.php b/hphp/test/slow/closure/1936.php
similarity index 100%
rename from hphp/test/tcr/closure/1936.php
rename to hphp/test/slow/closure/1936.php
diff --git a/hphp/test/tcr/closure/1936.php.expect b/hphp/test/slow/closure/1936.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1936.php.expect
rename to hphp/test/slow/closure/1936.php.expect
diff --git a/hphp/test/tcr/closure/1937.php b/hphp/test/slow/closure/1937.php
similarity index 100%
rename from hphp/test/tcr/closure/1937.php
rename to hphp/test/slow/closure/1937.php
diff --git a/hphp/test/tcr/closure/1937.php.expect b/hphp/test/slow/closure/1937.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1937.php.expect
rename to hphp/test/slow/closure/1937.php.expect
diff --git a/hphp/test/tcr/closure/1938.php b/hphp/test/slow/closure/1938.php
similarity index 100%
rename from hphp/test/tcr/closure/1938.php
rename to hphp/test/slow/closure/1938.php
diff --git a/hphp/test/tcr/closure/1938.php.expect b/hphp/test/slow/closure/1938.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1938.php.expect
rename to hphp/test/slow/closure/1938.php.expect
diff --git a/hphp/test/tcr/closure/1939.php b/hphp/test/slow/closure/1939.php
similarity index 100%
rename from hphp/test/tcr/closure/1939.php
rename to hphp/test/slow/closure/1939.php
diff --git a/hphp/test/tcr/closure/1939.php.expect b/hphp/test/slow/closure/1939.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1939.php.expect
rename to hphp/test/slow/closure/1939.php.expect
diff --git a/hphp/test/tcr/closure/1940.php b/hphp/test/slow/closure/1940.php
similarity index 100%
rename from hphp/test/tcr/closure/1940.php
rename to hphp/test/slow/closure/1940.php
diff --git a/hphp/test/tcr/closure/1940.php.expect b/hphp/test/slow/closure/1940.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1940.php.expect
rename to hphp/test/slow/closure/1940.php.expect
diff --git a/hphp/test/tcr/closure/1941.php b/hphp/test/slow/closure/1941.php
similarity index 100%
rename from hphp/test/tcr/closure/1941.php
rename to hphp/test/slow/closure/1941.php
diff --git a/hphp/test/tcr/closure/1941.php.expect b/hphp/test/slow/closure/1941.php.expect
similarity index 100%
rename from hphp/test/tcr/closure/1941.php.expect
rename to hphp/test/slow/closure/1941.php.expect
diff --git a/hphp/test/tcr/collection_classes/802.php b/hphp/test/slow/collection_classes/802.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/802.php
rename to hphp/test/slow/collection_classes/802.php
diff --git a/hphp/test/tcr/collection_classes/802.php.expect b/hphp/test/slow/collection_classes/802.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/802.php.expect
rename to hphp/test/slow/collection_classes/802.php.expect
diff --git a/hphp/test/tcr/collection_classes/803.php b/hphp/test/slow/collection_classes/803.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/803.php
rename to hphp/test/slow/collection_classes/803.php
diff --git a/hphp/test/tcr/collection_classes/803.php.expect b/hphp/test/slow/collection_classes/803.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/803.php.expect
rename to hphp/test/slow/collection_classes/803.php.expect
diff --git a/hphp/test/tcr/collection_classes/804.php b/hphp/test/slow/collection_classes/804.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/804.php
rename to hphp/test/slow/collection_classes/804.php
diff --git a/hphp/test/tcr/collection_classes/804.php.expect b/hphp/test/slow/collection_classes/804.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/804.php.expect
rename to hphp/test/slow/collection_classes/804.php.expect
diff --git a/hphp/test/tcr/collection_classes/805.php b/hphp/test/slow/collection_classes/805.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/805.php
rename to hphp/test/slow/collection_classes/805.php
diff --git a/hphp/test/tcr/collection_classes/805.php.expect b/hphp/test/slow/collection_classes/805.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/805.php.expect
rename to hphp/test/slow/collection_classes/805.php.expect
diff --git a/hphp/test/tcr/collection_classes/806.php b/hphp/test/slow/collection_classes/806.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/806.php
rename to hphp/test/slow/collection_classes/806.php
diff --git a/hphp/test/tcr/collection_classes/806.php.expect b/hphp/test/slow/collection_classes/806.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/806.php.expect
rename to hphp/test/slow/collection_classes/806.php.expect
diff --git a/hphp/test/tcr/collection_classes/807.php b/hphp/test/slow/collection_classes/807.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/807.php
rename to hphp/test/slow/collection_classes/807.php
diff --git a/hphp/test/tcr/collection_classes/807.php.expect b/hphp/test/slow/collection_classes/807.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/807.php.expect
rename to hphp/test/slow/collection_classes/807.php.expect
diff --git a/hphp/test/tcr/collection_classes/808.php b/hphp/test/slow/collection_classes/808.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/808.php
rename to hphp/test/slow/collection_classes/808.php
diff --git a/hphp/test/tcr/collection_classes/808.php.expect b/hphp/test/slow/collection_classes/808.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/808.php.expect
rename to hphp/test/slow/collection_classes/808.php.expect
diff --git a/hphp/test/tcr/collection_classes/809.php b/hphp/test/slow/collection_classes/809.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/809.php
rename to hphp/test/slow/collection_classes/809.php
diff --git a/hphp/test/tcr/collection_classes/809.php.expect b/hphp/test/slow/collection_classes/809.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/809.php.expect
rename to hphp/test/slow/collection_classes/809.php.expect
diff --git a/hphp/test/tcr/collection_classes/810.php b/hphp/test/slow/collection_classes/810.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/810.php
rename to hphp/test/slow/collection_classes/810.php
diff --git a/hphp/test/tcr/collection_classes/810.php.expect b/hphp/test/slow/collection_classes/810.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/810.php.expect
rename to hphp/test/slow/collection_classes/810.php.expect
diff --git a/hphp/test/tcr/collection_classes/811.php b/hphp/test/slow/collection_classes/811.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/811.php
rename to hphp/test/slow/collection_classes/811.php
diff --git a/hphp/test/tcr/collection_classes/811.php.expect b/hphp/test/slow/collection_classes/811.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/811.php.expect
rename to hphp/test/slow/collection_classes/811.php.expect
diff --git a/hphp/test/tcr/collection_classes/812.php b/hphp/test/slow/collection_classes/812.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/812.php
rename to hphp/test/slow/collection_classes/812.php
diff --git a/hphp/test/tcr/collection_classes/812.php.expect b/hphp/test/slow/collection_classes/812.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/812.php.expect
rename to hphp/test/slow/collection_classes/812.php.expect
diff --git a/hphp/test/tcr/collection_classes/813.php b/hphp/test/slow/collection_classes/813.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/813.php
rename to hphp/test/slow/collection_classes/813.php
diff --git a/hphp/test/tcr/collection_classes/813.php.expect b/hphp/test/slow/collection_classes/813.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/813.php.expect
rename to hphp/test/slow/collection_classes/813.php.expect
diff --git a/hphp/test/tcr/collection_classes/814.php b/hphp/test/slow/collection_classes/814.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/814.php
rename to hphp/test/slow/collection_classes/814.php
diff --git a/hphp/test/tcr/collection_classes/814.php.expect b/hphp/test/slow/collection_classes/814.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/814.php.expect
rename to hphp/test/slow/collection_classes/814.php.expect
diff --git a/hphp/test/tcr/collection_classes/815.php b/hphp/test/slow/collection_classes/815.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/815.php
rename to hphp/test/slow/collection_classes/815.php
diff --git a/hphp/test/tcr/collection_classes/815.php.expect b/hphp/test/slow/collection_classes/815.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/815.php.expect
rename to hphp/test/slow/collection_classes/815.php.expect
diff --git a/hphp/test/tcr/collection_classes/816.php b/hphp/test/slow/collection_classes/816.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/816.php
rename to hphp/test/slow/collection_classes/816.php
diff --git a/hphp/test/tcr/collection_classes/816.php.expect b/hphp/test/slow/collection_classes/816.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/816.php.expect
rename to hphp/test/slow/collection_classes/816.php.expect
diff --git a/hphp/test/tcr/collection_classes/817.php b/hphp/test/slow/collection_classes/817.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/817.php
rename to hphp/test/slow/collection_classes/817.php
diff --git a/hphp/test/tcr/collection_classes/817.php.expect b/hphp/test/slow/collection_classes/817.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/817.php.expect
rename to hphp/test/slow/collection_classes/817.php.expect
diff --git a/hphp/test/tcr/collection_classes/818.php b/hphp/test/slow/collection_classes/818.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/818.php
rename to hphp/test/slow/collection_classes/818.php
diff --git a/hphp/test/tcr/collection_classes/818.php.expect b/hphp/test/slow/collection_classes/818.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/818.php.expect
rename to hphp/test/slow/collection_classes/818.php.expect
diff --git a/hphp/test/tcr/collection_classes/819.php b/hphp/test/slow/collection_classes/819.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/819.php
rename to hphp/test/slow/collection_classes/819.php
diff --git a/hphp/test/tcr/collection_classes/819.php.expect b/hphp/test/slow/collection_classes/819.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/819.php.expect
rename to hphp/test/slow/collection_classes/819.php.expect
diff --git a/hphp/test/tcr/collection_classes/820.php b/hphp/test/slow/collection_classes/820.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/820.php
rename to hphp/test/slow/collection_classes/820.php
diff --git a/hphp/test/tcr/collection_classes/820.php.expect b/hphp/test/slow/collection_classes/820.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/820.php.expect
rename to hphp/test/slow/collection_classes/820.php.expect
diff --git a/hphp/test/tcr/collection_classes/821.php b/hphp/test/slow/collection_classes/821.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/821.php
rename to hphp/test/slow/collection_classes/821.php
diff --git a/hphp/test/tcr/collection_classes/821.php.expect b/hphp/test/slow/collection_classes/821.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/821.php.expect
rename to hphp/test/slow/collection_classes/821.php.expect
diff --git a/hphp/test/tcr/collection_classes/822.php b/hphp/test/slow/collection_classes/822.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/822.php
rename to hphp/test/slow/collection_classes/822.php
diff --git a/hphp/test/tcr/collection_classes/822.php.expect b/hphp/test/slow/collection_classes/822.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/822.php.expect
rename to hphp/test/slow/collection_classes/822.php.expect
diff --git a/hphp/test/tcr/collection_classes/822.php.hphp_opts b/hphp/test/slow/collection_classes/822.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/collection_classes/822.php.hphp_opts
rename to hphp/test/slow/collection_classes/822.php.hphp_opts
diff --git a/hphp/test/tcr/collection_classes/822.php.opts b/hphp/test/slow/collection_classes/822.php.opts
similarity index 100%
rename from hphp/test/tcr/collection_classes/822.php.opts
rename to hphp/test/slow/collection_classes/822.php.opts
diff --git a/hphp/test/tcr/collection_classes/823.php b/hphp/test/slow/collection_classes/823.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/823.php
rename to hphp/test/slow/collection_classes/823.php
diff --git a/hphp/test/tcr/collection_classes/823.php.expect b/hphp/test/slow/collection_classes/823.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/823.php.expect
rename to hphp/test/slow/collection_classes/823.php.expect
diff --git a/hphp/test/tcr/collection_classes/823.php.hphp_opts b/hphp/test/slow/collection_classes/823.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/collection_classes/823.php.hphp_opts
rename to hphp/test/slow/collection_classes/823.php.hphp_opts
diff --git a/hphp/test/tcr/collection_classes/823.php.opts b/hphp/test/slow/collection_classes/823.php.opts
similarity index 100%
rename from hphp/test/tcr/collection_classes/823.php.opts
rename to hphp/test/slow/collection_classes/823.php.opts
diff --git a/hphp/test/tcr/collection_classes/824.php b/hphp/test/slow/collection_classes/824.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/824.php
rename to hphp/test/slow/collection_classes/824.php
diff --git a/hphp/test/tcr/collection_classes/824.php.expect b/hphp/test/slow/collection_classes/824.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/824.php.expect
rename to hphp/test/slow/collection_classes/824.php.expect
diff --git a/hphp/test/tcr/collection_classes/825.php b/hphp/test/slow/collection_classes/825.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/825.php
rename to hphp/test/slow/collection_classes/825.php
diff --git a/hphp/test/tcr/collection_classes/825.php.expect b/hphp/test/slow/collection_classes/825.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/825.php.expect
rename to hphp/test/slow/collection_classes/825.php.expect
diff --git a/hphp/test/tcr/collection_classes/826.php b/hphp/test/slow/collection_classes/826.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/826.php
rename to hphp/test/slow/collection_classes/826.php
diff --git a/hphp/test/tcr/collection_classes/826.php.expect b/hphp/test/slow/collection_classes/826.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/826.php.expect
rename to hphp/test/slow/collection_classes/826.php.expect
diff --git a/hphp/test/tcr/collection_classes/827.php b/hphp/test/slow/collection_classes/827.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/827.php
rename to hphp/test/slow/collection_classes/827.php
diff --git a/hphp/test/tcr/collection_classes/827.php.expect b/hphp/test/slow/collection_classes/827.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/827.php.expect
rename to hphp/test/slow/collection_classes/827.php.expect
diff --git a/hphp/test/tcr/collection_classes/828.php b/hphp/test/slow/collection_classes/828.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/828.php
rename to hphp/test/slow/collection_classes/828.php
diff --git a/hphp/test/tcr/collection_classes/828.php.expect b/hphp/test/slow/collection_classes/828.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/828.php.expect
rename to hphp/test/slow/collection_classes/828.php.expect
diff --git a/hphp/test/tcr/collection_classes/829.php b/hphp/test/slow/collection_classes/829.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/829.php
rename to hphp/test/slow/collection_classes/829.php
diff --git a/hphp/test/tcr/collection_classes/829.php.expect b/hphp/test/slow/collection_classes/829.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/829.php.expect
rename to hphp/test/slow/collection_classes/829.php.expect
diff --git a/hphp/test/tcr/collection_classes/830.php b/hphp/test/slow/collection_classes/830.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/830.php
rename to hphp/test/slow/collection_classes/830.php
diff --git a/hphp/test/tcr/collection_classes/830.php.expect b/hphp/test/slow/collection_classes/830.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/830.php.expect
rename to hphp/test/slow/collection_classes/830.php.expect
diff --git a/hphp/test/tcr/collection_classes/831.php b/hphp/test/slow/collection_classes/831.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/831.php
rename to hphp/test/slow/collection_classes/831.php
diff --git a/hphp/test/tcr/collection_classes/831.php.expect b/hphp/test/slow/collection_classes/831.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/831.php.expect
rename to hphp/test/slow/collection_classes/831.php.expect
diff --git a/hphp/test/tcr/collection_classes/832.php b/hphp/test/slow/collection_classes/832.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/832.php
rename to hphp/test/slow/collection_classes/832.php
diff --git a/hphp/test/tcr/collection_classes/832.php.expect b/hphp/test/slow/collection_classes/832.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/832.php.expect
rename to hphp/test/slow/collection_classes/832.php.expect
diff --git a/hphp/test/tcr/collection_classes/833.php b/hphp/test/slow/collection_classes/833.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/833.php
rename to hphp/test/slow/collection_classes/833.php
diff --git a/hphp/test/tcr/collection_classes/833.php.expect b/hphp/test/slow/collection_classes/833.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/833.php.expect
rename to hphp/test/slow/collection_classes/833.php.expect
diff --git a/hphp/test/tcr/collection_classes/834.php b/hphp/test/slow/collection_classes/834.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/834.php
rename to hphp/test/slow/collection_classes/834.php
diff --git a/hphp/test/tcr/collection_classes/834.php.expect b/hphp/test/slow/collection_classes/834.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/834.php.expect
rename to hphp/test/slow/collection_classes/834.php.expect
diff --git a/hphp/test/tcr/collection_classes/835.php b/hphp/test/slow/collection_classes/835.php
similarity index 100%
rename from hphp/test/tcr/collection_classes/835.php
rename to hphp/test/slow/collection_classes/835.php
diff --git a/hphp/test/tcr/collection_classes/835.php.expect b/hphp/test/slow/collection_classes/835.php.expect
similarity index 100%
rename from hphp/test/tcr/collection_classes/835.php.expect
rename to hphp/test/slow/collection_classes/835.php.expect
diff --git a/hphp/test/tcr/comparisons/1000.php b/hphp/test/slow/comparisons/1000.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1000.php
rename to hphp/test/slow/comparisons/1000.php
diff --git a/hphp/test/tcr/comparisons/1000.php.expect b/hphp/test/slow/comparisons/1000.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1000.php.expect
rename to hphp/test/slow/comparisons/1000.php.expect
diff --git a/hphp/test/tcr/comparisons/1001.php b/hphp/test/slow/comparisons/1001.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1001.php
rename to hphp/test/slow/comparisons/1001.php
diff --git a/hphp/test/tcr/comparisons/1001.php.expect b/hphp/test/slow/comparisons/1001.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1001.php.expect
rename to hphp/test/slow/comparisons/1001.php.expect
diff --git a/hphp/test/tcr/comparisons/1002.php b/hphp/test/slow/comparisons/1002.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1002.php
rename to hphp/test/slow/comparisons/1002.php
diff --git a/hphp/test/tcr/comparisons/1002.php.expect b/hphp/test/slow/comparisons/1002.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1002.php.expect
rename to hphp/test/slow/comparisons/1002.php.expect
diff --git a/hphp/test/tcr/comparisons/1003.php b/hphp/test/slow/comparisons/1003.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1003.php
rename to hphp/test/slow/comparisons/1003.php
diff --git a/hphp/test/tcr/comparisons/1003.php.expect b/hphp/test/slow/comparisons/1003.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1003.php.expect
rename to hphp/test/slow/comparisons/1003.php.expect
diff --git a/hphp/test/tcr/comparisons/1004.php b/hphp/test/slow/comparisons/1004.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1004.php
rename to hphp/test/slow/comparisons/1004.php
diff --git a/hphp/test/tcr/comparisons/1004.php.expect b/hphp/test/slow/comparisons/1004.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1004.php.expect
rename to hphp/test/slow/comparisons/1004.php.expect
diff --git a/hphp/test/tcr/comparisons/1005.php b/hphp/test/slow/comparisons/1005.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1005.php
rename to hphp/test/slow/comparisons/1005.php
diff --git a/hphp/test/tcr/comparisons/1005.php.expect b/hphp/test/slow/comparisons/1005.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1005.php.expect
rename to hphp/test/slow/comparisons/1005.php.expect
diff --git a/hphp/test/tcr/comparisons/1006.php b/hphp/test/slow/comparisons/1006.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1006.php
rename to hphp/test/slow/comparisons/1006.php
diff --git a/hphp/test/tcr/comparisons/1006.php.expect b/hphp/test/slow/comparisons/1006.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1006.php.expect
rename to hphp/test/slow/comparisons/1006.php.expect
diff --git a/hphp/test/tcr/comparisons/1007.php b/hphp/test/slow/comparisons/1007.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1007.php
rename to hphp/test/slow/comparisons/1007.php
diff --git a/hphp/test/tcr/comparisons/1007.php.expect b/hphp/test/slow/comparisons/1007.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1007.php.expect
rename to hphp/test/slow/comparisons/1007.php.expect
diff --git a/hphp/test/tcr/comparisons/1008.php b/hphp/test/slow/comparisons/1008.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1008.php
rename to hphp/test/slow/comparisons/1008.php
diff --git a/hphp/test/tcr/comparisons/1008.php.expect b/hphp/test/slow/comparisons/1008.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1008.php.expect
rename to hphp/test/slow/comparisons/1008.php.expect
diff --git a/hphp/test/tcr/comparisons/1009.php b/hphp/test/slow/comparisons/1009.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1009.php
rename to hphp/test/slow/comparisons/1009.php
diff --git a/hphp/test/tcr/comparisons/1009.php.expect b/hphp/test/slow/comparisons/1009.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1009.php.expect
rename to hphp/test/slow/comparisons/1009.php.expect
diff --git a/hphp/test/tcr/comparisons/1010.php b/hphp/test/slow/comparisons/1010.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1010.php
rename to hphp/test/slow/comparisons/1010.php
diff --git a/hphp/test/tcr/comparisons/1010.php.expect b/hphp/test/slow/comparisons/1010.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1010.php.expect
rename to hphp/test/slow/comparisons/1010.php.expect
diff --git a/hphp/test/tcr/comparisons/1011.php b/hphp/test/slow/comparisons/1011.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1011.php
rename to hphp/test/slow/comparisons/1011.php
diff --git a/hphp/test/tcr/comparisons/1011.php.expect b/hphp/test/slow/comparisons/1011.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1011.php.expect
rename to hphp/test/slow/comparisons/1011.php.expect
diff --git a/hphp/test/tcr/comparisons/1012.php b/hphp/test/slow/comparisons/1012.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1012.php
rename to hphp/test/slow/comparisons/1012.php
diff --git a/hphp/test/tcr/comparisons/1012.php.expect b/hphp/test/slow/comparisons/1012.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1012.php.expect
rename to hphp/test/slow/comparisons/1012.php.expect
diff --git a/hphp/test/tcr/comparisons/1013.php b/hphp/test/slow/comparisons/1013.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1013.php
rename to hphp/test/slow/comparisons/1013.php
diff --git a/hphp/test/tcr/comparisons/1013.php.expect b/hphp/test/slow/comparisons/1013.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1013.php.expect
rename to hphp/test/slow/comparisons/1013.php.expect
diff --git a/hphp/test/tcr/comparisons/1014.php b/hphp/test/slow/comparisons/1014.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1014.php
rename to hphp/test/slow/comparisons/1014.php
diff --git a/hphp/test/tcr/comparisons/1014.php.expect b/hphp/test/slow/comparisons/1014.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1014.php.expect
rename to hphp/test/slow/comparisons/1014.php.expect
diff --git a/hphp/test/tcr/comparisons/1015.php b/hphp/test/slow/comparisons/1015.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1015.php
rename to hphp/test/slow/comparisons/1015.php
diff --git a/hphp/test/tcr/comparisons/1015.php.expect b/hphp/test/slow/comparisons/1015.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1015.php.expect
rename to hphp/test/slow/comparisons/1015.php.expect
diff --git a/hphp/test/tcr/comparisons/1016.php b/hphp/test/slow/comparisons/1016.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1016.php
rename to hphp/test/slow/comparisons/1016.php
diff --git a/hphp/test/tcr/comparisons/1016.php.expect b/hphp/test/slow/comparisons/1016.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1016.php.expect
rename to hphp/test/slow/comparisons/1016.php.expect
diff --git a/hphp/test/tcr/comparisons/1017.php b/hphp/test/slow/comparisons/1017.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1017.php
rename to hphp/test/slow/comparisons/1017.php
diff --git a/hphp/test/tcr/comparisons/1017.php.expect b/hphp/test/slow/comparisons/1017.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1017.php.expect
rename to hphp/test/slow/comparisons/1017.php.expect
diff --git a/hphp/test/tcr/comparisons/1018.php b/hphp/test/slow/comparisons/1018.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1018.php
rename to hphp/test/slow/comparisons/1018.php
diff --git a/hphp/test/tcr/comparisons/1018.php.expect b/hphp/test/slow/comparisons/1018.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1018.php.expect
rename to hphp/test/slow/comparisons/1018.php.expect
diff --git a/hphp/test/tcr/comparisons/1019.php b/hphp/test/slow/comparisons/1019.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1019.php
rename to hphp/test/slow/comparisons/1019.php
diff --git a/hphp/test/tcr/comparisons/1019.php.expect b/hphp/test/slow/comparisons/1019.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1019.php.expect
rename to hphp/test/slow/comparisons/1019.php.expect
diff --git a/hphp/test/tcr/comparisons/1020.php b/hphp/test/slow/comparisons/1020.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1020.php
rename to hphp/test/slow/comparisons/1020.php
diff --git a/hphp/test/tcr/comparisons/1020.php.expect b/hphp/test/slow/comparisons/1020.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1020.php.expect
rename to hphp/test/slow/comparisons/1020.php.expect
diff --git a/hphp/test/tcr/comparisons/1021.php b/hphp/test/slow/comparisons/1021.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1021.php
rename to hphp/test/slow/comparisons/1021.php
diff --git a/hphp/test/tcr/comparisons/1021.php.expect b/hphp/test/slow/comparisons/1021.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1021.php.expect
rename to hphp/test/slow/comparisons/1021.php.expect
diff --git a/hphp/test/tcr/comparisons/1022.php b/hphp/test/slow/comparisons/1022.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1022.php
rename to hphp/test/slow/comparisons/1022.php
diff --git a/hphp/test/tcr/comparisons/1022.php.expect b/hphp/test/slow/comparisons/1022.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1022.php.expect
rename to hphp/test/slow/comparisons/1022.php.expect
diff --git a/hphp/test/tcr/comparisons/1023.php b/hphp/test/slow/comparisons/1023.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1023.php
rename to hphp/test/slow/comparisons/1023.php
diff --git a/hphp/test/tcr/comparisons/1023.php.expect b/hphp/test/slow/comparisons/1023.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1023.php.expect
rename to hphp/test/slow/comparisons/1023.php.expect
diff --git a/hphp/test/tcr/comparisons/1024.php b/hphp/test/slow/comparisons/1024.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1024.php
rename to hphp/test/slow/comparisons/1024.php
diff --git a/hphp/test/tcr/comparisons/1024.php.expect b/hphp/test/slow/comparisons/1024.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1024.php.expect
rename to hphp/test/slow/comparisons/1024.php.expect
diff --git a/hphp/test/tcr/comparisons/1025.php b/hphp/test/slow/comparisons/1025.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1025.php
rename to hphp/test/slow/comparisons/1025.php
diff --git a/hphp/test/tcr/comparisons/1025.php.expect b/hphp/test/slow/comparisons/1025.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1025.php.expect
rename to hphp/test/slow/comparisons/1025.php.expect
diff --git a/hphp/test/tcr/comparisons/1026.php b/hphp/test/slow/comparisons/1026.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1026.php
rename to hphp/test/slow/comparisons/1026.php
diff --git a/hphp/test/tcr/comparisons/1026.php.expect b/hphp/test/slow/comparisons/1026.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1026.php.expect
rename to hphp/test/slow/comparisons/1026.php.expect
diff --git a/hphp/test/tcr/comparisons/1027.php b/hphp/test/slow/comparisons/1027.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1027.php
rename to hphp/test/slow/comparisons/1027.php
diff --git a/hphp/test/tcr/comparisons/1027.php.expect b/hphp/test/slow/comparisons/1027.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1027.php.expect
rename to hphp/test/slow/comparisons/1027.php.expect
diff --git a/hphp/test/tcr/comparisons/1028.php b/hphp/test/slow/comparisons/1028.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1028.php
rename to hphp/test/slow/comparisons/1028.php
diff --git a/hphp/test/tcr/comparisons/1028.php.expect b/hphp/test/slow/comparisons/1028.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1028.php.expect
rename to hphp/test/slow/comparisons/1028.php.expect
diff --git a/hphp/test/tcr/comparisons/1029.php b/hphp/test/slow/comparisons/1029.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1029.php
rename to hphp/test/slow/comparisons/1029.php
diff --git a/hphp/test/tcr/comparisons/1029.php.expect b/hphp/test/slow/comparisons/1029.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1029.php.expect
rename to hphp/test/slow/comparisons/1029.php.expect
diff --git a/hphp/test/tcr/comparisons/1030.php b/hphp/test/slow/comparisons/1030.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1030.php
rename to hphp/test/slow/comparisons/1030.php
diff --git a/hphp/test/tcr/comparisons/1030.php.expect b/hphp/test/slow/comparisons/1030.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1030.php.expect
rename to hphp/test/slow/comparisons/1030.php.expect
diff --git a/hphp/test/tcr/comparisons/1031.php b/hphp/test/slow/comparisons/1031.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1031.php
rename to hphp/test/slow/comparisons/1031.php
diff --git a/hphp/test/tcr/comparisons/1031.php.expect b/hphp/test/slow/comparisons/1031.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1031.php.expect
rename to hphp/test/slow/comparisons/1031.php.expect
diff --git a/hphp/test/tcr/comparisons/1032.php b/hphp/test/slow/comparisons/1032.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1032.php
rename to hphp/test/slow/comparisons/1032.php
diff --git a/hphp/test/tcr/comparisons/1032.php.expect b/hphp/test/slow/comparisons/1032.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1032.php.expect
rename to hphp/test/slow/comparisons/1032.php.expect
diff --git a/hphp/test/tcr/comparisons/1033.php b/hphp/test/slow/comparisons/1033.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1033.php
rename to hphp/test/slow/comparisons/1033.php
diff --git a/hphp/test/tcr/comparisons/1033.php.expect b/hphp/test/slow/comparisons/1033.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1033.php.expect
rename to hphp/test/slow/comparisons/1033.php.expect
diff --git a/hphp/test/tcr/comparisons/1034.php b/hphp/test/slow/comparisons/1034.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1034.php
rename to hphp/test/slow/comparisons/1034.php
diff --git a/hphp/test/tcr/comparisons/1034.php.expect b/hphp/test/slow/comparisons/1034.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1034.php.expect
rename to hphp/test/slow/comparisons/1034.php.expect
diff --git a/hphp/test/tcr/comparisons/1035.php b/hphp/test/slow/comparisons/1035.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1035.php
rename to hphp/test/slow/comparisons/1035.php
diff --git a/hphp/test/tcr/comparisons/1035.php.expect b/hphp/test/slow/comparisons/1035.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1035.php.expect
rename to hphp/test/slow/comparisons/1035.php.expect
diff --git a/hphp/test/tcr/comparisons/1036.php b/hphp/test/slow/comparisons/1036.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1036.php
rename to hphp/test/slow/comparisons/1036.php
diff --git a/hphp/test/tcr/comparisons/1036.php.expect b/hphp/test/slow/comparisons/1036.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1036.php.expect
rename to hphp/test/slow/comparisons/1036.php.expect
diff --git a/hphp/test/tcr/comparisons/1037.php b/hphp/test/slow/comparisons/1037.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1037.php
rename to hphp/test/slow/comparisons/1037.php
diff --git a/hphp/test/tcr/comparisons/1037.php.expect b/hphp/test/slow/comparisons/1037.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1037.php.expect
rename to hphp/test/slow/comparisons/1037.php.expect
diff --git a/hphp/test/tcr/comparisons/1038.php b/hphp/test/slow/comparisons/1038.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1038.php
rename to hphp/test/slow/comparisons/1038.php
diff --git a/hphp/test/tcr/comparisons/1038.php.expect b/hphp/test/slow/comparisons/1038.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1038.php.expect
rename to hphp/test/slow/comparisons/1038.php.expect
diff --git a/hphp/test/tcr/comparisons/1039.php b/hphp/test/slow/comparisons/1039.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1039.php
rename to hphp/test/slow/comparisons/1039.php
diff --git a/hphp/test/tcr/comparisons/1039.php.expect b/hphp/test/slow/comparisons/1039.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1039.php.expect
rename to hphp/test/slow/comparisons/1039.php.expect
diff --git a/hphp/test/tcr/comparisons/1040.php b/hphp/test/slow/comparisons/1040.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1040.php
rename to hphp/test/slow/comparisons/1040.php
diff --git a/hphp/test/tcr/comparisons/1040.php.expect b/hphp/test/slow/comparisons/1040.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1040.php.expect
rename to hphp/test/slow/comparisons/1040.php.expect
diff --git a/hphp/test/tcr/comparisons/1041.php b/hphp/test/slow/comparisons/1041.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1041.php
rename to hphp/test/slow/comparisons/1041.php
diff --git a/hphp/test/tcr/comparisons/1041.php.expect b/hphp/test/slow/comparisons/1041.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1041.php.expect
rename to hphp/test/slow/comparisons/1041.php.expect
diff --git a/hphp/test/tcr/comparisons/1042.php b/hphp/test/slow/comparisons/1042.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1042.php
rename to hphp/test/slow/comparisons/1042.php
diff --git a/hphp/test/tcr/comparisons/1042.php.expect b/hphp/test/slow/comparisons/1042.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1042.php.expect
rename to hphp/test/slow/comparisons/1042.php.expect
diff --git a/hphp/test/tcr/comparisons/1043.php b/hphp/test/slow/comparisons/1043.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1043.php
rename to hphp/test/slow/comparisons/1043.php
diff --git a/hphp/test/tcr/comparisons/1043.php.expect b/hphp/test/slow/comparisons/1043.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1043.php.expect
rename to hphp/test/slow/comparisons/1043.php.expect
diff --git a/hphp/test/tcr/comparisons/1044.php b/hphp/test/slow/comparisons/1044.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1044.php
rename to hphp/test/slow/comparisons/1044.php
diff --git a/hphp/test/tcr/comparisons/1044.php.expect b/hphp/test/slow/comparisons/1044.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1044.php.expect
rename to hphp/test/slow/comparisons/1044.php.expect
diff --git a/hphp/test/tcr/comparisons/1045.php b/hphp/test/slow/comparisons/1045.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1045.php
rename to hphp/test/slow/comparisons/1045.php
diff --git a/hphp/test/tcr/comparisons/1045.php.expect b/hphp/test/slow/comparisons/1045.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1045.php.expect
rename to hphp/test/slow/comparisons/1045.php.expect
diff --git a/hphp/test/tcr/comparisons/1046.php b/hphp/test/slow/comparisons/1046.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1046.php
rename to hphp/test/slow/comparisons/1046.php
diff --git a/hphp/test/tcr/comparisons/1046.php.expect b/hphp/test/slow/comparisons/1046.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1046.php.expect
rename to hphp/test/slow/comparisons/1046.php.expect
diff --git a/hphp/test/tcr/comparisons/1047.php b/hphp/test/slow/comparisons/1047.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1047.php
rename to hphp/test/slow/comparisons/1047.php
diff --git a/hphp/test/tcr/comparisons/1047.php.expect b/hphp/test/slow/comparisons/1047.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1047.php.expect
rename to hphp/test/slow/comparisons/1047.php.expect
diff --git a/hphp/test/tcr/comparisons/1048.php b/hphp/test/slow/comparisons/1048.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1048.php
rename to hphp/test/slow/comparisons/1048.php
diff --git a/hphp/test/tcr/comparisons/1048.php.expect b/hphp/test/slow/comparisons/1048.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1048.php.expect
rename to hphp/test/slow/comparisons/1048.php.expect
diff --git a/hphp/test/tcr/comparisons/1049.php b/hphp/test/slow/comparisons/1049.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1049.php
rename to hphp/test/slow/comparisons/1049.php
diff --git a/hphp/test/tcr/comparisons/1049.php.expect b/hphp/test/slow/comparisons/1049.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1049.php.expect
rename to hphp/test/slow/comparisons/1049.php.expect
diff --git a/hphp/test/tcr/comparisons/1050.php b/hphp/test/slow/comparisons/1050.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1050.php
rename to hphp/test/slow/comparisons/1050.php
diff --git a/hphp/test/tcr/comparisons/1050.php.expect b/hphp/test/slow/comparisons/1050.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1050.php.expect
rename to hphp/test/slow/comparisons/1050.php.expect
diff --git a/hphp/test/tcr/comparisons/1051.php b/hphp/test/slow/comparisons/1051.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1051.php
rename to hphp/test/slow/comparisons/1051.php
diff --git a/hphp/test/tcr/comparisons/1051.php.expect b/hphp/test/slow/comparisons/1051.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1051.php.expect
rename to hphp/test/slow/comparisons/1051.php.expect
diff --git a/hphp/test/tcr/comparisons/1052.php b/hphp/test/slow/comparisons/1052.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1052.php
rename to hphp/test/slow/comparisons/1052.php
diff --git a/hphp/test/tcr/comparisons/1052.php.expect b/hphp/test/slow/comparisons/1052.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1052.php.expect
rename to hphp/test/slow/comparisons/1052.php.expect
diff --git a/hphp/test/tcr/comparisons/1053.php b/hphp/test/slow/comparisons/1053.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1053.php
rename to hphp/test/slow/comparisons/1053.php
diff --git a/hphp/test/tcr/comparisons/1053.php.expect b/hphp/test/slow/comparisons/1053.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1053.php.expect
rename to hphp/test/slow/comparisons/1053.php.expect
diff --git a/hphp/test/tcr/comparisons/1054.php b/hphp/test/slow/comparisons/1054.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1054.php
rename to hphp/test/slow/comparisons/1054.php
diff --git a/hphp/test/tcr/comparisons/1054.php.expect b/hphp/test/slow/comparisons/1054.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1054.php.expect
rename to hphp/test/slow/comparisons/1054.php.expect
diff --git a/hphp/test/tcr/comparisons/1055.php b/hphp/test/slow/comparisons/1055.php
similarity index 100%
rename from hphp/test/tcr/comparisons/1055.php
rename to hphp/test/slow/comparisons/1055.php
diff --git a/hphp/test/tcr/comparisons/1055.php.expect b/hphp/test/slow/comparisons/1055.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/1055.php.expect
rename to hphp/test/slow/comparisons/1055.php.expect
diff --git a/hphp/test/tcr/comparisons/836.php b/hphp/test/slow/comparisons/836.php
similarity index 100%
rename from hphp/test/tcr/comparisons/836.php
rename to hphp/test/slow/comparisons/836.php
diff --git a/hphp/test/tcr/comparisons/836.php.expect b/hphp/test/slow/comparisons/836.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/836.php.expect
rename to hphp/test/slow/comparisons/836.php.expect
diff --git a/hphp/test/tcr/comparisons/837.php b/hphp/test/slow/comparisons/837.php
similarity index 100%
rename from hphp/test/tcr/comparisons/837.php
rename to hphp/test/slow/comparisons/837.php
diff --git a/hphp/test/tcr/comparisons/837.php.expect b/hphp/test/slow/comparisons/837.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/837.php.expect
rename to hphp/test/slow/comparisons/837.php.expect
diff --git a/hphp/test/tcr/comparisons/838.php b/hphp/test/slow/comparisons/838.php
similarity index 100%
rename from hphp/test/tcr/comparisons/838.php
rename to hphp/test/slow/comparisons/838.php
diff --git a/hphp/test/tcr/comparisons/838.php.expect b/hphp/test/slow/comparisons/838.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/838.php.expect
rename to hphp/test/slow/comparisons/838.php.expect
diff --git a/hphp/test/tcr/comparisons/839.php b/hphp/test/slow/comparisons/839.php
similarity index 100%
rename from hphp/test/tcr/comparisons/839.php
rename to hphp/test/slow/comparisons/839.php
diff --git a/hphp/test/tcr/comparisons/839.php.expect b/hphp/test/slow/comparisons/839.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/839.php.expect
rename to hphp/test/slow/comparisons/839.php.expect
diff --git a/hphp/test/tcr/comparisons/840.php b/hphp/test/slow/comparisons/840.php
similarity index 100%
rename from hphp/test/tcr/comparisons/840.php
rename to hphp/test/slow/comparisons/840.php
diff --git a/hphp/test/tcr/comparisons/840.php.expect b/hphp/test/slow/comparisons/840.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/840.php.expect
rename to hphp/test/slow/comparisons/840.php.expect
diff --git a/hphp/test/tcr/comparisons/841.php b/hphp/test/slow/comparisons/841.php
similarity index 100%
rename from hphp/test/tcr/comparisons/841.php
rename to hphp/test/slow/comparisons/841.php
diff --git a/hphp/test/tcr/comparisons/841.php.expect b/hphp/test/slow/comparisons/841.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/841.php.expect
rename to hphp/test/slow/comparisons/841.php.expect
diff --git a/hphp/test/tcr/comparisons/842.php b/hphp/test/slow/comparisons/842.php
similarity index 100%
rename from hphp/test/tcr/comparisons/842.php
rename to hphp/test/slow/comparisons/842.php
diff --git a/hphp/test/tcr/comparisons/842.php.expect b/hphp/test/slow/comparisons/842.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/842.php.expect
rename to hphp/test/slow/comparisons/842.php.expect
diff --git a/hphp/test/tcr/comparisons/843.php b/hphp/test/slow/comparisons/843.php
similarity index 100%
rename from hphp/test/tcr/comparisons/843.php
rename to hphp/test/slow/comparisons/843.php
diff --git a/hphp/test/tcr/comparisons/843.php.expect b/hphp/test/slow/comparisons/843.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/843.php.expect
rename to hphp/test/slow/comparisons/843.php.expect
diff --git a/hphp/test/tcr/comparisons/844.php b/hphp/test/slow/comparisons/844.php
similarity index 100%
rename from hphp/test/tcr/comparisons/844.php
rename to hphp/test/slow/comparisons/844.php
diff --git a/hphp/test/tcr/comparisons/844.php.expect b/hphp/test/slow/comparisons/844.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/844.php.expect
rename to hphp/test/slow/comparisons/844.php.expect
diff --git a/hphp/test/tcr/comparisons/845.php b/hphp/test/slow/comparisons/845.php
similarity index 100%
rename from hphp/test/tcr/comparisons/845.php
rename to hphp/test/slow/comparisons/845.php
diff --git a/hphp/test/tcr/comparisons/845.php.expect b/hphp/test/slow/comparisons/845.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/845.php.expect
rename to hphp/test/slow/comparisons/845.php.expect
diff --git a/hphp/test/tcr/comparisons/846.php b/hphp/test/slow/comparisons/846.php
similarity index 100%
rename from hphp/test/tcr/comparisons/846.php
rename to hphp/test/slow/comparisons/846.php
diff --git a/hphp/test/tcr/comparisons/846.php.expect b/hphp/test/slow/comparisons/846.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/846.php.expect
rename to hphp/test/slow/comparisons/846.php.expect
diff --git a/hphp/test/tcr/comparisons/847.php b/hphp/test/slow/comparisons/847.php
similarity index 100%
rename from hphp/test/tcr/comparisons/847.php
rename to hphp/test/slow/comparisons/847.php
diff --git a/hphp/test/tcr/comparisons/847.php.expect b/hphp/test/slow/comparisons/847.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/847.php.expect
rename to hphp/test/slow/comparisons/847.php.expect
diff --git a/hphp/test/tcr/comparisons/848.php b/hphp/test/slow/comparisons/848.php
similarity index 100%
rename from hphp/test/tcr/comparisons/848.php
rename to hphp/test/slow/comparisons/848.php
diff --git a/hphp/test/tcr/comparisons/848.php.expect b/hphp/test/slow/comparisons/848.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/848.php.expect
rename to hphp/test/slow/comparisons/848.php.expect
diff --git a/hphp/test/tcr/comparisons/849.php b/hphp/test/slow/comparisons/849.php
similarity index 100%
rename from hphp/test/tcr/comparisons/849.php
rename to hphp/test/slow/comparisons/849.php
diff --git a/hphp/test/tcr/comparisons/849.php.expect b/hphp/test/slow/comparisons/849.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/849.php.expect
rename to hphp/test/slow/comparisons/849.php.expect
diff --git a/hphp/test/tcr/comparisons/850.php b/hphp/test/slow/comparisons/850.php
similarity index 100%
rename from hphp/test/tcr/comparisons/850.php
rename to hphp/test/slow/comparisons/850.php
diff --git a/hphp/test/tcr/comparisons/850.php.expect b/hphp/test/slow/comparisons/850.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/850.php.expect
rename to hphp/test/slow/comparisons/850.php.expect
diff --git a/hphp/test/tcr/comparisons/851.php b/hphp/test/slow/comparisons/851.php
similarity index 100%
rename from hphp/test/tcr/comparisons/851.php
rename to hphp/test/slow/comparisons/851.php
diff --git a/hphp/test/tcr/comparisons/851.php.expect b/hphp/test/slow/comparisons/851.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/851.php.expect
rename to hphp/test/slow/comparisons/851.php.expect
diff --git a/hphp/test/tcr/comparisons/852.php b/hphp/test/slow/comparisons/852.php
similarity index 100%
rename from hphp/test/tcr/comparisons/852.php
rename to hphp/test/slow/comparisons/852.php
diff --git a/hphp/test/tcr/comparisons/852.php.expect b/hphp/test/slow/comparisons/852.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/852.php.expect
rename to hphp/test/slow/comparisons/852.php.expect
diff --git a/hphp/test/tcr/comparisons/853.php b/hphp/test/slow/comparisons/853.php
similarity index 100%
rename from hphp/test/tcr/comparisons/853.php
rename to hphp/test/slow/comparisons/853.php
diff --git a/hphp/test/tcr/comparisons/853.php.expect b/hphp/test/slow/comparisons/853.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/853.php.expect
rename to hphp/test/slow/comparisons/853.php.expect
diff --git a/hphp/test/tcr/comparisons/854.php b/hphp/test/slow/comparisons/854.php
similarity index 100%
rename from hphp/test/tcr/comparisons/854.php
rename to hphp/test/slow/comparisons/854.php
diff --git a/hphp/test/tcr/comparisons/854.php.expect b/hphp/test/slow/comparisons/854.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/854.php.expect
rename to hphp/test/slow/comparisons/854.php.expect
diff --git a/hphp/test/tcr/comparisons/855.php b/hphp/test/slow/comparisons/855.php
similarity index 100%
rename from hphp/test/tcr/comparisons/855.php
rename to hphp/test/slow/comparisons/855.php
diff --git a/hphp/test/tcr/comparisons/855.php.expect b/hphp/test/slow/comparisons/855.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/855.php.expect
rename to hphp/test/slow/comparisons/855.php.expect
diff --git a/hphp/test/tcr/comparisons/856.php b/hphp/test/slow/comparisons/856.php
similarity index 100%
rename from hphp/test/tcr/comparisons/856.php
rename to hphp/test/slow/comparisons/856.php
diff --git a/hphp/test/tcr/comparisons/856.php.expect b/hphp/test/slow/comparisons/856.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/856.php.expect
rename to hphp/test/slow/comparisons/856.php.expect
diff --git a/hphp/test/tcr/comparisons/857.php b/hphp/test/slow/comparisons/857.php
similarity index 100%
rename from hphp/test/tcr/comparisons/857.php
rename to hphp/test/slow/comparisons/857.php
diff --git a/hphp/test/tcr/comparisons/857.php.expect b/hphp/test/slow/comparisons/857.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/857.php.expect
rename to hphp/test/slow/comparisons/857.php.expect
diff --git a/hphp/test/tcr/comparisons/858.php b/hphp/test/slow/comparisons/858.php
similarity index 100%
rename from hphp/test/tcr/comparisons/858.php
rename to hphp/test/slow/comparisons/858.php
diff --git a/hphp/test/tcr/comparisons/858.php.expect b/hphp/test/slow/comparisons/858.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/858.php.expect
rename to hphp/test/slow/comparisons/858.php.expect
diff --git a/hphp/test/tcr/comparisons/859.php b/hphp/test/slow/comparisons/859.php
similarity index 100%
rename from hphp/test/tcr/comparisons/859.php
rename to hphp/test/slow/comparisons/859.php
diff --git a/hphp/test/tcr/comparisons/859.php.expect b/hphp/test/slow/comparisons/859.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/859.php.expect
rename to hphp/test/slow/comparisons/859.php.expect
diff --git a/hphp/test/tcr/comparisons/860.php b/hphp/test/slow/comparisons/860.php
similarity index 100%
rename from hphp/test/tcr/comparisons/860.php
rename to hphp/test/slow/comparisons/860.php
diff --git a/hphp/test/tcr/comparisons/860.php.expect b/hphp/test/slow/comparisons/860.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/860.php.expect
rename to hphp/test/slow/comparisons/860.php.expect
diff --git a/hphp/test/tcr/comparisons/861.php b/hphp/test/slow/comparisons/861.php
similarity index 100%
rename from hphp/test/tcr/comparisons/861.php
rename to hphp/test/slow/comparisons/861.php
diff --git a/hphp/test/tcr/comparisons/861.php.expect b/hphp/test/slow/comparisons/861.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/861.php.expect
rename to hphp/test/slow/comparisons/861.php.expect
diff --git a/hphp/test/tcr/comparisons/862.php b/hphp/test/slow/comparisons/862.php
similarity index 100%
rename from hphp/test/tcr/comparisons/862.php
rename to hphp/test/slow/comparisons/862.php
diff --git a/hphp/test/tcr/comparisons/862.php.expect b/hphp/test/slow/comparisons/862.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/862.php.expect
rename to hphp/test/slow/comparisons/862.php.expect
diff --git a/hphp/test/tcr/comparisons/863.php b/hphp/test/slow/comparisons/863.php
similarity index 100%
rename from hphp/test/tcr/comparisons/863.php
rename to hphp/test/slow/comparisons/863.php
diff --git a/hphp/test/tcr/comparisons/863.php.expect b/hphp/test/slow/comparisons/863.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/863.php.expect
rename to hphp/test/slow/comparisons/863.php.expect
diff --git a/hphp/test/tcr/comparisons/864.php b/hphp/test/slow/comparisons/864.php
similarity index 100%
rename from hphp/test/tcr/comparisons/864.php
rename to hphp/test/slow/comparisons/864.php
diff --git a/hphp/test/tcr/comparisons/864.php.expect b/hphp/test/slow/comparisons/864.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/864.php.expect
rename to hphp/test/slow/comparisons/864.php.expect
diff --git a/hphp/test/tcr/comparisons/865.php b/hphp/test/slow/comparisons/865.php
similarity index 100%
rename from hphp/test/tcr/comparisons/865.php
rename to hphp/test/slow/comparisons/865.php
diff --git a/hphp/test/tcr/comparisons/865.php.expect b/hphp/test/slow/comparisons/865.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/865.php.expect
rename to hphp/test/slow/comparisons/865.php.expect
diff --git a/hphp/test/tcr/comparisons/866.php b/hphp/test/slow/comparisons/866.php
similarity index 100%
rename from hphp/test/tcr/comparisons/866.php
rename to hphp/test/slow/comparisons/866.php
diff --git a/hphp/test/tcr/comparisons/866.php.expect b/hphp/test/slow/comparisons/866.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/866.php.expect
rename to hphp/test/slow/comparisons/866.php.expect
diff --git a/hphp/test/tcr/comparisons/867.php b/hphp/test/slow/comparisons/867.php
similarity index 100%
rename from hphp/test/tcr/comparisons/867.php
rename to hphp/test/slow/comparisons/867.php
diff --git a/hphp/test/tcr/comparisons/867.php.expect b/hphp/test/slow/comparisons/867.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/867.php.expect
rename to hphp/test/slow/comparisons/867.php.expect
diff --git a/hphp/test/tcr/comparisons/868.php b/hphp/test/slow/comparisons/868.php
similarity index 100%
rename from hphp/test/tcr/comparisons/868.php
rename to hphp/test/slow/comparisons/868.php
diff --git a/hphp/test/tcr/comparisons/868.php.expect b/hphp/test/slow/comparisons/868.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/868.php.expect
rename to hphp/test/slow/comparisons/868.php.expect
diff --git a/hphp/test/tcr/comparisons/869.php b/hphp/test/slow/comparisons/869.php
similarity index 100%
rename from hphp/test/tcr/comparisons/869.php
rename to hphp/test/slow/comparisons/869.php
diff --git a/hphp/test/tcr/comparisons/869.php.expect b/hphp/test/slow/comparisons/869.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/869.php.expect
rename to hphp/test/slow/comparisons/869.php.expect
diff --git a/hphp/test/tcr/comparisons/870.php b/hphp/test/slow/comparisons/870.php
similarity index 100%
rename from hphp/test/tcr/comparisons/870.php
rename to hphp/test/slow/comparisons/870.php
diff --git a/hphp/test/tcr/comparisons/870.php.expect b/hphp/test/slow/comparisons/870.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/870.php.expect
rename to hphp/test/slow/comparisons/870.php.expect
diff --git a/hphp/test/tcr/comparisons/871.php b/hphp/test/slow/comparisons/871.php
similarity index 100%
rename from hphp/test/tcr/comparisons/871.php
rename to hphp/test/slow/comparisons/871.php
diff --git a/hphp/test/tcr/comparisons/871.php.expect b/hphp/test/slow/comparisons/871.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/871.php.expect
rename to hphp/test/slow/comparisons/871.php.expect
diff --git a/hphp/test/tcr/comparisons/872.php b/hphp/test/slow/comparisons/872.php
similarity index 100%
rename from hphp/test/tcr/comparisons/872.php
rename to hphp/test/slow/comparisons/872.php
diff --git a/hphp/test/tcr/comparisons/872.php.expect b/hphp/test/slow/comparisons/872.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/872.php.expect
rename to hphp/test/slow/comparisons/872.php.expect
diff --git a/hphp/test/tcr/comparisons/873.php b/hphp/test/slow/comparisons/873.php
similarity index 100%
rename from hphp/test/tcr/comparisons/873.php
rename to hphp/test/slow/comparisons/873.php
diff --git a/hphp/test/tcr/comparisons/873.php.expect b/hphp/test/slow/comparisons/873.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/873.php.expect
rename to hphp/test/slow/comparisons/873.php.expect
diff --git a/hphp/test/tcr/comparisons/874.php b/hphp/test/slow/comparisons/874.php
similarity index 100%
rename from hphp/test/tcr/comparisons/874.php
rename to hphp/test/slow/comparisons/874.php
diff --git a/hphp/test/tcr/comparisons/874.php.expect b/hphp/test/slow/comparisons/874.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/874.php.expect
rename to hphp/test/slow/comparisons/874.php.expect
diff --git a/hphp/test/tcr/comparisons/875.php b/hphp/test/slow/comparisons/875.php
similarity index 100%
rename from hphp/test/tcr/comparisons/875.php
rename to hphp/test/slow/comparisons/875.php
diff --git a/hphp/test/tcr/comparisons/875.php.expect b/hphp/test/slow/comparisons/875.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/875.php.expect
rename to hphp/test/slow/comparisons/875.php.expect
diff --git a/hphp/test/tcr/comparisons/876.php b/hphp/test/slow/comparisons/876.php
similarity index 100%
rename from hphp/test/tcr/comparisons/876.php
rename to hphp/test/slow/comparisons/876.php
diff --git a/hphp/test/tcr/comparisons/876.php.expect b/hphp/test/slow/comparisons/876.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/876.php.expect
rename to hphp/test/slow/comparisons/876.php.expect
diff --git a/hphp/test/tcr/comparisons/877.php b/hphp/test/slow/comparisons/877.php
similarity index 100%
rename from hphp/test/tcr/comparisons/877.php
rename to hphp/test/slow/comparisons/877.php
diff --git a/hphp/test/tcr/comparisons/877.php.expect b/hphp/test/slow/comparisons/877.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/877.php.expect
rename to hphp/test/slow/comparisons/877.php.expect
diff --git a/hphp/test/tcr/comparisons/878.php b/hphp/test/slow/comparisons/878.php
similarity index 100%
rename from hphp/test/tcr/comparisons/878.php
rename to hphp/test/slow/comparisons/878.php
diff --git a/hphp/test/tcr/comparisons/878.php.expect b/hphp/test/slow/comparisons/878.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/878.php.expect
rename to hphp/test/slow/comparisons/878.php.expect
diff --git a/hphp/test/tcr/comparisons/879.php b/hphp/test/slow/comparisons/879.php
similarity index 100%
rename from hphp/test/tcr/comparisons/879.php
rename to hphp/test/slow/comparisons/879.php
diff --git a/hphp/test/tcr/comparisons/879.php.expect b/hphp/test/slow/comparisons/879.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/879.php.expect
rename to hphp/test/slow/comparisons/879.php.expect
diff --git a/hphp/test/tcr/comparisons/880.php b/hphp/test/slow/comparisons/880.php
similarity index 100%
rename from hphp/test/tcr/comparisons/880.php
rename to hphp/test/slow/comparisons/880.php
diff --git a/hphp/test/tcr/comparisons/880.php.expect b/hphp/test/slow/comparisons/880.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/880.php.expect
rename to hphp/test/slow/comparisons/880.php.expect
diff --git a/hphp/test/tcr/comparisons/881.php b/hphp/test/slow/comparisons/881.php
similarity index 100%
rename from hphp/test/tcr/comparisons/881.php
rename to hphp/test/slow/comparisons/881.php
diff --git a/hphp/test/tcr/comparisons/881.php.expect b/hphp/test/slow/comparisons/881.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/881.php.expect
rename to hphp/test/slow/comparisons/881.php.expect
diff --git a/hphp/test/tcr/comparisons/882.php b/hphp/test/slow/comparisons/882.php
similarity index 100%
rename from hphp/test/tcr/comparisons/882.php
rename to hphp/test/slow/comparisons/882.php
diff --git a/hphp/test/tcr/comparisons/882.php.expect b/hphp/test/slow/comparisons/882.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/882.php.expect
rename to hphp/test/slow/comparisons/882.php.expect
diff --git a/hphp/test/tcr/comparisons/883.php b/hphp/test/slow/comparisons/883.php
similarity index 100%
rename from hphp/test/tcr/comparisons/883.php
rename to hphp/test/slow/comparisons/883.php
diff --git a/hphp/test/tcr/comparisons/883.php.expect b/hphp/test/slow/comparisons/883.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/883.php.expect
rename to hphp/test/slow/comparisons/883.php.expect
diff --git a/hphp/test/tcr/comparisons/884.php b/hphp/test/slow/comparisons/884.php
similarity index 100%
rename from hphp/test/tcr/comparisons/884.php
rename to hphp/test/slow/comparisons/884.php
diff --git a/hphp/test/tcr/comparisons/884.php.expect b/hphp/test/slow/comparisons/884.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/884.php.expect
rename to hphp/test/slow/comparisons/884.php.expect
diff --git a/hphp/test/tcr/comparisons/885.php b/hphp/test/slow/comparisons/885.php
similarity index 100%
rename from hphp/test/tcr/comparisons/885.php
rename to hphp/test/slow/comparisons/885.php
diff --git a/hphp/test/tcr/comparisons/885.php.expect b/hphp/test/slow/comparisons/885.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/885.php.expect
rename to hphp/test/slow/comparisons/885.php.expect
diff --git a/hphp/test/tcr/comparisons/886.php b/hphp/test/slow/comparisons/886.php
similarity index 100%
rename from hphp/test/tcr/comparisons/886.php
rename to hphp/test/slow/comparisons/886.php
diff --git a/hphp/test/tcr/comparisons/886.php.expect b/hphp/test/slow/comparisons/886.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/886.php.expect
rename to hphp/test/slow/comparisons/886.php.expect
diff --git a/hphp/test/tcr/comparisons/887.php b/hphp/test/slow/comparisons/887.php
similarity index 100%
rename from hphp/test/tcr/comparisons/887.php
rename to hphp/test/slow/comparisons/887.php
diff --git a/hphp/test/tcr/comparisons/887.php.expect b/hphp/test/slow/comparisons/887.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/887.php.expect
rename to hphp/test/slow/comparisons/887.php.expect
diff --git a/hphp/test/tcr/comparisons/888.php b/hphp/test/slow/comparisons/888.php
similarity index 100%
rename from hphp/test/tcr/comparisons/888.php
rename to hphp/test/slow/comparisons/888.php
diff --git a/hphp/test/tcr/comparisons/888.php.expect b/hphp/test/slow/comparisons/888.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/888.php.expect
rename to hphp/test/slow/comparisons/888.php.expect
diff --git a/hphp/test/tcr/comparisons/889.php b/hphp/test/slow/comparisons/889.php
similarity index 100%
rename from hphp/test/tcr/comparisons/889.php
rename to hphp/test/slow/comparisons/889.php
diff --git a/hphp/test/tcr/comparisons/889.php.expect b/hphp/test/slow/comparisons/889.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/889.php.expect
rename to hphp/test/slow/comparisons/889.php.expect
diff --git a/hphp/test/tcr/comparisons/890.php b/hphp/test/slow/comparisons/890.php
similarity index 100%
rename from hphp/test/tcr/comparisons/890.php
rename to hphp/test/slow/comparisons/890.php
diff --git a/hphp/test/tcr/comparisons/890.php.expect b/hphp/test/slow/comparisons/890.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/890.php.expect
rename to hphp/test/slow/comparisons/890.php.expect
diff --git a/hphp/test/tcr/comparisons/891.php b/hphp/test/slow/comparisons/891.php
similarity index 100%
rename from hphp/test/tcr/comparisons/891.php
rename to hphp/test/slow/comparisons/891.php
diff --git a/hphp/test/tcr/comparisons/891.php.expect b/hphp/test/slow/comparisons/891.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/891.php.expect
rename to hphp/test/slow/comparisons/891.php.expect
diff --git a/hphp/test/tcr/comparisons/892.php b/hphp/test/slow/comparisons/892.php
similarity index 100%
rename from hphp/test/tcr/comparisons/892.php
rename to hphp/test/slow/comparisons/892.php
diff --git a/hphp/test/tcr/comparisons/892.php.expect b/hphp/test/slow/comparisons/892.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/892.php.expect
rename to hphp/test/slow/comparisons/892.php.expect
diff --git a/hphp/test/tcr/comparisons/893.php b/hphp/test/slow/comparisons/893.php
similarity index 100%
rename from hphp/test/tcr/comparisons/893.php
rename to hphp/test/slow/comparisons/893.php
diff --git a/hphp/test/tcr/comparisons/893.php.expect b/hphp/test/slow/comparisons/893.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/893.php.expect
rename to hphp/test/slow/comparisons/893.php.expect
diff --git a/hphp/test/tcr/comparisons/894.php b/hphp/test/slow/comparisons/894.php
similarity index 100%
rename from hphp/test/tcr/comparisons/894.php
rename to hphp/test/slow/comparisons/894.php
diff --git a/hphp/test/tcr/comparisons/894.php.expect b/hphp/test/slow/comparisons/894.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/894.php.expect
rename to hphp/test/slow/comparisons/894.php.expect
diff --git a/hphp/test/tcr/comparisons/895.php b/hphp/test/slow/comparisons/895.php
similarity index 100%
rename from hphp/test/tcr/comparisons/895.php
rename to hphp/test/slow/comparisons/895.php
diff --git a/hphp/test/tcr/comparisons/895.php.expect b/hphp/test/slow/comparisons/895.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/895.php.expect
rename to hphp/test/slow/comparisons/895.php.expect
diff --git a/hphp/test/tcr/comparisons/896.php b/hphp/test/slow/comparisons/896.php
similarity index 100%
rename from hphp/test/tcr/comparisons/896.php
rename to hphp/test/slow/comparisons/896.php
diff --git a/hphp/test/tcr/comparisons/896.php.expect b/hphp/test/slow/comparisons/896.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/896.php.expect
rename to hphp/test/slow/comparisons/896.php.expect
diff --git a/hphp/test/tcr/comparisons/897.php b/hphp/test/slow/comparisons/897.php
similarity index 100%
rename from hphp/test/tcr/comparisons/897.php
rename to hphp/test/slow/comparisons/897.php
diff --git a/hphp/test/tcr/comparisons/897.php.expect b/hphp/test/slow/comparisons/897.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/897.php.expect
rename to hphp/test/slow/comparisons/897.php.expect
diff --git a/hphp/test/tcr/comparisons/898.php b/hphp/test/slow/comparisons/898.php
similarity index 100%
rename from hphp/test/tcr/comparisons/898.php
rename to hphp/test/slow/comparisons/898.php
diff --git a/hphp/test/tcr/comparisons/898.php.expect b/hphp/test/slow/comparisons/898.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/898.php.expect
rename to hphp/test/slow/comparisons/898.php.expect
diff --git a/hphp/test/tcr/comparisons/899.php b/hphp/test/slow/comparisons/899.php
similarity index 100%
rename from hphp/test/tcr/comparisons/899.php
rename to hphp/test/slow/comparisons/899.php
diff --git a/hphp/test/tcr/comparisons/899.php.expect b/hphp/test/slow/comparisons/899.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/899.php.expect
rename to hphp/test/slow/comparisons/899.php.expect
diff --git a/hphp/test/tcr/comparisons/900.php b/hphp/test/slow/comparisons/900.php
similarity index 100%
rename from hphp/test/tcr/comparisons/900.php
rename to hphp/test/slow/comparisons/900.php
diff --git a/hphp/test/tcr/comparisons/900.php.expect b/hphp/test/slow/comparisons/900.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/900.php.expect
rename to hphp/test/slow/comparisons/900.php.expect
diff --git a/hphp/test/tcr/comparisons/901.php b/hphp/test/slow/comparisons/901.php
similarity index 100%
rename from hphp/test/tcr/comparisons/901.php
rename to hphp/test/slow/comparisons/901.php
diff --git a/hphp/test/tcr/comparisons/901.php.expect b/hphp/test/slow/comparisons/901.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/901.php.expect
rename to hphp/test/slow/comparisons/901.php.expect
diff --git a/hphp/test/tcr/comparisons/902.php b/hphp/test/slow/comparisons/902.php
similarity index 100%
rename from hphp/test/tcr/comparisons/902.php
rename to hphp/test/slow/comparisons/902.php
diff --git a/hphp/test/tcr/comparisons/902.php.expect b/hphp/test/slow/comparisons/902.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/902.php.expect
rename to hphp/test/slow/comparisons/902.php.expect
diff --git a/hphp/test/tcr/comparisons/903.php b/hphp/test/slow/comparisons/903.php
similarity index 100%
rename from hphp/test/tcr/comparisons/903.php
rename to hphp/test/slow/comparisons/903.php
diff --git a/hphp/test/tcr/comparisons/903.php.expect b/hphp/test/slow/comparisons/903.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/903.php.expect
rename to hphp/test/slow/comparisons/903.php.expect
diff --git a/hphp/test/tcr/comparisons/904.php b/hphp/test/slow/comparisons/904.php
similarity index 100%
rename from hphp/test/tcr/comparisons/904.php
rename to hphp/test/slow/comparisons/904.php
diff --git a/hphp/test/tcr/comparisons/904.php.expect b/hphp/test/slow/comparisons/904.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/904.php.expect
rename to hphp/test/slow/comparisons/904.php.expect
diff --git a/hphp/test/tcr/comparisons/905.php b/hphp/test/slow/comparisons/905.php
similarity index 100%
rename from hphp/test/tcr/comparisons/905.php
rename to hphp/test/slow/comparisons/905.php
diff --git a/hphp/test/tcr/comparisons/905.php.expect b/hphp/test/slow/comparisons/905.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/905.php.expect
rename to hphp/test/slow/comparisons/905.php.expect
diff --git a/hphp/test/tcr/comparisons/906.php b/hphp/test/slow/comparisons/906.php
similarity index 100%
rename from hphp/test/tcr/comparisons/906.php
rename to hphp/test/slow/comparisons/906.php
diff --git a/hphp/test/tcr/comparisons/906.php.expect b/hphp/test/slow/comparisons/906.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/906.php.expect
rename to hphp/test/slow/comparisons/906.php.expect
diff --git a/hphp/test/tcr/comparisons/907.php b/hphp/test/slow/comparisons/907.php
similarity index 100%
rename from hphp/test/tcr/comparisons/907.php
rename to hphp/test/slow/comparisons/907.php
diff --git a/hphp/test/tcr/comparisons/907.php.expect b/hphp/test/slow/comparisons/907.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/907.php.expect
rename to hphp/test/slow/comparisons/907.php.expect
diff --git a/hphp/test/tcr/comparisons/908.php b/hphp/test/slow/comparisons/908.php
similarity index 100%
rename from hphp/test/tcr/comparisons/908.php
rename to hphp/test/slow/comparisons/908.php
diff --git a/hphp/test/tcr/comparisons/908.php.expect b/hphp/test/slow/comparisons/908.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/908.php.expect
rename to hphp/test/slow/comparisons/908.php.expect
diff --git a/hphp/test/tcr/comparisons/909.php b/hphp/test/slow/comparisons/909.php
similarity index 100%
rename from hphp/test/tcr/comparisons/909.php
rename to hphp/test/slow/comparisons/909.php
diff --git a/hphp/test/tcr/comparisons/909.php.expect b/hphp/test/slow/comparisons/909.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/909.php.expect
rename to hphp/test/slow/comparisons/909.php.expect
diff --git a/hphp/test/tcr/comparisons/910.php b/hphp/test/slow/comparisons/910.php
similarity index 100%
rename from hphp/test/tcr/comparisons/910.php
rename to hphp/test/slow/comparisons/910.php
diff --git a/hphp/test/tcr/comparisons/910.php.expect b/hphp/test/slow/comparisons/910.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/910.php.expect
rename to hphp/test/slow/comparisons/910.php.expect
diff --git a/hphp/test/tcr/comparisons/911.php b/hphp/test/slow/comparisons/911.php
similarity index 100%
rename from hphp/test/tcr/comparisons/911.php
rename to hphp/test/slow/comparisons/911.php
diff --git a/hphp/test/tcr/comparisons/911.php.expect b/hphp/test/slow/comparisons/911.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/911.php.expect
rename to hphp/test/slow/comparisons/911.php.expect
diff --git a/hphp/test/tcr/comparisons/912.php b/hphp/test/slow/comparisons/912.php
similarity index 100%
rename from hphp/test/tcr/comparisons/912.php
rename to hphp/test/slow/comparisons/912.php
diff --git a/hphp/test/tcr/comparisons/912.php.expect b/hphp/test/slow/comparisons/912.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/912.php.expect
rename to hphp/test/slow/comparisons/912.php.expect
diff --git a/hphp/test/tcr/comparisons/913.php b/hphp/test/slow/comparisons/913.php
similarity index 100%
rename from hphp/test/tcr/comparisons/913.php
rename to hphp/test/slow/comparisons/913.php
diff --git a/hphp/test/tcr/comparisons/913.php.expect b/hphp/test/slow/comparisons/913.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/913.php.expect
rename to hphp/test/slow/comparisons/913.php.expect
diff --git a/hphp/test/tcr/comparisons/914.php b/hphp/test/slow/comparisons/914.php
similarity index 100%
rename from hphp/test/tcr/comparisons/914.php
rename to hphp/test/slow/comparisons/914.php
diff --git a/hphp/test/tcr/comparisons/914.php.expect b/hphp/test/slow/comparisons/914.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/914.php.expect
rename to hphp/test/slow/comparisons/914.php.expect
diff --git a/hphp/test/tcr/comparisons/915.php b/hphp/test/slow/comparisons/915.php
similarity index 100%
rename from hphp/test/tcr/comparisons/915.php
rename to hphp/test/slow/comparisons/915.php
diff --git a/hphp/test/tcr/comparisons/915.php.expect b/hphp/test/slow/comparisons/915.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/915.php.expect
rename to hphp/test/slow/comparisons/915.php.expect
diff --git a/hphp/test/tcr/comparisons/916.php b/hphp/test/slow/comparisons/916.php
similarity index 100%
rename from hphp/test/tcr/comparisons/916.php
rename to hphp/test/slow/comparisons/916.php
diff --git a/hphp/test/tcr/comparisons/916.php.expect b/hphp/test/slow/comparisons/916.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/916.php.expect
rename to hphp/test/slow/comparisons/916.php.expect
diff --git a/hphp/test/tcr/comparisons/917.php b/hphp/test/slow/comparisons/917.php
similarity index 100%
rename from hphp/test/tcr/comparisons/917.php
rename to hphp/test/slow/comparisons/917.php
diff --git a/hphp/test/tcr/comparisons/917.php.expect b/hphp/test/slow/comparisons/917.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/917.php.expect
rename to hphp/test/slow/comparisons/917.php.expect
diff --git a/hphp/test/tcr/comparisons/918.php b/hphp/test/slow/comparisons/918.php
similarity index 100%
rename from hphp/test/tcr/comparisons/918.php
rename to hphp/test/slow/comparisons/918.php
diff --git a/hphp/test/tcr/comparisons/918.php.expect b/hphp/test/slow/comparisons/918.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/918.php.expect
rename to hphp/test/slow/comparisons/918.php.expect
diff --git a/hphp/test/tcr/comparisons/919.php b/hphp/test/slow/comparisons/919.php
similarity index 100%
rename from hphp/test/tcr/comparisons/919.php
rename to hphp/test/slow/comparisons/919.php
diff --git a/hphp/test/tcr/comparisons/919.php.expect b/hphp/test/slow/comparisons/919.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/919.php.expect
rename to hphp/test/slow/comparisons/919.php.expect
diff --git a/hphp/test/tcr/comparisons/920.php b/hphp/test/slow/comparisons/920.php
similarity index 100%
rename from hphp/test/tcr/comparisons/920.php
rename to hphp/test/slow/comparisons/920.php
diff --git a/hphp/test/tcr/comparisons/920.php.expect b/hphp/test/slow/comparisons/920.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/920.php.expect
rename to hphp/test/slow/comparisons/920.php.expect
diff --git a/hphp/test/tcr/comparisons/921.php b/hphp/test/slow/comparisons/921.php
similarity index 100%
rename from hphp/test/tcr/comparisons/921.php
rename to hphp/test/slow/comparisons/921.php
diff --git a/hphp/test/tcr/comparisons/921.php.expect b/hphp/test/slow/comparisons/921.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/921.php.expect
rename to hphp/test/slow/comparisons/921.php.expect
diff --git a/hphp/test/tcr/comparisons/922.php b/hphp/test/slow/comparisons/922.php
similarity index 100%
rename from hphp/test/tcr/comparisons/922.php
rename to hphp/test/slow/comparisons/922.php
diff --git a/hphp/test/tcr/comparisons/922.php.expect b/hphp/test/slow/comparisons/922.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/922.php.expect
rename to hphp/test/slow/comparisons/922.php.expect
diff --git a/hphp/test/tcr/comparisons/923.php b/hphp/test/slow/comparisons/923.php
similarity index 100%
rename from hphp/test/tcr/comparisons/923.php
rename to hphp/test/slow/comparisons/923.php
diff --git a/hphp/test/tcr/comparisons/923.php.expect b/hphp/test/slow/comparisons/923.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/923.php.expect
rename to hphp/test/slow/comparisons/923.php.expect
diff --git a/hphp/test/tcr/comparisons/924.php b/hphp/test/slow/comparisons/924.php
similarity index 100%
rename from hphp/test/tcr/comparisons/924.php
rename to hphp/test/slow/comparisons/924.php
diff --git a/hphp/test/tcr/comparisons/924.php.expect b/hphp/test/slow/comparisons/924.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/924.php.expect
rename to hphp/test/slow/comparisons/924.php.expect
diff --git a/hphp/test/tcr/comparisons/925.php b/hphp/test/slow/comparisons/925.php
similarity index 100%
rename from hphp/test/tcr/comparisons/925.php
rename to hphp/test/slow/comparisons/925.php
diff --git a/hphp/test/tcr/comparisons/925.php.expect b/hphp/test/slow/comparisons/925.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/925.php.expect
rename to hphp/test/slow/comparisons/925.php.expect
diff --git a/hphp/test/tcr/comparisons/926.php b/hphp/test/slow/comparisons/926.php
similarity index 100%
rename from hphp/test/tcr/comparisons/926.php
rename to hphp/test/slow/comparisons/926.php
diff --git a/hphp/test/tcr/comparisons/926.php.expect b/hphp/test/slow/comparisons/926.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/926.php.expect
rename to hphp/test/slow/comparisons/926.php.expect
diff --git a/hphp/test/tcr/comparisons/927.php b/hphp/test/slow/comparisons/927.php
similarity index 100%
rename from hphp/test/tcr/comparisons/927.php
rename to hphp/test/slow/comparisons/927.php
diff --git a/hphp/test/tcr/comparisons/927.php.expect b/hphp/test/slow/comparisons/927.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/927.php.expect
rename to hphp/test/slow/comparisons/927.php.expect
diff --git a/hphp/test/tcr/comparisons/928.php b/hphp/test/slow/comparisons/928.php
similarity index 100%
rename from hphp/test/tcr/comparisons/928.php
rename to hphp/test/slow/comparisons/928.php
diff --git a/hphp/test/tcr/comparisons/928.php.expect b/hphp/test/slow/comparisons/928.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/928.php.expect
rename to hphp/test/slow/comparisons/928.php.expect
diff --git a/hphp/test/tcr/comparisons/929.php b/hphp/test/slow/comparisons/929.php
similarity index 100%
rename from hphp/test/tcr/comparisons/929.php
rename to hphp/test/slow/comparisons/929.php
diff --git a/hphp/test/tcr/comparisons/929.php.expect b/hphp/test/slow/comparisons/929.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/929.php.expect
rename to hphp/test/slow/comparisons/929.php.expect
diff --git a/hphp/test/tcr/comparisons/930.php b/hphp/test/slow/comparisons/930.php
similarity index 100%
rename from hphp/test/tcr/comparisons/930.php
rename to hphp/test/slow/comparisons/930.php
diff --git a/hphp/test/tcr/comparisons/930.php.expect b/hphp/test/slow/comparisons/930.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/930.php.expect
rename to hphp/test/slow/comparisons/930.php.expect
diff --git a/hphp/test/tcr/comparisons/931.php b/hphp/test/slow/comparisons/931.php
similarity index 100%
rename from hphp/test/tcr/comparisons/931.php
rename to hphp/test/slow/comparisons/931.php
diff --git a/hphp/test/tcr/comparisons/931.php.expect b/hphp/test/slow/comparisons/931.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/931.php.expect
rename to hphp/test/slow/comparisons/931.php.expect
diff --git a/hphp/test/tcr/comparisons/932.php b/hphp/test/slow/comparisons/932.php
similarity index 100%
rename from hphp/test/tcr/comparisons/932.php
rename to hphp/test/slow/comparisons/932.php
diff --git a/hphp/test/tcr/comparisons/932.php.expect b/hphp/test/slow/comparisons/932.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/932.php.expect
rename to hphp/test/slow/comparisons/932.php.expect
diff --git a/hphp/test/tcr/comparisons/933.php b/hphp/test/slow/comparisons/933.php
similarity index 100%
rename from hphp/test/tcr/comparisons/933.php
rename to hphp/test/slow/comparisons/933.php
diff --git a/hphp/test/tcr/comparisons/933.php.expect b/hphp/test/slow/comparisons/933.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/933.php.expect
rename to hphp/test/slow/comparisons/933.php.expect
diff --git a/hphp/test/tcr/comparisons/934.php b/hphp/test/slow/comparisons/934.php
similarity index 100%
rename from hphp/test/tcr/comparisons/934.php
rename to hphp/test/slow/comparisons/934.php
diff --git a/hphp/test/tcr/comparisons/934.php.expect b/hphp/test/slow/comparisons/934.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/934.php.expect
rename to hphp/test/slow/comparisons/934.php.expect
diff --git a/hphp/test/tcr/comparisons/935.php b/hphp/test/slow/comparisons/935.php
similarity index 100%
rename from hphp/test/tcr/comparisons/935.php
rename to hphp/test/slow/comparisons/935.php
diff --git a/hphp/test/tcr/comparisons/935.php.expect b/hphp/test/slow/comparisons/935.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/935.php.expect
rename to hphp/test/slow/comparisons/935.php.expect
diff --git a/hphp/test/tcr/comparisons/936.php b/hphp/test/slow/comparisons/936.php
similarity index 100%
rename from hphp/test/tcr/comparisons/936.php
rename to hphp/test/slow/comparisons/936.php
diff --git a/hphp/test/tcr/comparisons/936.php.expect b/hphp/test/slow/comparisons/936.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/936.php.expect
rename to hphp/test/slow/comparisons/936.php.expect
diff --git a/hphp/test/tcr/comparisons/937.php b/hphp/test/slow/comparisons/937.php
similarity index 100%
rename from hphp/test/tcr/comparisons/937.php
rename to hphp/test/slow/comparisons/937.php
diff --git a/hphp/test/tcr/comparisons/937.php.expect b/hphp/test/slow/comparisons/937.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/937.php.expect
rename to hphp/test/slow/comparisons/937.php.expect
diff --git a/hphp/test/tcr/comparisons/938.php b/hphp/test/slow/comparisons/938.php
similarity index 100%
rename from hphp/test/tcr/comparisons/938.php
rename to hphp/test/slow/comparisons/938.php
diff --git a/hphp/test/tcr/comparisons/938.php.expect b/hphp/test/slow/comparisons/938.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/938.php.expect
rename to hphp/test/slow/comparisons/938.php.expect
diff --git a/hphp/test/tcr/comparisons/939.php b/hphp/test/slow/comparisons/939.php
similarity index 100%
rename from hphp/test/tcr/comparisons/939.php
rename to hphp/test/slow/comparisons/939.php
diff --git a/hphp/test/tcr/comparisons/939.php.expect b/hphp/test/slow/comparisons/939.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/939.php.expect
rename to hphp/test/slow/comparisons/939.php.expect
diff --git a/hphp/test/tcr/comparisons/940.php b/hphp/test/slow/comparisons/940.php
similarity index 100%
rename from hphp/test/tcr/comparisons/940.php
rename to hphp/test/slow/comparisons/940.php
diff --git a/hphp/test/tcr/comparisons/940.php.expect b/hphp/test/slow/comparisons/940.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/940.php.expect
rename to hphp/test/slow/comparisons/940.php.expect
diff --git a/hphp/test/tcr/comparisons/941.php b/hphp/test/slow/comparisons/941.php
similarity index 100%
rename from hphp/test/tcr/comparisons/941.php
rename to hphp/test/slow/comparisons/941.php
diff --git a/hphp/test/tcr/comparisons/941.php.expect b/hphp/test/slow/comparisons/941.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/941.php.expect
rename to hphp/test/slow/comparisons/941.php.expect
diff --git a/hphp/test/tcr/comparisons/942.php b/hphp/test/slow/comparisons/942.php
similarity index 100%
rename from hphp/test/tcr/comparisons/942.php
rename to hphp/test/slow/comparisons/942.php
diff --git a/hphp/test/tcr/comparisons/942.php.expect b/hphp/test/slow/comparisons/942.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/942.php.expect
rename to hphp/test/slow/comparisons/942.php.expect
diff --git a/hphp/test/tcr/comparisons/943.php b/hphp/test/slow/comparisons/943.php
similarity index 100%
rename from hphp/test/tcr/comparisons/943.php
rename to hphp/test/slow/comparisons/943.php
diff --git a/hphp/test/tcr/comparisons/943.php.expect b/hphp/test/slow/comparisons/943.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/943.php.expect
rename to hphp/test/slow/comparisons/943.php.expect
diff --git a/hphp/test/tcr/comparisons/944.php b/hphp/test/slow/comparisons/944.php
similarity index 100%
rename from hphp/test/tcr/comparisons/944.php
rename to hphp/test/slow/comparisons/944.php
diff --git a/hphp/test/tcr/comparisons/944.php.expect b/hphp/test/slow/comparisons/944.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/944.php.expect
rename to hphp/test/slow/comparisons/944.php.expect
diff --git a/hphp/test/tcr/comparisons/945.php b/hphp/test/slow/comparisons/945.php
similarity index 100%
rename from hphp/test/tcr/comparisons/945.php
rename to hphp/test/slow/comparisons/945.php
diff --git a/hphp/test/tcr/comparisons/945.php.expect b/hphp/test/slow/comparisons/945.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/945.php.expect
rename to hphp/test/slow/comparisons/945.php.expect
diff --git a/hphp/test/tcr/comparisons/946.php b/hphp/test/slow/comparisons/946.php
similarity index 100%
rename from hphp/test/tcr/comparisons/946.php
rename to hphp/test/slow/comparisons/946.php
diff --git a/hphp/test/tcr/comparisons/946.php.expect b/hphp/test/slow/comparisons/946.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/946.php.expect
rename to hphp/test/slow/comparisons/946.php.expect
diff --git a/hphp/test/tcr/comparisons/947.php b/hphp/test/slow/comparisons/947.php
similarity index 100%
rename from hphp/test/tcr/comparisons/947.php
rename to hphp/test/slow/comparisons/947.php
diff --git a/hphp/test/tcr/comparisons/947.php.expect b/hphp/test/slow/comparisons/947.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/947.php.expect
rename to hphp/test/slow/comparisons/947.php.expect
diff --git a/hphp/test/tcr/comparisons/948.php b/hphp/test/slow/comparisons/948.php
similarity index 100%
rename from hphp/test/tcr/comparisons/948.php
rename to hphp/test/slow/comparisons/948.php
diff --git a/hphp/test/tcr/comparisons/948.php.expect b/hphp/test/slow/comparisons/948.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/948.php.expect
rename to hphp/test/slow/comparisons/948.php.expect
diff --git a/hphp/test/tcr/comparisons/949.php b/hphp/test/slow/comparisons/949.php
similarity index 100%
rename from hphp/test/tcr/comparisons/949.php
rename to hphp/test/slow/comparisons/949.php
diff --git a/hphp/test/tcr/comparisons/949.php.expect b/hphp/test/slow/comparisons/949.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/949.php.expect
rename to hphp/test/slow/comparisons/949.php.expect
diff --git a/hphp/test/tcr/comparisons/950.php b/hphp/test/slow/comparisons/950.php
similarity index 100%
rename from hphp/test/tcr/comparisons/950.php
rename to hphp/test/slow/comparisons/950.php
diff --git a/hphp/test/tcr/comparisons/950.php.expect b/hphp/test/slow/comparisons/950.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/950.php.expect
rename to hphp/test/slow/comparisons/950.php.expect
diff --git a/hphp/test/tcr/comparisons/951.php b/hphp/test/slow/comparisons/951.php
similarity index 100%
rename from hphp/test/tcr/comparisons/951.php
rename to hphp/test/slow/comparisons/951.php
diff --git a/hphp/test/tcr/comparisons/951.php.expect b/hphp/test/slow/comparisons/951.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/951.php.expect
rename to hphp/test/slow/comparisons/951.php.expect
diff --git a/hphp/test/tcr/comparisons/952.php b/hphp/test/slow/comparisons/952.php
similarity index 100%
rename from hphp/test/tcr/comparisons/952.php
rename to hphp/test/slow/comparisons/952.php
diff --git a/hphp/test/tcr/comparisons/952.php.expect b/hphp/test/slow/comparisons/952.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/952.php.expect
rename to hphp/test/slow/comparisons/952.php.expect
diff --git a/hphp/test/tcr/comparisons/953.php b/hphp/test/slow/comparisons/953.php
similarity index 100%
rename from hphp/test/tcr/comparisons/953.php
rename to hphp/test/slow/comparisons/953.php
diff --git a/hphp/test/tcr/comparisons/953.php.expect b/hphp/test/slow/comparisons/953.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/953.php.expect
rename to hphp/test/slow/comparisons/953.php.expect
diff --git a/hphp/test/tcr/comparisons/954.php b/hphp/test/slow/comparisons/954.php
similarity index 100%
rename from hphp/test/tcr/comparisons/954.php
rename to hphp/test/slow/comparisons/954.php
diff --git a/hphp/test/tcr/comparisons/954.php.expect b/hphp/test/slow/comparisons/954.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/954.php.expect
rename to hphp/test/slow/comparisons/954.php.expect
diff --git a/hphp/test/tcr/comparisons/955.php b/hphp/test/slow/comparisons/955.php
similarity index 100%
rename from hphp/test/tcr/comparisons/955.php
rename to hphp/test/slow/comparisons/955.php
diff --git a/hphp/test/tcr/comparisons/955.php.expect b/hphp/test/slow/comparisons/955.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/955.php.expect
rename to hphp/test/slow/comparisons/955.php.expect
diff --git a/hphp/test/tcr/comparisons/956.php b/hphp/test/slow/comparisons/956.php
similarity index 100%
rename from hphp/test/tcr/comparisons/956.php
rename to hphp/test/slow/comparisons/956.php
diff --git a/hphp/test/tcr/comparisons/956.php.expect b/hphp/test/slow/comparisons/956.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/956.php.expect
rename to hphp/test/slow/comparisons/956.php.expect
diff --git a/hphp/test/tcr/comparisons/957.php b/hphp/test/slow/comparisons/957.php
similarity index 100%
rename from hphp/test/tcr/comparisons/957.php
rename to hphp/test/slow/comparisons/957.php
diff --git a/hphp/test/tcr/comparisons/957.php.expect b/hphp/test/slow/comparisons/957.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/957.php.expect
rename to hphp/test/slow/comparisons/957.php.expect
diff --git a/hphp/test/tcr/comparisons/958.php b/hphp/test/slow/comparisons/958.php
similarity index 100%
rename from hphp/test/tcr/comparisons/958.php
rename to hphp/test/slow/comparisons/958.php
diff --git a/hphp/test/tcr/comparisons/958.php.expect b/hphp/test/slow/comparisons/958.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/958.php.expect
rename to hphp/test/slow/comparisons/958.php.expect
diff --git a/hphp/test/tcr/comparisons/959.php b/hphp/test/slow/comparisons/959.php
similarity index 100%
rename from hphp/test/tcr/comparisons/959.php
rename to hphp/test/slow/comparisons/959.php
diff --git a/hphp/test/tcr/comparisons/959.php.expect b/hphp/test/slow/comparisons/959.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/959.php.expect
rename to hphp/test/slow/comparisons/959.php.expect
diff --git a/hphp/test/tcr/comparisons/960.php b/hphp/test/slow/comparisons/960.php
similarity index 100%
rename from hphp/test/tcr/comparisons/960.php
rename to hphp/test/slow/comparisons/960.php
diff --git a/hphp/test/tcr/comparisons/960.php.expect b/hphp/test/slow/comparisons/960.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/960.php.expect
rename to hphp/test/slow/comparisons/960.php.expect
diff --git a/hphp/test/tcr/comparisons/961.php b/hphp/test/slow/comparisons/961.php
similarity index 100%
rename from hphp/test/tcr/comparisons/961.php
rename to hphp/test/slow/comparisons/961.php
diff --git a/hphp/test/tcr/comparisons/961.php.expect b/hphp/test/slow/comparisons/961.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/961.php.expect
rename to hphp/test/slow/comparisons/961.php.expect
diff --git a/hphp/test/tcr/comparisons/962.php b/hphp/test/slow/comparisons/962.php
similarity index 100%
rename from hphp/test/tcr/comparisons/962.php
rename to hphp/test/slow/comparisons/962.php
diff --git a/hphp/test/tcr/comparisons/962.php.expect b/hphp/test/slow/comparisons/962.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/962.php.expect
rename to hphp/test/slow/comparisons/962.php.expect
diff --git a/hphp/test/tcr/comparisons/963.php b/hphp/test/slow/comparisons/963.php
similarity index 100%
rename from hphp/test/tcr/comparisons/963.php
rename to hphp/test/slow/comparisons/963.php
diff --git a/hphp/test/tcr/comparisons/963.php.expect b/hphp/test/slow/comparisons/963.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/963.php.expect
rename to hphp/test/slow/comparisons/963.php.expect
diff --git a/hphp/test/tcr/comparisons/964.php b/hphp/test/slow/comparisons/964.php
similarity index 100%
rename from hphp/test/tcr/comparisons/964.php
rename to hphp/test/slow/comparisons/964.php
diff --git a/hphp/test/tcr/comparisons/964.php.expect b/hphp/test/slow/comparisons/964.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/964.php.expect
rename to hphp/test/slow/comparisons/964.php.expect
diff --git a/hphp/test/tcr/comparisons/965.php b/hphp/test/slow/comparisons/965.php
similarity index 100%
rename from hphp/test/tcr/comparisons/965.php
rename to hphp/test/slow/comparisons/965.php
diff --git a/hphp/test/tcr/comparisons/965.php.expect b/hphp/test/slow/comparisons/965.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/965.php.expect
rename to hphp/test/slow/comparisons/965.php.expect
diff --git a/hphp/test/tcr/comparisons/966.php b/hphp/test/slow/comparisons/966.php
similarity index 100%
rename from hphp/test/tcr/comparisons/966.php
rename to hphp/test/slow/comparisons/966.php
diff --git a/hphp/test/tcr/comparisons/966.php.expect b/hphp/test/slow/comparisons/966.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/966.php.expect
rename to hphp/test/slow/comparisons/966.php.expect
diff --git a/hphp/test/tcr/comparisons/967.php b/hphp/test/slow/comparisons/967.php
similarity index 100%
rename from hphp/test/tcr/comparisons/967.php
rename to hphp/test/slow/comparisons/967.php
diff --git a/hphp/test/tcr/comparisons/967.php.expect b/hphp/test/slow/comparisons/967.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/967.php.expect
rename to hphp/test/slow/comparisons/967.php.expect
diff --git a/hphp/test/tcr/comparisons/968.php b/hphp/test/slow/comparisons/968.php
similarity index 100%
rename from hphp/test/tcr/comparisons/968.php
rename to hphp/test/slow/comparisons/968.php
diff --git a/hphp/test/tcr/comparisons/968.php.expect b/hphp/test/slow/comparisons/968.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/968.php.expect
rename to hphp/test/slow/comparisons/968.php.expect
diff --git a/hphp/test/tcr/comparisons/969.php b/hphp/test/slow/comparisons/969.php
similarity index 100%
rename from hphp/test/tcr/comparisons/969.php
rename to hphp/test/slow/comparisons/969.php
diff --git a/hphp/test/tcr/comparisons/969.php.expect b/hphp/test/slow/comparisons/969.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/969.php.expect
rename to hphp/test/slow/comparisons/969.php.expect
diff --git a/hphp/test/tcr/comparisons/970.php b/hphp/test/slow/comparisons/970.php
similarity index 100%
rename from hphp/test/tcr/comparisons/970.php
rename to hphp/test/slow/comparisons/970.php
diff --git a/hphp/test/tcr/comparisons/970.php.expect b/hphp/test/slow/comparisons/970.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/970.php.expect
rename to hphp/test/slow/comparisons/970.php.expect
diff --git a/hphp/test/tcr/comparisons/971.php b/hphp/test/slow/comparisons/971.php
similarity index 100%
rename from hphp/test/tcr/comparisons/971.php
rename to hphp/test/slow/comparisons/971.php
diff --git a/hphp/test/tcr/comparisons/971.php.expect b/hphp/test/slow/comparisons/971.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/971.php.expect
rename to hphp/test/slow/comparisons/971.php.expect
diff --git a/hphp/test/tcr/comparisons/972.php b/hphp/test/slow/comparisons/972.php
similarity index 100%
rename from hphp/test/tcr/comparisons/972.php
rename to hphp/test/slow/comparisons/972.php
diff --git a/hphp/test/tcr/comparisons/972.php.expect b/hphp/test/slow/comparisons/972.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/972.php.expect
rename to hphp/test/slow/comparisons/972.php.expect
diff --git a/hphp/test/tcr/comparisons/973.php b/hphp/test/slow/comparisons/973.php
similarity index 100%
rename from hphp/test/tcr/comparisons/973.php
rename to hphp/test/slow/comparisons/973.php
diff --git a/hphp/test/tcr/comparisons/973.php.expect b/hphp/test/slow/comparisons/973.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/973.php.expect
rename to hphp/test/slow/comparisons/973.php.expect
diff --git a/hphp/test/tcr/comparisons/974.php b/hphp/test/slow/comparisons/974.php
similarity index 100%
rename from hphp/test/tcr/comparisons/974.php
rename to hphp/test/slow/comparisons/974.php
diff --git a/hphp/test/tcr/comparisons/974.php.expect b/hphp/test/slow/comparisons/974.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/974.php.expect
rename to hphp/test/slow/comparisons/974.php.expect
diff --git a/hphp/test/tcr/comparisons/975.php b/hphp/test/slow/comparisons/975.php
similarity index 100%
rename from hphp/test/tcr/comparisons/975.php
rename to hphp/test/slow/comparisons/975.php
diff --git a/hphp/test/tcr/comparisons/975.php.expect b/hphp/test/slow/comparisons/975.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/975.php.expect
rename to hphp/test/slow/comparisons/975.php.expect
diff --git a/hphp/test/tcr/comparisons/976.php b/hphp/test/slow/comparisons/976.php
similarity index 100%
rename from hphp/test/tcr/comparisons/976.php
rename to hphp/test/slow/comparisons/976.php
diff --git a/hphp/test/tcr/comparisons/976.php.expect b/hphp/test/slow/comparisons/976.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/976.php.expect
rename to hphp/test/slow/comparisons/976.php.expect
diff --git a/hphp/test/tcr/comparisons/977.php b/hphp/test/slow/comparisons/977.php
similarity index 100%
rename from hphp/test/tcr/comparisons/977.php
rename to hphp/test/slow/comparisons/977.php
diff --git a/hphp/test/tcr/comparisons/977.php.expect b/hphp/test/slow/comparisons/977.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/977.php.expect
rename to hphp/test/slow/comparisons/977.php.expect
diff --git a/hphp/test/tcr/comparisons/978.php b/hphp/test/slow/comparisons/978.php
similarity index 100%
rename from hphp/test/tcr/comparisons/978.php
rename to hphp/test/slow/comparisons/978.php
diff --git a/hphp/test/tcr/comparisons/978.php.expect b/hphp/test/slow/comparisons/978.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/978.php.expect
rename to hphp/test/slow/comparisons/978.php.expect
diff --git a/hphp/test/tcr/comparisons/979.php b/hphp/test/slow/comparisons/979.php
similarity index 100%
rename from hphp/test/tcr/comparisons/979.php
rename to hphp/test/slow/comparisons/979.php
diff --git a/hphp/test/tcr/comparisons/979.php.expect b/hphp/test/slow/comparisons/979.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/979.php.expect
rename to hphp/test/slow/comparisons/979.php.expect
diff --git a/hphp/test/tcr/comparisons/980.php b/hphp/test/slow/comparisons/980.php
similarity index 100%
rename from hphp/test/tcr/comparisons/980.php
rename to hphp/test/slow/comparisons/980.php
diff --git a/hphp/test/tcr/comparisons/980.php.expect b/hphp/test/slow/comparisons/980.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/980.php.expect
rename to hphp/test/slow/comparisons/980.php.expect
diff --git a/hphp/test/tcr/comparisons/981.php b/hphp/test/slow/comparisons/981.php
similarity index 100%
rename from hphp/test/tcr/comparisons/981.php
rename to hphp/test/slow/comparisons/981.php
diff --git a/hphp/test/tcr/comparisons/981.php.expect b/hphp/test/slow/comparisons/981.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/981.php.expect
rename to hphp/test/slow/comparisons/981.php.expect
diff --git a/hphp/test/tcr/comparisons/982.php b/hphp/test/slow/comparisons/982.php
similarity index 100%
rename from hphp/test/tcr/comparisons/982.php
rename to hphp/test/slow/comparisons/982.php
diff --git a/hphp/test/tcr/comparisons/982.php.expect b/hphp/test/slow/comparisons/982.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/982.php.expect
rename to hphp/test/slow/comparisons/982.php.expect
diff --git a/hphp/test/tcr/comparisons/983.php b/hphp/test/slow/comparisons/983.php
similarity index 100%
rename from hphp/test/tcr/comparisons/983.php
rename to hphp/test/slow/comparisons/983.php
diff --git a/hphp/test/tcr/comparisons/983.php.expect b/hphp/test/slow/comparisons/983.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/983.php.expect
rename to hphp/test/slow/comparisons/983.php.expect
diff --git a/hphp/test/tcr/comparisons/984.php b/hphp/test/slow/comparisons/984.php
similarity index 100%
rename from hphp/test/tcr/comparisons/984.php
rename to hphp/test/slow/comparisons/984.php
diff --git a/hphp/test/tcr/comparisons/984.php.expect b/hphp/test/slow/comparisons/984.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/984.php.expect
rename to hphp/test/slow/comparisons/984.php.expect
diff --git a/hphp/test/tcr/comparisons/985.php b/hphp/test/slow/comparisons/985.php
similarity index 100%
rename from hphp/test/tcr/comparisons/985.php
rename to hphp/test/slow/comparisons/985.php
diff --git a/hphp/test/tcr/comparisons/985.php.expect b/hphp/test/slow/comparisons/985.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/985.php.expect
rename to hphp/test/slow/comparisons/985.php.expect
diff --git a/hphp/test/tcr/comparisons/986.php b/hphp/test/slow/comparisons/986.php
similarity index 100%
rename from hphp/test/tcr/comparisons/986.php
rename to hphp/test/slow/comparisons/986.php
diff --git a/hphp/test/tcr/comparisons/986.php.expect b/hphp/test/slow/comparisons/986.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/986.php.expect
rename to hphp/test/slow/comparisons/986.php.expect
diff --git a/hphp/test/tcr/comparisons/987.php b/hphp/test/slow/comparisons/987.php
similarity index 100%
rename from hphp/test/tcr/comparisons/987.php
rename to hphp/test/slow/comparisons/987.php
diff --git a/hphp/test/tcr/comparisons/987.php.expect b/hphp/test/slow/comparisons/987.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/987.php.expect
rename to hphp/test/slow/comparisons/987.php.expect
diff --git a/hphp/test/tcr/comparisons/988.php b/hphp/test/slow/comparisons/988.php
similarity index 100%
rename from hphp/test/tcr/comparisons/988.php
rename to hphp/test/slow/comparisons/988.php
diff --git a/hphp/test/tcr/comparisons/988.php.expect b/hphp/test/slow/comparisons/988.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/988.php.expect
rename to hphp/test/slow/comparisons/988.php.expect
diff --git a/hphp/test/tcr/comparisons/989.php b/hphp/test/slow/comparisons/989.php
similarity index 100%
rename from hphp/test/tcr/comparisons/989.php
rename to hphp/test/slow/comparisons/989.php
diff --git a/hphp/test/tcr/comparisons/989.php.expect b/hphp/test/slow/comparisons/989.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/989.php.expect
rename to hphp/test/slow/comparisons/989.php.expect
diff --git a/hphp/test/tcr/comparisons/990.php b/hphp/test/slow/comparisons/990.php
similarity index 100%
rename from hphp/test/tcr/comparisons/990.php
rename to hphp/test/slow/comparisons/990.php
diff --git a/hphp/test/tcr/comparisons/990.php.expect b/hphp/test/slow/comparisons/990.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/990.php.expect
rename to hphp/test/slow/comparisons/990.php.expect
diff --git a/hphp/test/tcr/comparisons/991.php b/hphp/test/slow/comparisons/991.php
similarity index 100%
rename from hphp/test/tcr/comparisons/991.php
rename to hphp/test/slow/comparisons/991.php
diff --git a/hphp/test/tcr/comparisons/991.php.expect b/hphp/test/slow/comparisons/991.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/991.php.expect
rename to hphp/test/slow/comparisons/991.php.expect
diff --git a/hphp/test/tcr/comparisons/992.php b/hphp/test/slow/comparisons/992.php
similarity index 100%
rename from hphp/test/tcr/comparisons/992.php
rename to hphp/test/slow/comparisons/992.php
diff --git a/hphp/test/tcr/comparisons/992.php.expect b/hphp/test/slow/comparisons/992.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/992.php.expect
rename to hphp/test/slow/comparisons/992.php.expect
diff --git a/hphp/test/tcr/comparisons/993.php b/hphp/test/slow/comparisons/993.php
similarity index 100%
rename from hphp/test/tcr/comparisons/993.php
rename to hphp/test/slow/comparisons/993.php
diff --git a/hphp/test/tcr/comparisons/993.php.expect b/hphp/test/slow/comparisons/993.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/993.php.expect
rename to hphp/test/slow/comparisons/993.php.expect
diff --git a/hphp/test/tcr/comparisons/994.php b/hphp/test/slow/comparisons/994.php
similarity index 100%
rename from hphp/test/tcr/comparisons/994.php
rename to hphp/test/slow/comparisons/994.php
diff --git a/hphp/test/tcr/comparisons/994.php.expect b/hphp/test/slow/comparisons/994.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/994.php.expect
rename to hphp/test/slow/comparisons/994.php.expect
diff --git a/hphp/test/tcr/comparisons/995.php b/hphp/test/slow/comparisons/995.php
similarity index 100%
rename from hphp/test/tcr/comparisons/995.php
rename to hphp/test/slow/comparisons/995.php
diff --git a/hphp/test/tcr/comparisons/995.php.expect b/hphp/test/slow/comparisons/995.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/995.php.expect
rename to hphp/test/slow/comparisons/995.php.expect
diff --git a/hphp/test/tcr/comparisons/996.php b/hphp/test/slow/comparisons/996.php
similarity index 100%
rename from hphp/test/tcr/comparisons/996.php
rename to hphp/test/slow/comparisons/996.php
diff --git a/hphp/test/tcr/comparisons/996.php.expect b/hphp/test/slow/comparisons/996.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/996.php.expect
rename to hphp/test/slow/comparisons/996.php.expect
diff --git a/hphp/test/tcr/comparisons/997.php b/hphp/test/slow/comparisons/997.php
similarity index 100%
rename from hphp/test/tcr/comparisons/997.php
rename to hphp/test/slow/comparisons/997.php
diff --git a/hphp/test/tcr/comparisons/997.php.expect b/hphp/test/slow/comparisons/997.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/997.php.expect
rename to hphp/test/slow/comparisons/997.php.expect
diff --git a/hphp/test/tcr/comparisons/998.php b/hphp/test/slow/comparisons/998.php
similarity index 100%
rename from hphp/test/tcr/comparisons/998.php
rename to hphp/test/slow/comparisons/998.php
diff --git a/hphp/test/tcr/comparisons/998.php.expect b/hphp/test/slow/comparisons/998.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/998.php.expect
rename to hphp/test/slow/comparisons/998.php.expect
diff --git a/hphp/test/tcr/comparisons/999.php b/hphp/test/slow/comparisons/999.php
similarity index 100%
rename from hphp/test/tcr/comparisons/999.php
rename to hphp/test/slow/comparisons/999.php
diff --git a/hphp/test/tcr/comparisons/999.php.expect b/hphp/test/slow/comparisons/999.php.expect
similarity index 100%
rename from hphp/test/tcr/comparisons/999.php.expect
rename to hphp/test/slow/comparisons/999.php.expect
diff --git a/hphp/test/tcr/compilation/1237.php b/hphp/test/slow/compilation/1237.php
similarity index 100%
rename from hphp/test/tcr/compilation/1237.php
rename to hphp/test/slow/compilation/1237.php
diff --git a/hphp/test/tcr/compilation/1237.php.expect b/hphp/test/slow/compilation/1237.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1237.php.expect
rename to hphp/test/slow/compilation/1237.php.expect
diff --git a/hphp/test/tcr/compilation/1238.php b/hphp/test/slow/compilation/1238.php
similarity index 100%
rename from hphp/test/tcr/compilation/1238.php
rename to hphp/test/slow/compilation/1238.php
diff --git a/hphp/test/tcr/compilation/1238.php.expect b/hphp/test/slow/compilation/1238.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1238.php.expect
rename to hphp/test/slow/compilation/1238.php.expect
diff --git a/hphp/test/tcr/compilation/1239.php b/hphp/test/slow/compilation/1239.php
similarity index 100%
rename from hphp/test/tcr/compilation/1239.php
rename to hphp/test/slow/compilation/1239.php
diff --git a/hphp/test/tcr/compilation/1263.php.expect b/hphp/test/slow/compilation/1239.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1263.php.expect
rename to hphp/test/slow/compilation/1239.php.expect
diff --git a/hphp/test/tcr/compilation/1240.php b/hphp/test/slow/compilation/1240.php
similarity index 100%
rename from hphp/test/tcr/compilation/1240.php
rename to hphp/test/slow/compilation/1240.php
diff --git a/hphp/test/tcr/compilation/1267.php.expect b/hphp/test/slow/compilation/1240.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1267.php.expect
rename to hphp/test/slow/compilation/1240.php.expect
diff --git a/hphp/test/tcr/compilation/1241.php b/hphp/test/slow/compilation/1241.php
similarity index 100%
rename from hphp/test/tcr/compilation/1241.php
rename to hphp/test/slow/compilation/1241.php
diff --git a/hphp/test/tcr/compilation/1268.php.expect b/hphp/test/slow/compilation/1241.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1268.php.expect
rename to hphp/test/slow/compilation/1241.php.expect
diff --git a/hphp/test/tcr/compilation/1242.php b/hphp/test/slow/compilation/1242.php
similarity index 100%
rename from hphp/test/tcr/compilation/1242.php
rename to hphp/test/slow/compilation/1242.php
diff --git a/hphp/test/tcr/compilation/1242.php.expect b/hphp/test/slow/compilation/1242.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1242.php.expect
rename to hphp/test/slow/compilation/1242.php.expect
diff --git a/hphp/test/tcr/compilation/1243.php b/hphp/test/slow/compilation/1243.php
similarity index 100%
rename from hphp/test/tcr/compilation/1243.php
rename to hphp/test/slow/compilation/1243.php
diff --git a/hphp/test/tcr/compilation/1243.php.expect b/hphp/test/slow/compilation/1243.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1243.php.expect
rename to hphp/test/slow/compilation/1243.php.expect
diff --git a/hphp/test/tcr/compilation/1244.php b/hphp/test/slow/compilation/1244.php
similarity index 100%
rename from hphp/test/tcr/compilation/1244.php
rename to hphp/test/slow/compilation/1244.php
diff --git a/hphp/test/tcr/compilation/1273.php.expect b/hphp/test/slow/compilation/1244.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1273.php.expect
rename to hphp/test/slow/compilation/1244.php.expect
diff --git a/hphp/test/tcr/compilation/1245.php b/hphp/test/slow/compilation/1245.php
similarity index 100%
rename from hphp/test/tcr/compilation/1245.php
rename to hphp/test/slow/compilation/1245.php
diff --git a/hphp/test/tcr/compilation/1245.php.expect b/hphp/test/slow/compilation/1245.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1245.php.expect
rename to hphp/test/slow/compilation/1245.php.expect
diff --git a/hphp/test/tcr/compilation/1246.php b/hphp/test/slow/compilation/1246.php
similarity index 100%
rename from hphp/test/tcr/compilation/1246.php
rename to hphp/test/slow/compilation/1246.php
diff --git a/hphp/test/tcr/compilation/1246.php.expect b/hphp/test/slow/compilation/1246.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1246.php.expect
rename to hphp/test/slow/compilation/1246.php.expect
diff --git a/hphp/test/tcr/compilation/1247.php b/hphp/test/slow/compilation/1247.php
similarity index 100%
rename from hphp/test/tcr/compilation/1247.php
rename to hphp/test/slow/compilation/1247.php
diff --git a/hphp/test/tcr/compilation/1247.php.expect b/hphp/test/slow/compilation/1247.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1247.php.expect
rename to hphp/test/slow/compilation/1247.php.expect
diff --git a/hphp/test/tcr/compilation/1248.php b/hphp/test/slow/compilation/1248.php
similarity index 100%
rename from hphp/test/tcr/compilation/1248.php
rename to hphp/test/slow/compilation/1248.php
diff --git a/hphp/test/tcr/compilation/1248.php.expect b/hphp/test/slow/compilation/1248.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1248.php.expect
rename to hphp/test/slow/compilation/1248.php.expect
diff --git a/hphp/test/tcr/compilation/1249.php b/hphp/test/slow/compilation/1249.php
similarity index 100%
rename from hphp/test/tcr/compilation/1249.php
rename to hphp/test/slow/compilation/1249.php
diff --git a/hphp/test/tcr/compilation/1277.php.expect b/hphp/test/slow/compilation/1249.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1277.php.expect
rename to hphp/test/slow/compilation/1249.php.expect
diff --git a/hphp/test/tcr/compilation/1250.php b/hphp/test/slow/compilation/1250.php
similarity index 100%
rename from hphp/test/tcr/compilation/1250.php
rename to hphp/test/slow/compilation/1250.php
diff --git a/hphp/test/tcr/compilation/1250.php.expect b/hphp/test/slow/compilation/1250.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1250.php.expect
rename to hphp/test/slow/compilation/1250.php.expect
diff --git a/hphp/test/tcr/compilation/1251.php b/hphp/test/slow/compilation/1251.php
similarity index 100%
rename from hphp/test/tcr/compilation/1251.php
rename to hphp/test/slow/compilation/1251.php
diff --git a/hphp/test/tcr/compilation/1280.php.expect b/hphp/test/slow/compilation/1251.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1280.php.expect
rename to hphp/test/slow/compilation/1251.php.expect
diff --git a/hphp/test/tcr/compilation/1252.php b/hphp/test/slow/compilation/1252.php
similarity index 100%
rename from hphp/test/tcr/compilation/1252.php
rename to hphp/test/slow/compilation/1252.php
diff --git a/hphp/test/tcr/compilation/1252.php.expect b/hphp/test/slow/compilation/1252.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1252.php.expect
rename to hphp/test/slow/compilation/1252.php.expect
diff --git a/hphp/test/tcr/compilation/1253.php b/hphp/test/slow/compilation/1253.php
similarity index 100%
rename from hphp/test/tcr/compilation/1253.php
rename to hphp/test/slow/compilation/1253.php
diff --git a/hphp/test/tcr/compilation/1282.php.expect b/hphp/test/slow/compilation/1253.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1282.php.expect
rename to hphp/test/slow/compilation/1253.php.expect
diff --git a/hphp/test/tcr/compilation/1254.php b/hphp/test/slow/compilation/1254.php
similarity index 100%
rename from hphp/test/tcr/compilation/1254.php
rename to hphp/test/slow/compilation/1254.php
diff --git a/hphp/test/tcr/compilation/1254.php.expect b/hphp/test/slow/compilation/1254.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1254.php.expect
rename to hphp/test/slow/compilation/1254.php.expect
diff --git a/hphp/test/tcr/compilation/1255.php b/hphp/test/slow/compilation/1255.php
similarity index 100%
rename from hphp/test/tcr/compilation/1255.php
rename to hphp/test/slow/compilation/1255.php
diff --git a/hphp/test/tcr/compilation/1283.php.expect b/hphp/test/slow/compilation/1255.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1283.php.expect
rename to hphp/test/slow/compilation/1255.php.expect
diff --git a/hphp/test/tcr/compilation/1256.php b/hphp/test/slow/compilation/1256.php
similarity index 100%
rename from hphp/test/tcr/compilation/1256.php
rename to hphp/test/slow/compilation/1256.php
diff --git a/hphp/test/tcr/compilation/1284.php.expect b/hphp/test/slow/compilation/1256.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1284.php.expect
rename to hphp/test/slow/compilation/1256.php.expect
diff --git a/hphp/test/tcr/compilation/1257.php b/hphp/test/slow/compilation/1257.php
similarity index 100%
rename from hphp/test/tcr/compilation/1257.php
rename to hphp/test/slow/compilation/1257.php
diff --git a/hphp/test/tcr/compilation/1288.php.expect b/hphp/test/slow/compilation/1257.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1288.php.expect
rename to hphp/test/slow/compilation/1257.php.expect
diff --git a/hphp/test/tcr/compilation/1258.php b/hphp/test/slow/compilation/1258.php
similarity index 100%
rename from hphp/test/tcr/compilation/1258.php
rename to hphp/test/slow/compilation/1258.php
diff --git a/hphp/test/tcr/compilation/1289.php.expect b/hphp/test/slow/compilation/1258.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1289.php.expect
rename to hphp/test/slow/compilation/1258.php.expect
diff --git a/hphp/test/tcr/compilation/1259.php b/hphp/test/slow/compilation/1259.php
similarity index 100%
rename from hphp/test/tcr/compilation/1259.php
rename to hphp/test/slow/compilation/1259.php
diff --git a/hphp/test/tcr/compilation/1290.php.expect b/hphp/test/slow/compilation/1259.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1290.php.expect
rename to hphp/test/slow/compilation/1259.php.expect
diff --git a/hphp/test/tcr/compilation/1260.php b/hphp/test/slow/compilation/1260.php
similarity index 100%
rename from hphp/test/tcr/compilation/1260.php
rename to hphp/test/slow/compilation/1260.php
diff --git a/hphp/test/tcr/compilation/1291.php.expect b/hphp/test/slow/compilation/1260.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1291.php.expect
rename to hphp/test/slow/compilation/1260.php.expect
diff --git a/hphp/test/tcr/compilation/1261.php b/hphp/test/slow/compilation/1261.php
similarity index 100%
rename from hphp/test/tcr/compilation/1261.php
rename to hphp/test/slow/compilation/1261.php
diff --git a/hphp/test/tcr/compilation/1261.php.expect b/hphp/test/slow/compilation/1261.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1261.php.expect
rename to hphp/test/slow/compilation/1261.php.expect
diff --git a/hphp/test/tcr/compilation/1262.php b/hphp/test/slow/compilation/1262.php
similarity index 100%
rename from hphp/test/tcr/compilation/1262.php
rename to hphp/test/slow/compilation/1262.php
diff --git a/hphp/test/tcr/compilation/1262.php.expect b/hphp/test/slow/compilation/1262.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1262.php.expect
rename to hphp/test/slow/compilation/1262.php.expect
diff --git a/hphp/test/tcr/compilation/1263.php b/hphp/test/slow/compilation/1263.php
similarity index 100%
rename from hphp/test/tcr/compilation/1263.php
rename to hphp/test/slow/compilation/1263.php
diff --git a/hphp/test/tcr/compilation/1292.php.expect b/hphp/test/slow/compilation/1263.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1292.php.expect
rename to hphp/test/slow/compilation/1263.php.expect
diff --git a/hphp/test/tcr/compilation/1264.php b/hphp/test/slow/compilation/1264.php
similarity index 100%
rename from hphp/test/tcr/compilation/1264.php
rename to hphp/test/slow/compilation/1264.php
diff --git a/hphp/test/tcr/compilation/1264.php.expect b/hphp/test/slow/compilation/1264.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1264.php.expect
rename to hphp/test/slow/compilation/1264.php.expect
diff --git a/hphp/test/tcr/compilation/1265.php b/hphp/test/slow/compilation/1265.php
similarity index 100%
rename from hphp/test/tcr/compilation/1265.php
rename to hphp/test/slow/compilation/1265.php
diff --git a/hphp/test/tcr/compilation/1265.php.expect b/hphp/test/slow/compilation/1265.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1265.php.expect
rename to hphp/test/slow/compilation/1265.php.expect
diff --git a/hphp/test/tcr/compilation/1266.php b/hphp/test/slow/compilation/1266.php
similarity index 100%
rename from hphp/test/tcr/compilation/1266.php
rename to hphp/test/slow/compilation/1266.php
diff --git a/hphp/test/tcr/compilation/1266.php.expect b/hphp/test/slow/compilation/1266.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1266.php.expect
rename to hphp/test/slow/compilation/1266.php.expect
diff --git a/hphp/test/tcr/compilation/1267.php b/hphp/test/slow/compilation/1267.php
similarity index 100%
rename from hphp/test/tcr/compilation/1267.php
rename to hphp/test/slow/compilation/1267.php
diff --git a/hphp/test/tcr/compilation/1293.php.expect b/hphp/test/slow/compilation/1267.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1293.php.expect
rename to hphp/test/slow/compilation/1267.php.expect
diff --git a/hphp/test/tcr/compilation/1268.php b/hphp/test/slow/compilation/1268.php
similarity index 100%
rename from hphp/test/tcr/compilation/1268.php
rename to hphp/test/slow/compilation/1268.php
diff --git a/hphp/test/tcr/compilation/1294.php.expect b/hphp/test/slow/compilation/1268.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1294.php.expect
rename to hphp/test/slow/compilation/1268.php.expect
diff --git a/hphp/test/tcr/compilation/1269.php b/hphp/test/slow/compilation/1269.php
similarity index 100%
rename from hphp/test/tcr/compilation/1269.php
rename to hphp/test/slow/compilation/1269.php
diff --git a/hphp/test/tcr/compilation/1269.php.expect b/hphp/test/slow/compilation/1269.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1269.php.expect
rename to hphp/test/slow/compilation/1269.php.expect
diff --git a/hphp/test/tcr/compilation/1270.php b/hphp/test/slow/compilation/1270.php
similarity index 100%
rename from hphp/test/tcr/compilation/1270.php
rename to hphp/test/slow/compilation/1270.php
diff --git a/hphp/test/tcr/compilation/1270.php.expect b/hphp/test/slow/compilation/1270.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1270.php.expect
rename to hphp/test/slow/compilation/1270.php.expect
diff --git a/hphp/test/tcr/compilation/1271.php b/hphp/test/slow/compilation/1271.php
similarity index 100%
rename from hphp/test/tcr/compilation/1271.php
rename to hphp/test/slow/compilation/1271.php
diff --git a/hphp/test/tcr/compilation/1271.php.expect b/hphp/test/slow/compilation/1271.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1271.php.expect
rename to hphp/test/slow/compilation/1271.php.expect
diff --git a/hphp/test/tcr/compilation/1272.php b/hphp/test/slow/compilation/1272.php
similarity index 100%
rename from hphp/test/tcr/compilation/1272.php
rename to hphp/test/slow/compilation/1272.php
diff --git a/hphp/test/tcr/compilation/1272.php.expect b/hphp/test/slow/compilation/1272.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1272.php.expect
rename to hphp/test/slow/compilation/1272.php.expect
diff --git a/hphp/test/tcr/compilation/1273.php b/hphp/test/slow/compilation/1273.php
similarity index 100%
rename from hphp/test/tcr/compilation/1273.php
rename to hphp/test/slow/compilation/1273.php
diff --git a/hphp/test/tcr/compilation/1295.php.expect b/hphp/test/slow/compilation/1273.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1295.php.expect
rename to hphp/test/slow/compilation/1273.php.expect
diff --git a/hphp/test/tcr/compilation/1274.php b/hphp/test/slow/compilation/1274.php
similarity index 100%
rename from hphp/test/tcr/compilation/1274.php
rename to hphp/test/slow/compilation/1274.php
diff --git a/hphp/test/tcr/compilation/1274.php.expect b/hphp/test/slow/compilation/1274.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1274.php.expect
rename to hphp/test/slow/compilation/1274.php.expect
diff --git a/hphp/test/tcr/compilation/1275.php b/hphp/test/slow/compilation/1275.php
similarity index 100%
rename from hphp/test/tcr/compilation/1275.php
rename to hphp/test/slow/compilation/1275.php
diff --git a/hphp/test/tcr/compilation/1275.php.expect b/hphp/test/slow/compilation/1275.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1275.php.expect
rename to hphp/test/slow/compilation/1275.php.expect
diff --git a/hphp/test/tcr/compilation/1276.php b/hphp/test/slow/compilation/1276.php
similarity index 100%
rename from hphp/test/tcr/compilation/1276.php
rename to hphp/test/slow/compilation/1276.php
diff --git a/hphp/test/tcr/compilation/1276.php.expect b/hphp/test/slow/compilation/1276.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1276.php.expect
rename to hphp/test/slow/compilation/1276.php.expect
diff --git a/hphp/test/tcr/compilation/1277.php b/hphp/test/slow/compilation/1277.php
similarity index 100%
rename from hphp/test/tcr/compilation/1277.php
rename to hphp/test/slow/compilation/1277.php
diff --git a/hphp/test/tcr/compilation/1296.php.expect b/hphp/test/slow/compilation/1277.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1296.php.expect
rename to hphp/test/slow/compilation/1277.php.expect
diff --git a/hphp/test/tcr/compilation/1278.php b/hphp/test/slow/compilation/1278.php
similarity index 100%
rename from hphp/test/tcr/compilation/1278.php
rename to hphp/test/slow/compilation/1278.php
diff --git a/hphp/test/tcr/compilation/1278.php.expect b/hphp/test/slow/compilation/1278.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1278.php.expect
rename to hphp/test/slow/compilation/1278.php.expect
diff --git a/hphp/test/tcr/compilation/1279.php b/hphp/test/slow/compilation/1279.php
similarity index 100%
rename from hphp/test/tcr/compilation/1279.php
rename to hphp/test/slow/compilation/1279.php
diff --git a/hphp/test/tcr/compilation/1279.php.expect b/hphp/test/slow/compilation/1279.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1279.php.expect
rename to hphp/test/slow/compilation/1279.php.expect
diff --git a/hphp/test/tcr/compilation/1280.php b/hphp/test/slow/compilation/1280.php
similarity index 100%
rename from hphp/test/tcr/compilation/1280.php
rename to hphp/test/slow/compilation/1280.php
diff --git a/hphp/test/tcr/compilation/1300.php.expect b/hphp/test/slow/compilation/1280.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1300.php.expect
rename to hphp/test/slow/compilation/1280.php.expect
diff --git a/hphp/test/tcr/compilation/1281.php b/hphp/test/slow/compilation/1281.php
similarity index 100%
rename from hphp/test/tcr/compilation/1281.php
rename to hphp/test/slow/compilation/1281.php
diff --git a/hphp/test/tcr/compilation/1281.php.expect b/hphp/test/slow/compilation/1281.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1281.php.expect
rename to hphp/test/slow/compilation/1281.php.expect
diff --git a/hphp/test/tcr/compilation/1282.php b/hphp/test/slow/compilation/1282.php
similarity index 100%
rename from hphp/test/tcr/compilation/1282.php
rename to hphp/test/slow/compilation/1282.php
diff --git a/hphp/test/tcr/compilation/1301.php.expect b/hphp/test/slow/compilation/1282.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1301.php.expect
rename to hphp/test/slow/compilation/1282.php.expect
diff --git a/hphp/test/tcr/compilation/1283.php b/hphp/test/slow/compilation/1283.php
similarity index 100%
rename from hphp/test/tcr/compilation/1283.php
rename to hphp/test/slow/compilation/1283.php
diff --git a/hphp/test/tcr/compilation/1302.php.expect b/hphp/test/slow/compilation/1283.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1302.php.expect
rename to hphp/test/slow/compilation/1283.php.expect
diff --git a/hphp/test/tcr/compilation/1284.php b/hphp/test/slow/compilation/1284.php
similarity index 100%
rename from hphp/test/tcr/compilation/1284.php
rename to hphp/test/slow/compilation/1284.php
diff --git a/hphp/test/tcr/compilation/1303.php.expect b/hphp/test/slow/compilation/1284.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1303.php.expect
rename to hphp/test/slow/compilation/1284.php.expect
diff --git a/hphp/test/tcr/compilation/1285.php b/hphp/test/slow/compilation/1285.php
similarity index 100%
rename from hphp/test/tcr/compilation/1285.php
rename to hphp/test/slow/compilation/1285.php
diff --git a/hphp/test/tcr/compilation/1285.php.expect b/hphp/test/slow/compilation/1285.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1285.php.expect
rename to hphp/test/slow/compilation/1285.php.expect
diff --git a/hphp/test/tcr/compilation/1286.php b/hphp/test/slow/compilation/1286.php
similarity index 100%
rename from hphp/test/tcr/compilation/1286.php
rename to hphp/test/slow/compilation/1286.php
diff --git a/hphp/test/tcr/compilation/1286.php.expect b/hphp/test/slow/compilation/1286.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1286.php.expect
rename to hphp/test/slow/compilation/1286.php.expect
diff --git a/hphp/test/tcr/compilation/1287.php b/hphp/test/slow/compilation/1287.php
similarity index 100%
rename from hphp/test/tcr/compilation/1287.php
rename to hphp/test/slow/compilation/1287.php
diff --git a/hphp/test/tcr/compilation/1287.php.expect b/hphp/test/slow/compilation/1287.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1287.php.expect
rename to hphp/test/slow/compilation/1287.php.expect
diff --git a/hphp/test/tcr/compilation/1288.php b/hphp/test/slow/compilation/1288.php
similarity index 100%
rename from hphp/test/tcr/compilation/1288.php
rename to hphp/test/slow/compilation/1288.php
diff --git a/hphp/test/tcr/compilation/1306.php.expect b/hphp/test/slow/compilation/1288.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1306.php.expect
rename to hphp/test/slow/compilation/1288.php.expect
diff --git a/hphp/test/tcr/compilation/1289.php b/hphp/test/slow/compilation/1289.php
similarity index 100%
rename from hphp/test/tcr/compilation/1289.php
rename to hphp/test/slow/compilation/1289.php
diff --git a/hphp/test/tcr/compilation/1307.php.expect b/hphp/test/slow/compilation/1289.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1307.php.expect
rename to hphp/test/slow/compilation/1289.php.expect
diff --git a/hphp/test/tcr/compilation/1290.php b/hphp/test/slow/compilation/1290.php
similarity index 100%
rename from hphp/test/tcr/compilation/1290.php
rename to hphp/test/slow/compilation/1290.php
diff --git a/hphp/test/tcr/compilation/1308.php.expect b/hphp/test/slow/compilation/1290.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1308.php.expect
rename to hphp/test/slow/compilation/1290.php.expect
diff --git a/hphp/test/tcr/compilation/1291.php b/hphp/test/slow/compilation/1291.php
similarity index 100%
rename from hphp/test/tcr/compilation/1291.php
rename to hphp/test/slow/compilation/1291.php
diff --git a/hphp/test/tcr/compilation/1310.php.expect b/hphp/test/slow/compilation/1291.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1310.php.expect
rename to hphp/test/slow/compilation/1291.php.expect
diff --git a/hphp/test/tcr/compilation/1292.php b/hphp/test/slow/compilation/1292.php
similarity index 100%
rename from hphp/test/tcr/compilation/1292.php
rename to hphp/test/slow/compilation/1292.php
diff --git a/hphp/test/tcr/compilation/1311.php.expect b/hphp/test/slow/compilation/1292.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1311.php.expect
rename to hphp/test/slow/compilation/1292.php.expect
diff --git a/hphp/test/tcr/compilation/1293.php b/hphp/test/slow/compilation/1293.php
similarity index 100%
rename from hphp/test/tcr/compilation/1293.php
rename to hphp/test/slow/compilation/1293.php
diff --git a/hphp/test/tcr/compilation/1312.php.expect b/hphp/test/slow/compilation/1293.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1312.php.expect
rename to hphp/test/slow/compilation/1293.php.expect
diff --git a/hphp/test/tcr/compilation/1294.php b/hphp/test/slow/compilation/1294.php
similarity index 100%
rename from hphp/test/tcr/compilation/1294.php
rename to hphp/test/slow/compilation/1294.php
diff --git a/hphp/test/tcr/compilation/1313.php.expect b/hphp/test/slow/compilation/1294.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1313.php.expect
rename to hphp/test/slow/compilation/1294.php.expect
diff --git a/hphp/test/tcr/compilation/1295.php b/hphp/test/slow/compilation/1295.php
similarity index 100%
rename from hphp/test/tcr/compilation/1295.php
rename to hphp/test/slow/compilation/1295.php
diff --git a/hphp/test/tcr/compilation/1314.php.expect b/hphp/test/slow/compilation/1295.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1314.php.expect
rename to hphp/test/slow/compilation/1295.php.expect
diff --git a/hphp/test/tcr/compilation/1296.php b/hphp/test/slow/compilation/1296.php
similarity index 100%
rename from hphp/test/tcr/compilation/1296.php
rename to hphp/test/slow/compilation/1296.php
diff --git a/hphp/test/tcr/compilation/1315.php.expect b/hphp/test/slow/compilation/1296.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1315.php.expect
rename to hphp/test/slow/compilation/1296.php.expect
diff --git a/hphp/test/tcr/compilation/1297.php b/hphp/test/slow/compilation/1297.php
similarity index 100%
rename from hphp/test/tcr/compilation/1297.php
rename to hphp/test/slow/compilation/1297.php
diff --git a/hphp/test/tcr/compilation/1297.php.expect b/hphp/test/slow/compilation/1297.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1297.php.expect
rename to hphp/test/slow/compilation/1297.php.expect
diff --git a/hphp/test/tcr/compilation/1298.php b/hphp/test/slow/compilation/1298.php
similarity index 100%
rename from hphp/test/tcr/compilation/1298.php
rename to hphp/test/slow/compilation/1298.php
diff --git a/hphp/test/tcr/compilation/1298.php.expect b/hphp/test/slow/compilation/1298.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1298.php.expect
rename to hphp/test/slow/compilation/1298.php.expect
diff --git a/hphp/test/tcr/compilation/1299.php b/hphp/test/slow/compilation/1299.php
similarity index 100%
rename from hphp/test/tcr/compilation/1299.php
rename to hphp/test/slow/compilation/1299.php
diff --git a/hphp/test/tcr/compilation/1299.php.expect b/hphp/test/slow/compilation/1299.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1299.php.expect
rename to hphp/test/slow/compilation/1299.php.expect
diff --git a/hphp/test/tcr/compilation/1300.php b/hphp/test/slow/compilation/1300.php
similarity index 100%
rename from hphp/test/tcr/compilation/1300.php
rename to hphp/test/slow/compilation/1300.php
diff --git a/hphp/test/tcr/compilation/1318.php.expect b/hphp/test/slow/compilation/1300.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1318.php.expect
rename to hphp/test/slow/compilation/1300.php.expect
diff --git a/hphp/test/tcr/compilation/1301.php b/hphp/test/slow/compilation/1301.php
similarity index 100%
rename from hphp/test/tcr/compilation/1301.php
rename to hphp/test/slow/compilation/1301.php
diff --git a/hphp/test/tcr/compilation/1322.php.expect b/hphp/test/slow/compilation/1301.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1322.php.expect
rename to hphp/test/slow/compilation/1301.php.expect
diff --git a/hphp/test/tcr/compilation/1302.php b/hphp/test/slow/compilation/1302.php
similarity index 100%
rename from hphp/test/tcr/compilation/1302.php
rename to hphp/test/slow/compilation/1302.php
diff --git a/hphp/test/tcr/compilation/1323.php.expect b/hphp/test/slow/compilation/1302.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1323.php.expect
rename to hphp/test/slow/compilation/1302.php.expect
diff --git a/hphp/test/tcr/compilation/1303.php b/hphp/test/slow/compilation/1303.php
similarity index 100%
rename from hphp/test/tcr/compilation/1303.php
rename to hphp/test/slow/compilation/1303.php
diff --git a/hphp/test/tcr/compilation/1324.php.expect b/hphp/test/slow/compilation/1303.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1324.php.expect
rename to hphp/test/slow/compilation/1303.php.expect
diff --git a/hphp/test/tcr/compilation/1304.php b/hphp/test/slow/compilation/1304.php
similarity index 100%
rename from hphp/test/tcr/compilation/1304.php
rename to hphp/test/slow/compilation/1304.php
diff --git a/hphp/test/tcr/compilation/1304.php.expect b/hphp/test/slow/compilation/1304.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1304.php.expect
rename to hphp/test/slow/compilation/1304.php.expect
diff --git a/hphp/test/tcr/compilation/1305.php b/hphp/test/slow/compilation/1305.php
similarity index 100%
rename from hphp/test/tcr/compilation/1305.php
rename to hphp/test/slow/compilation/1305.php
diff --git a/hphp/test/tcr/compilation/1305.php.expect b/hphp/test/slow/compilation/1305.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1305.php.expect
rename to hphp/test/slow/compilation/1305.php.expect
diff --git a/hphp/test/tcr/compilation/1306.php b/hphp/test/slow/compilation/1306.php
similarity index 100%
rename from hphp/test/tcr/compilation/1306.php
rename to hphp/test/slow/compilation/1306.php
diff --git a/hphp/test/tcr/constant/1600.php.expect b/hphp/test/slow/compilation/1306.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1600.php.expect
rename to hphp/test/slow/compilation/1306.php.expect
diff --git a/hphp/test/tcr/compilation/1307.php b/hphp/test/slow/compilation/1307.php
similarity index 100%
rename from hphp/test/tcr/compilation/1307.php
rename to hphp/test/slow/compilation/1307.php
diff --git a/hphp/test/tcr/copy_prop/1846.php.expect b/hphp/test/slow/compilation/1307.php.expect
similarity index 100%
rename from hphp/test/tcr/copy_prop/1846.php.expect
rename to hphp/test/slow/compilation/1307.php.expect
diff --git a/hphp/test/tcr/compilation/1308.php b/hphp/test/slow/compilation/1308.php
similarity index 100%
rename from hphp/test/tcr/compilation/1308.php
rename to hphp/test/slow/compilation/1308.php
diff --git a/hphp/test/tcr/dom_document/1670.php.expect b/hphp/test/slow/compilation/1308.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1670.php.expect
rename to hphp/test/slow/compilation/1308.php.expect
diff --git a/hphp/test/tcr/compilation/1309.php b/hphp/test/slow/compilation/1309.php
similarity index 100%
rename from hphp/test/tcr/compilation/1309.php
rename to hphp/test/slow/compilation/1309.php
diff --git a/hphp/test/tcr/compilation/1309.php.expect b/hphp/test/slow/compilation/1309.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1309.php.expect
rename to hphp/test/slow/compilation/1309.php.expect
diff --git a/hphp/test/tcr/compilation/1310.php b/hphp/test/slow/compilation/1310.php
similarity index 100%
rename from hphp/test/tcr/compilation/1310.php
rename to hphp/test/slow/compilation/1310.php
diff --git a/hphp/test/tcr/dynamic_functions/1187.php.expect b/hphp/test/slow/compilation/1310.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1187.php.expect
rename to hphp/test/slow/compilation/1310.php.expect
diff --git a/hphp/test/tcr/compilation/1311.php b/hphp/test/slow/compilation/1311.php
similarity index 100%
rename from hphp/test/tcr/compilation/1311.php
rename to hphp/test/slow/compilation/1311.php
diff --git a/hphp/test/tcr/dynamic_methods/1205.php.expect b/hphp/test/slow/compilation/1311.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1205.php.expect
rename to hphp/test/slow/compilation/1311.php.expect
diff --git a/hphp/test/tcr/compilation/1312.php b/hphp/test/slow/compilation/1312.php
similarity index 100%
rename from hphp/test/tcr/compilation/1312.php
rename to hphp/test/slow/compilation/1312.php
diff --git a/hphp/test/tcr/exceptions/53.php.expect b/hphp/test/slow/compilation/1312.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/53.php.expect
rename to hphp/test/slow/compilation/1312.php.expect
diff --git a/hphp/test/tcr/compilation/1312.php.hphp_opts b/hphp/test/slow/compilation/1312.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/compilation/1312.php.hphp_opts
rename to hphp/test/slow/compilation/1312.php.hphp_opts
diff --git a/hphp/test/tcr/compilation/1313.php b/hphp/test/slow/compilation/1313.php
similarity index 100%
rename from hphp/test/tcr/compilation/1313.php
rename to hphp/test/slow/compilation/1313.php
diff --git a/hphp/test/tcr/ext_image/1779.php.expect b/hphp/test/slow/compilation/1313.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1779.php.expect
rename to hphp/test/slow/compilation/1313.php.expect
diff --git a/hphp/test/tcr/compilation/1313.php.hphp_opts b/hphp/test/slow/compilation/1313.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/compilation/1313.php.hphp_opts
rename to hphp/test/slow/compilation/1313.php.hphp_opts
diff --git a/hphp/test/tcr/compilation/1313.php.opts b/hphp/test/slow/compilation/1313.php.opts
similarity index 100%
rename from hphp/test/tcr/compilation/1313.php.opts
rename to hphp/test/slow/compilation/1313.php.opts
diff --git a/hphp/test/tcr/compilation/1314.php b/hphp/test/slow/compilation/1314.php
similarity index 100%
rename from hphp/test/tcr/compilation/1314.php
rename to hphp/test/slow/compilation/1314.php
diff --git a/hphp/test/tcr/ext_image/1781.php.expect b/hphp/test/slow/compilation/1314.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1781.php.expect
rename to hphp/test/slow/compilation/1314.php.expect
diff --git a/hphp/test/tcr/compilation/1315.php b/hphp/test/slow/compilation/1315.php
similarity index 100%
rename from hphp/test/tcr/compilation/1315.php
rename to hphp/test/slow/compilation/1315.php
diff --git a/hphp/test/tcr/ext_image/1782.php.expect b/hphp/test/slow/compilation/1315.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1782.php.expect
rename to hphp/test/slow/compilation/1315.php.expect
diff --git a/hphp/test/tcr/compilation/1316.php b/hphp/test/slow/compilation/1316.php
similarity index 100%
rename from hphp/test/tcr/compilation/1316.php
rename to hphp/test/slow/compilation/1316.php
diff --git a/hphp/test/tcr/compilation/1316.php.expect b/hphp/test/slow/compilation/1316.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1316.php.expect
rename to hphp/test/slow/compilation/1316.php.expect
diff --git a/hphp/test/tcr/compilation/1317.php b/hphp/test/slow/compilation/1317.php
similarity index 100%
rename from hphp/test/tcr/compilation/1317.php
rename to hphp/test/slow/compilation/1317.php
diff --git a/hphp/test/tcr/compilation/1317.php.expect b/hphp/test/slow/compilation/1317.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1317.php.expect
rename to hphp/test/slow/compilation/1317.php.expect
diff --git a/hphp/test/tcr/compilation/1318.php b/hphp/test/slow/compilation/1318.php
similarity index 100%
rename from hphp/test/tcr/compilation/1318.php
rename to hphp/test/slow/compilation/1318.php
diff --git a/hphp/test/tcr/ext_image/1783.php.expect b/hphp/test/slow/compilation/1318.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1783.php.expect
rename to hphp/test/slow/compilation/1318.php.expect
diff --git a/hphp/test/tcr/compilation/1319.php b/hphp/test/slow/compilation/1319.php
similarity index 100%
rename from hphp/test/tcr/compilation/1319.php
rename to hphp/test/slow/compilation/1319.php
diff --git a/hphp/test/tcr/compilation/1319.php.expectf b/hphp/test/slow/compilation/1319.php.expectf
similarity index 100%
rename from hphp/test/tcr/compilation/1319.php.expectf
rename to hphp/test/slow/compilation/1319.php.expectf
diff --git a/hphp/test/tcr/compilation/1320.php b/hphp/test/slow/compilation/1320.php
similarity index 100%
rename from hphp/test/tcr/compilation/1320.php
rename to hphp/test/slow/compilation/1320.php
diff --git a/hphp/test/tcr/compilation/1320.php.expect b/hphp/test/slow/compilation/1320.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1320.php.expect
rename to hphp/test/slow/compilation/1320.php.expect
diff --git a/hphp/test/tcr/compilation/1321.php b/hphp/test/slow/compilation/1321.php
similarity index 100%
rename from hphp/test/tcr/compilation/1321.php
rename to hphp/test/slow/compilation/1321.php
diff --git a/hphp/test/tcr/compilation/1321.php.expect b/hphp/test/slow/compilation/1321.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1321.php.expect
rename to hphp/test/slow/compilation/1321.php.expect
diff --git a/hphp/test/tcr/compilation/1322.php b/hphp/test/slow/compilation/1322.php
similarity index 100%
rename from hphp/test/tcr/compilation/1322.php
rename to hphp/test/slow/compilation/1322.php
diff --git a/hphp/test/tcr/ext_image/1784.php.expect b/hphp/test/slow/compilation/1322.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1784.php.expect
rename to hphp/test/slow/compilation/1322.php.expect
diff --git a/hphp/test/tcr/compilation/1323.php b/hphp/test/slow/compilation/1323.php
similarity index 100%
rename from hphp/test/tcr/compilation/1323.php
rename to hphp/test/slow/compilation/1323.php
diff --git a/hphp/test/tcr/ext_image/1785.php.expect b/hphp/test/slow/compilation/1323.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1785.php.expect
rename to hphp/test/slow/compilation/1323.php.expect
diff --git a/hphp/test/tcr/compilation/1324.php b/hphp/test/slow/compilation/1324.php
similarity index 100%
rename from hphp/test/tcr/compilation/1324.php
rename to hphp/test/slow/compilation/1324.php
diff --git a/hphp/test/tcr/ext_image/1786.php.expect b/hphp/test/slow/compilation/1324.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1786.php.expect
rename to hphp/test/slow/compilation/1324.php.expect
diff --git a/hphp/test/tcr/compilation/1325.php b/hphp/test/slow/compilation/1325.php
similarity index 100%
rename from hphp/test/tcr/compilation/1325.php
rename to hphp/test/slow/compilation/1325.php
diff --git a/hphp/test/tcr/compilation/1325.php.expect b/hphp/test/slow/compilation/1325.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1325.php.expect
rename to hphp/test/slow/compilation/1325.php.expect
diff --git a/hphp/test/tcr/compilation/1326.php b/hphp/test/slow/compilation/1326.php
similarity index 100%
rename from hphp/test/tcr/compilation/1326.php
rename to hphp/test/slow/compilation/1326.php
diff --git a/hphp/test/tcr/compilation/1326.php.expect b/hphp/test/slow/compilation/1326.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1326.php.expect
rename to hphp/test/slow/compilation/1326.php.expect
diff --git a/hphp/test/tcr/compilation/1327.php b/hphp/test/slow/compilation/1327.php
similarity index 100%
rename from hphp/test/tcr/compilation/1327.php
rename to hphp/test/slow/compilation/1327.php
diff --git a/hphp/test/tcr/compilation/1327.php.expect b/hphp/test/slow/compilation/1327.php.expect
similarity index 100%
rename from hphp/test/tcr/compilation/1327.php.expect
rename to hphp/test/slow/compilation/1327.php.expect
diff --git a/hphp/test/tcr/concat/1571.php b/hphp/test/slow/concat/1571.php
similarity index 100%
rename from hphp/test/tcr/concat/1571.php
rename to hphp/test/slow/concat/1571.php
diff --git a/hphp/test/tcr/concat/1571.php.expect b/hphp/test/slow/concat/1571.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1571.php.expect
rename to hphp/test/slow/concat/1571.php.expect
diff --git a/hphp/test/tcr/concat/1572.php b/hphp/test/slow/concat/1572.php
similarity index 100%
rename from hphp/test/tcr/concat/1572.php
rename to hphp/test/slow/concat/1572.php
diff --git a/hphp/test/tcr/concat/1572.php.expect b/hphp/test/slow/concat/1572.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1572.php.expect
rename to hphp/test/slow/concat/1572.php.expect
diff --git a/hphp/test/tcr/concat/1573.php b/hphp/test/slow/concat/1573.php
similarity index 100%
rename from hphp/test/tcr/concat/1573.php
rename to hphp/test/slow/concat/1573.php
diff --git a/hphp/test/tcr/concat/1573.php.expect b/hphp/test/slow/concat/1573.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1573.php.expect
rename to hphp/test/slow/concat/1573.php.expect
diff --git a/hphp/test/tcr/concat/1574.php b/hphp/test/slow/concat/1574.php
similarity index 100%
rename from hphp/test/tcr/concat/1574.php
rename to hphp/test/slow/concat/1574.php
diff --git a/hphp/test/tcr/concat/1574.php.expect b/hphp/test/slow/concat/1574.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1574.php.expect
rename to hphp/test/slow/concat/1574.php.expect
diff --git a/hphp/test/tcr/concat/1575.php b/hphp/test/slow/concat/1575.php
similarity index 100%
rename from hphp/test/tcr/concat/1575.php
rename to hphp/test/slow/concat/1575.php
diff --git a/hphp/test/tcr/concat/1575.php.expect b/hphp/test/slow/concat/1575.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1575.php.expect
rename to hphp/test/slow/concat/1575.php.expect
diff --git a/hphp/test/tcr/concat/1576.php b/hphp/test/slow/concat/1576.php
similarity index 100%
rename from hphp/test/tcr/concat/1576.php
rename to hphp/test/slow/concat/1576.php
diff --git a/hphp/test/tcr/concat/1576.php.expect b/hphp/test/slow/concat/1576.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1576.php.expect
rename to hphp/test/slow/concat/1576.php.expect
diff --git a/hphp/test/tcr/concat/1577.php b/hphp/test/slow/concat/1577.php
similarity index 100%
rename from hphp/test/tcr/concat/1577.php
rename to hphp/test/slow/concat/1577.php
diff --git a/hphp/test/tcr/concat/1577.php.expect b/hphp/test/slow/concat/1577.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1577.php.expect
rename to hphp/test/slow/concat/1577.php.expect
diff --git a/hphp/test/tcr/concat/1578.php b/hphp/test/slow/concat/1578.php
similarity index 100%
rename from hphp/test/tcr/concat/1578.php
rename to hphp/test/slow/concat/1578.php
diff --git a/hphp/test/tcr/concat/1578.php.expect b/hphp/test/slow/concat/1578.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1578.php.expect
rename to hphp/test/slow/concat/1578.php.expect
diff --git a/hphp/test/tcr/concat/1579.php b/hphp/test/slow/concat/1579.php
similarity index 100%
rename from hphp/test/tcr/concat/1579.php
rename to hphp/test/slow/concat/1579.php
diff --git a/hphp/test/tcr/concat/1579.php.expect b/hphp/test/slow/concat/1579.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1579.php.expect
rename to hphp/test/slow/concat/1579.php.expect
diff --git a/hphp/test/tcr/concat/1580.php b/hphp/test/slow/concat/1580.php
similarity index 100%
rename from hphp/test/tcr/concat/1580.php
rename to hphp/test/slow/concat/1580.php
diff --git a/hphp/test/tcr/concat/1580.php.expect b/hphp/test/slow/concat/1580.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1580.php.expect
rename to hphp/test/slow/concat/1580.php.expect
diff --git a/hphp/test/tcr/concat/1581.php b/hphp/test/slow/concat/1581.php
similarity index 100%
rename from hphp/test/tcr/concat/1581.php
rename to hphp/test/slow/concat/1581.php
diff --git a/hphp/test/tcr/concat/1581.php.expect b/hphp/test/slow/concat/1581.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1581.php.expect
rename to hphp/test/slow/concat/1581.php.expect
diff --git a/hphp/test/tcr/concat/1582.php b/hphp/test/slow/concat/1582.php
similarity index 100%
rename from hphp/test/tcr/concat/1582.php
rename to hphp/test/slow/concat/1582.php
diff --git a/hphp/test/tcr/concat/1582.php.expect b/hphp/test/slow/concat/1582.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1582.php.expect
rename to hphp/test/slow/concat/1582.php.expect
diff --git a/hphp/test/tcr/concat/1583.php b/hphp/test/slow/concat/1583.php
similarity index 100%
rename from hphp/test/tcr/concat/1583.php
rename to hphp/test/slow/concat/1583.php
diff --git a/hphp/test/tcr/concat/1583.php.expect b/hphp/test/slow/concat/1583.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1583.php.expect
rename to hphp/test/slow/concat/1583.php.expect
diff --git a/hphp/test/tcr/concat/1584.php b/hphp/test/slow/concat/1584.php
similarity index 100%
rename from hphp/test/tcr/concat/1584.php
rename to hphp/test/slow/concat/1584.php
diff --git a/hphp/test/tcr/concat/1584.php.expect b/hphp/test/slow/concat/1584.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1584.php.expect
rename to hphp/test/slow/concat/1584.php.expect
diff --git a/hphp/test/tcr/concat/1585.php b/hphp/test/slow/concat/1585.php
similarity index 100%
rename from hphp/test/tcr/concat/1585.php
rename to hphp/test/slow/concat/1585.php
diff --git a/hphp/test/tcr/concat/1585.php.expect b/hphp/test/slow/concat/1585.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1585.php.expect
rename to hphp/test/slow/concat/1585.php.expect
diff --git a/hphp/test/tcr/concat/1586.php b/hphp/test/slow/concat/1586.php
similarity index 100%
rename from hphp/test/tcr/concat/1586.php
rename to hphp/test/slow/concat/1586.php
diff --git a/hphp/test/tcr/concat/1586.php.expect b/hphp/test/slow/concat/1586.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1586.php.expect
rename to hphp/test/slow/concat/1586.php.expect
diff --git a/hphp/test/tcr/concat/1587.php b/hphp/test/slow/concat/1587.php
similarity index 100%
rename from hphp/test/tcr/concat/1587.php
rename to hphp/test/slow/concat/1587.php
diff --git a/hphp/test/tcr/concat/1587.php.expect b/hphp/test/slow/concat/1587.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1587.php.expect
rename to hphp/test/slow/concat/1587.php.expect
diff --git a/hphp/test/tcr/concat/1588.php b/hphp/test/slow/concat/1588.php
similarity index 100%
rename from hphp/test/tcr/concat/1588.php
rename to hphp/test/slow/concat/1588.php
diff --git a/hphp/test/tcr/concat/1588.php.expect b/hphp/test/slow/concat/1588.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1588.php.expect
rename to hphp/test/slow/concat/1588.php.expect
diff --git a/hphp/test/tcr/concat/1589.php b/hphp/test/slow/concat/1589.php
similarity index 100%
rename from hphp/test/tcr/concat/1589.php
rename to hphp/test/slow/concat/1589.php
diff --git a/hphp/test/tcr/concat/1589.php.expect b/hphp/test/slow/concat/1589.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1589.php.expect
rename to hphp/test/slow/concat/1589.php.expect
diff --git a/hphp/test/tcr/concat/1590.php b/hphp/test/slow/concat/1590.php
similarity index 100%
rename from hphp/test/tcr/concat/1590.php
rename to hphp/test/slow/concat/1590.php
diff --git a/hphp/test/tcr/concat/1590.php.expect b/hphp/test/slow/concat/1590.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1590.php.expect
rename to hphp/test/slow/concat/1590.php.expect
diff --git a/hphp/test/tcr/concat/1591.php b/hphp/test/slow/concat/1591.php
similarity index 100%
rename from hphp/test/tcr/concat/1591.php
rename to hphp/test/slow/concat/1591.php
diff --git a/hphp/test/tcr/concat/1591.php.expect b/hphp/test/slow/concat/1591.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1591.php.expect
rename to hphp/test/slow/concat/1591.php.expect
diff --git a/hphp/test/tcr/concat/1592.php b/hphp/test/slow/concat/1592.php
similarity index 100%
rename from hphp/test/tcr/concat/1592.php
rename to hphp/test/slow/concat/1592.php
diff --git a/hphp/test/tcr/concat/1592.php.expect b/hphp/test/slow/concat/1592.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1592.php.expect
rename to hphp/test/slow/concat/1592.php.expect
diff --git a/hphp/test/tcr/concat/1593.php b/hphp/test/slow/concat/1593.php
similarity index 100%
rename from hphp/test/tcr/concat/1593.php
rename to hphp/test/slow/concat/1593.php
diff --git a/hphp/test/tcr/concat/1593.php.expect b/hphp/test/slow/concat/1593.php.expect
similarity index 100%
rename from hphp/test/tcr/concat/1593.php.expect
rename to hphp/test/slow/concat/1593.php.expect
diff --git a/hphp/test/tcr/config.hdf b/hphp/test/slow/config.hdf
similarity index 100%
rename from hphp/test/tcr/config.hdf
rename to hphp/test/slow/config.hdf
diff --git a/hphp/test/tcr/constant/1594.php b/hphp/test/slow/constant/1594.php
similarity index 100%
rename from hphp/test/tcr/constant/1594.php
rename to hphp/test/slow/constant/1594.php
diff --git a/hphp/test/tcr/constant/1594.php.expect b/hphp/test/slow/constant/1594.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1594.php.expect
rename to hphp/test/slow/constant/1594.php.expect
diff --git a/hphp/test/tcr/constant/1595.php b/hphp/test/slow/constant/1595.php
similarity index 100%
rename from hphp/test/tcr/constant/1595.php
rename to hphp/test/slow/constant/1595.php
diff --git a/hphp/test/tcr/constant/1595.php.expect b/hphp/test/slow/constant/1595.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1595.php.expect
rename to hphp/test/slow/constant/1595.php.expect
diff --git a/hphp/test/tcr/constant/1596.php b/hphp/test/slow/constant/1596.php
similarity index 100%
rename from hphp/test/tcr/constant/1596.php
rename to hphp/test/slow/constant/1596.php
diff --git a/hphp/test/tcr/constant/1596.php.expect b/hphp/test/slow/constant/1596.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1596.php.expect
rename to hphp/test/slow/constant/1596.php.expect
diff --git a/hphp/test/tcr/constant/1597.php b/hphp/test/slow/constant/1597.php
similarity index 100%
rename from hphp/test/tcr/constant/1597.php
rename to hphp/test/slow/constant/1597.php
diff --git a/hphp/test/tcr/constant/1597.php.expect b/hphp/test/slow/constant/1597.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1597.php.expect
rename to hphp/test/slow/constant/1597.php.expect
diff --git a/hphp/test/tcr/constant/1598.php b/hphp/test/slow/constant/1598.php
similarity index 100%
rename from hphp/test/tcr/constant/1598.php
rename to hphp/test/slow/constant/1598.php
diff --git a/hphp/test/tcr/constant/1598.php.expect b/hphp/test/slow/constant/1598.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1598.php.expect
rename to hphp/test/slow/constant/1598.php.expect
diff --git a/hphp/test/tcr/constant/1599.php b/hphp/test/slow/constant/1599.php
similarity index 100%
rename from hphp/test/tcr/constant/1599.php
rename to hphp/test/slow/constant/1599.php
diff --git a/hphp/test/tcr/constant/1599.php.expect b/hphp/test/slow/constant/1599.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1599.php.expect
rename to hphp/test/slow/constant/1599.php.expect
diff --git a/hphp/test/tcr/constant/1600.php b/hphp/test/slow/constant/1600.php
similarity index 100%
rename from hphp/test/tcr/constant/1600.php
rename to hphp/test/slow/constant/1600.php
diff --git a/hphp/test/tcr/ext_image/1787.php.expect b/hphp/test/slow/constant/1600.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1787.php.expect
rename to hphp/test/slow/constant/1600.php.expect
diff --git a/hphp/test/tcr/constant/1601.php b/hphp/test/slow/constant/1601.php
similarity index 100%
rename from hphp/test/tcr/constant/1601.php
rename to hphp/test/slow/constant/1601.php
diff --git a/hphp/test/tcr/constant/1601.php.expect b/hphp/test/slow/constant/1601.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1601.php.expect
rename to hphp/test/slow/constant/1601.php.expect
diff --git a/hphp/test/tcr/constant/1602.php b/hphp/test/slow/constant/1602.php
similarity index 100%
rename from hphp/test/tcr/constant/1602.php
rename to hphp/test/slow/constant/1602.php
diff --git a/hphp/test/tcr/constant/1602.php.expect b/hphp/test/slow/constant/1602.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1602.php.expect
rename to hphp/test/slow/constant/1602.php.expect
diff --git a/hphp/test/tcr/constant/1603.php b/hphp/test/slow/constant/1603.php
similarity index 100%
rename from hphp/test/tcr/constant/1603.php
rename to hphp/test/slow/constant/1603.php
diff --git a/hphp/test/tcr/constant/1603.php.expect b/hphp/test/slow/constant/1603.php.expect
similarity index 100%
rename from hphp/test/tcr/constant/1603.php.expect
rename to hphp/test/slow/constant/1603.php.expect
diff --git a/hphp/test/tcr/constant_function/1621.php b/hphp/test/slow/constant_function/1621.php
similarity index 100%
rename from hphp/test/tcr/constant_function/1621.php
rename to hphp/test/slow/constant_function/1621.php
diff --git a/hphp/test/tcr/constant_function/1621.php.expect b/hphp/test/slow/constant_function/1621.php.expect
similarity index 100%
rename from hphp/test/tcr/constant_function/1621.php.expect
rename to hphp/test/slow/constant_function/1621.php.expect
diff --git a/hphp/test/tcr/constant_function/1622.php b/hphp/test/slow/constant_function/1622.php
similarity index 100%
rename from hphp/test/tcr/constant_function/1622.php
rename to hphp/test/slow/constant_function/1622.php
diff --git a/hphp/test/tcr/constant_function/1622.php.expect b/hphp/test/slow/constant_function/1622.php.expect
similarity index 100%
rename from hphp/test/tcr/constant_function/1622.php.expect
rename to hphp/test/slow/constant_function/1622.php.expect
diff --git a/hphp/test/tcr/constructor/1719.php b/hphp/test/slow/constructor/1719.php
similarity index 100%
rename from hphp/test/tcr/constructor/1719.php
rename to hphp/test/slow/constructor/1719.php
diff --git a/hphp/test/tcr/constructor/1719.php.expect b/hphp/test/slow/constructor/1719.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor/1719.php.expect
rename to hphp/test/slow/constructor/1719.php.expect
diff --git a/hphp/test/tcr/constructor/1720.php b/hphp/test/slow/constructor/1720.php
similarity index 100%
rename from hphp/test/tcr/constructor/1720.php
rename to hphp/test/slow/constructor/1720.php
diff --git a/hphp/test/tcr/constructor/1720.php.expect b/hphp/test/slow/constructor/1720.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor/1720.php.expect
rename to hphp/test/slow/constructor/1720.php.expect
diff --git a/hphp/test/tcr/constructor/1721.php b/hphp/test/slow/constructor/1721.php
similarity index 100%
rename from hphp/test/tcr/constructor/1721.php
rename to hphp/test/slow/constructor/1721.php
diff --git a/hphp/test/tcr/constructor/1721.php.expect b/hphp/test/slow/constructor/1721.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor/1721.php.expect
rename to hphp/test/slow/constructor/1721.php.expect
diff --git a/hphp/test/tcr/constructor/1722.php b/hphp/test/slow/constructor/1722.php
similarity index 100%
rename from hphp/test/tcr/constructor/1722.php
rename to hphp/test/slow/constructor/1722.php
diff --git a/hphp/test/tcr/constructor/1722.php.expect b/hphp/test/slow/constructor/1722.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor/1722.php.expect
rename to hphp/test/slow/constructor/1722.php.expect
diff --git a/hphp/test/tcr/constructor/1723.php b/hphp/test/slow/constructor/1723.php
similarity index 100%
rename from hphp/test/tcr/constructor/1723.php
rename to hphp/test/slow/constructor/1723.php
diff --git a/hphp/test/tcr/constructor/1723.php.expect b/hphp/test/slow/constructor/1723.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor/1723.php.expect
rename to hphp/test/slow/constructor/1723.php.expect
diff --git a/hphp/test/tcr/constructor_destructor/1568.php b/hphp/test/slow/constructor_destructor/1568.php
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1568.php
rename to hphp/test/slow/constructor_destructor/1568.php
diff --git a/hphp/test/tcr/constructor_destructor/1568.php.expect b/hphp/test/slow/constructor_destructor/1568.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1568.php.expect
rename to hphp/test/slow/constructor_destructor/1568.php.expect
diff --git a/hphp/test/tcr/constructor_destructor/1569.php b/hphp/test/slow/constructor_destructor/1569.php
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1569.php
rename to hphp/test/slow/constructor_destructor/1569.php
diff --git a/hphp/test/tcr/constructor_destructor/1569.php.expect b/hphp/test/slow/constructor_destructor/1569.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1569.php.expect
rename to hphp/test/slow/constructor_destructor/1569.php.expect
diff --git a/hphp/test/tcr/constructor_destructor/1570.php b/hphp/test/slow/constructor_destructor/1570.php
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1570.php
rename to hphp/test/slow/constructor_destructor/1570.php
diff --git a/hphp/test/tcr/constructor_destructor/1570.php.expect b/hphp/test/slow/constructor_destructor/1570.php.expect
similarity index 100%
rename from hphp/test/tcr/constructor_destructor/1570.php.expect
rename to hphp/test/slow/constructor_destructor/1570.php.expect
diff --git a/hphp/test/tcr/continue_statement/1416.php b/hphp/test/slow/continue_statement/1416.php
similarity index 100%
rename from hphp/test/tcr/continue_statement/1416.php
rename to hphp/test/slow/continue_statement/1416.php
diff --git a/hphp/test/tcr/continue_statement/1416.php.expect b/hphp/test/slow/continue_statement/1416.php.expect
similarity index 100%
rename from hphp/test/tcr/continue_statement/1416.php.expect
rename to hphp/test/slow/continue_statement/1416.php.expect
diff --git a/hphp/test/tcr/continue_statement/1417.php b/hphp/test/slow/continue_statement/1417.php
similarity index 100%
rename from hphp/test/tcr/continue_statement/1417.php
rename to hphp/test/slow/continue_statement/1417.php
diff --git a/hphp/test/tcr/continue_statement/1417.php.expect b/hphp/test/slow/continue_statement/1417.php.expect
similarity index 100%
rename from hphp/test/tcr/continue_statement/1417.php.expect
rename to hphp/test/slow/continue_statement/1417.php.expect
diff --git a/hphp/test/tcr/copy_prop/1845.php b/hphp/test/slow/copy_prop/1845.php
similarity index 100%
rename from hphp/test/tcr/copy_prop/1845.php
rename to hphp/test/slow/copy_prop/1845.php
diff --git a/hphp/test/tcr/copy_prop/1845.php.expect b/hphp/test/slow/copy_prop/1845.php.expect
similarity index 100%
rename from hphp/test/tcr/copy_prop/1845.php.expect
rename to hphp/test/slow/copy_prop/1845.php.expect
diff --git a/hphp/test/tcr/copy_prop/1845.php.hphp_opts b/hphp/test/slow/copy_prop/1845.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1845.php.hphp_opts
rename to hphp/test/slow/copy_prop/1845.php.hphp_opts
diff --git a/hphp/test/tcr/copy_prop/1845.php.opts b/hphp/test/slow/copy_prop/1845.php.opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1845.php.opts
rename to hphp/test/slow/copy_prop/1845.php.opts
diff --git a/hphp/test/tcr/copy_prop/1846.php b/hphp/test/slow/copy_prop/1846.php
similarity index 100%
rename from hphp/test/tcr/copy_prop/1846.php
rename to hphp/test/slow/copy_prop/1846.php
diff --git a/hphp/test/tcr/ext_image/1788.php.expect b/hphp/test/slow/copy_prop/1846.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1788.php.expect
rename to hphp/test/slow/copy_prop/1846.php.expect
diff --git a/hphp/test/tcr/copy_prop/1846.php.hphp_opts b/hphp/test/slow/copy_prop/1846.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1846.php.hphp_opts
rename to hphp/test/slow/copy_prop/1846.php.hphp_opts
diff --git a/hphp/test/tcr/copy_prop/1846.php.opts b/hphp/test/slow/copy_prop/1846.php.opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1846.php.opts
rename to hphp/test/slow/copy_prop/1846.php.opts
diff --git a/hphp/test/tcr/copy_prop/1847.php b/hphp/test/slow/copy_prop/1847.php
similarity index 100%
rename from hphp/test/tcr/copy_prop/1847.php
rename to hphp/test/slow/copy_prop/1847.php
diff --git a/hphp/test/tcr/copy_prop/1847.php.expect b/hphp/test/slow/copy_prop/1847.php.expect
similarity index 100%
rename from hphp/test/tcr/copy_prop/1847.php.expect
rename to hphp/test/slow/copy_prop/1847.php.expect
diff --git a/hphp/test/tcr/copy_prop/1847.php.hphp_opts b/hphp/test/slow/copy_prop/1847.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1847.php.hphp_opts
rename to hphp/test/slow/copy_prop/1847.php.hphp_opts
diff --git a/hphp/test/tcr/copy_prop/1847.php.opts b/hphp/test/slow/copy_prop/1847.php.opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1847.php.opts
rename to hphp/test/slow/copy_prop/1847.php.opts
diff --git a/hphp/test/tcr/copy_prop/1848.php b/hphp/test/slow/copy_prop/1848.php
similarity index 100%
rename from hphp/test/tcr/copy_prop/1848.php
rename to hphp/test/slow/copy_prop/1848.php
diff --git a/hphp/test/tcr/copy_prop/1848.php.expect b/hphp/test/slow/copy_prop/1848.php.expect
similarity index 100%
rename from hphp/test/tcr/copy_prop/1848.php.expect
rename to hphp/test/slow/copy_prop/1848.php.expect
diff --git a/hphp/test/tcr/copy_prop/1848.php.hphp_opts b/hphp/test/slow/copy_prop/1848.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1848.php.hphp_opts
rename to hphp/test/slow/copy_prop/1848.php.hphp_opts
diff --git a/hphp/test/tcr/copy_prop/1848.php.opts b/hphp/test/slow/copy_prop/1848.php.opts
similarity index 100%
rename from hphp/test/tcr/copy_prop/1848.php.opts
rename to hphp/test/slow/copy_prop/1848.php.opts
diff --git a/hphp/test/tcr/copy_prop_and_no_dead_code.hphp_opts b/hphp/test/slow/copy_prop_and_no_dead_code.hphp_opts
similarity index 100%
rename from hphp/test/tcr/copy_prop_and_no_dead_code.hphp_opts
rename to hphp/test/slow/copy_prop_and_no_dead_code.hphp_opts
diff --git a/hphp/test/tcr/create_function/1566.php b/hphp/test/slow/create_function/1566.php
similarity index 100%
rename from hphp/test/tcr/create_function/1566.php
rename to hphp/test/slow/create_function/1566.php
diff --git a/hphp/test/tcr/create_function/1566.php.expect b/hphp/test/slow/create_function/1566.php.expect
similarity index 100%
rename from hphp/test/tcr/create_function/1566.php.expect
rename to hphp/test/slow/create_function/1566.php.expect
diff --git a/hphp/test/tcr/create_function/1567.php b/hphp/test/slow/create_function/1567.php
similarity index 100%
rename from hphp/test/tcr/create_function/1567.php
rename to hphp/test/slow/create_function/1567.php
diff --git a/hphp/test/tcr/create_function/1567.php.expect b/hphp/test/slow/create_function/1567.php.expect
similarity index 100%
rename from hphp/test/tcr/create_function/1567.php.expect
rename to hphp/test/slow/create_function/1567.php.expect
diff --git a/hphp/test/tcr/defined/1623.php b/hphp/test/slow/defined/1623.php
similarity index 100%
rename from hphp/test/tcr/defined/1623.php
rename to hphp/test/slow/defined/1623.php
diff --git a/hphp/test/tcr/defined/1623.php.expect b/hphp/test/slow/defined/1623.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1623.php.expect
rename to hphp/test/slow/defined/1623.php.expect
diff --git a/hphp/test/tcr/defined/1624.php b/hphp/test/slow/defined/1624.php
similarity index 100%
rename from hphp/test/tcr/defined/1624.php
rename to hphp/test/slow/defined/1624.php
diff --git a/hphp/test/tcr/defined/1624.php.expect b/hphp/test/slow/defined/1624.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1624.php.expect
rename to hphp/test/slow/defined/1624.php.expect
diff --git a/hphp/test/tcr/defined/1625.php b/hphp/test/slow/defined/1625.php
similarity index 100%
rename from hphp/test/tcr/defined/1625.php
rename to hphp/test/slow/defined/1625.php
diff --git a/hphp/test/tcr/defined/1625.php.expect b/hphp/test/slow/defined/1625.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1625.php.expect
rename to hphp/test/slow/defined/1625.php.expect
diff --git a/hphp/test/tcr/defined/1626.php b/hphp/test/slow/defined/1626.php
similarity index 100%
rename from hphp/test/tcr/defined/1626.php
rename to hphp/test/slow/defined/1626.php
diff --git a/hphp/test/tcr/defined/1626.php.expect b/hphp/test/slow/defined/1626.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1626.php.expect
rename to hphp/test/slow/defined/1626.php.expect
diff --git a/hphp/test/tcr/defined/1627.php b/hphp/test/slow/defined/1627.php
similarity index 100%
rename from hphp/test/tcr/defined/1627.php
rename to hphp/test/slow/defined/1627.php
diff --git a/hphp/test/tcr/defined/1627.php.expect b/hphp/test/slow/defined/1627.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1627.php.expect
rename to hphp/test/slow/defined/1627.php.expect
diff --git a/hphp/test/tcr/defined/1628.php b/hphp/test/slow/defined/1628.php
similarity index 100%
rename from hphp/test/tcr/defined/1628.php
rename to hphp/test/slow/defined/1628.php
diff --git a/hphp/test/tcr/defined/1628.php.expect b/hphp/test/slow/defined/1628.php.expect
similarity index 100%
rename from hphp/test/tcr/defined/1628.php.expect
rename to hphp/test/slow/defined/1628.php.expect
diff --git a/hphp/test/tcr/directory/1702.php b/hphp/test/slow/directory/1702.php
similarity index 100%
rename from hphp/test/tcr/directory/1702.php
rename to hphp/test/slow/directory/1702.php
diff --git a/hphp/test/tcr/directory/1702.php.expect b/hphp/test/slow/directory/1702.php.expect
similarity index 100%
rename from hphp/test/tcr/directory/1702.php.expect
rename to hphp/test/slow/directory/1702.php.expect
diff --git a/hphp/test/tcr/disallow_object.opts b/hphp/test/slow/disallow_object.opts
similarity index 100%
rename from hphp/test/tcr/disallow_object.opts
rename to hphp/test/slow/disallow_object.opts
diff --git a/hphp/test/tcr/divide/1427.php b/hphp/test/slow/divide/1427.php
similarity index 100%
rename from hphp/test/tcr/divide/1427.php
rename to hphp/test/slow/divide/1427.php
diff --git a/hphp/test/tcr/divide/1427.php.expect b/hphp/test/slow/divide/1427.php.expect
similarity index 100%
rename from hphp/test/tcr/divide/1427.php.expect
rename to hphp/test/slow/divide/1427.php.expect
diff --git a/hphp/test/tcr/divide/1428.php b/hphp/test/slow/divide/1428.php
similarity index 100%
rename from hphp/test/tcr/divide/1428.php
rename to hphp/test/slow/divide/1428.php
diff --git a/hphp/test/tcr/divide/1428.php.expect b/hphp/test/slow/divide/1428.php.expect
similarity index 100%
rename from hphp/test/tcr/divide/1428.php.expect
rename to hphp/test/slow/divide/1428.php.expect
diff --git a/hphp/test/tcr/dom_document/1669.php b/hphp/test/slow/dom_document/1669.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1669.php
rename to hphp/test/slow/dom_document/1669.php
diff --git a/hphp/test/tcr/dom_document/1669.php.expect b/hphp/test/slow/dom_document/1669.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1669.php.expect
rename to hphp/test/slow/dom_document/1669.php.expect
diff --git a/hphp/test/tcr/dom_document/1670.php b/hphp/test/slow/dom_document/1670.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1670.php
rename to hphp/test/slow/dom_document/1670.php
diff --git a/hphp/test/tcr/ext_image/1789.php.expect b/hphp/test/slow/dom_document/1670.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1789.php.expect
rename to hphp/test/slow/dom_document/1670.php.expect
diff --git a/hphp/test/tcr/dom_document/1671.php b/hphp/test/slow/dom_document/1671.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1671.php
rename to hphp/test/slow/dom_document/1671.php
diff --git a/hphp/test/tcr/dom_document/1671.php.expect b/hphp/test/slow/dom_document/1671.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1671.php.expect
rename to hphp/test/slow/dom_document/1671.php.expect
diff --git a/hphp/test/tcr/dom_document/1672.php b/hphp/test/slow/dom_document/1672.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1672.php
rename to hphp/test/slow/dom_document/1672.php
diff --git a/hphp/test/tcr/dom_document/1672.php.expect b/hphp/test/slow/dom_document/1672.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1672.php.expect
rename to hphp/test/slow/dom_document/1672.php.expect
diff --git a/hphp/test/tcr/dom_document/1673.php b/hphp/test/slow/dom_document/1673.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1673.php
rename to hphp/test/slow/dom_document/1673.php
diff --git a/hphp/test/tcr/dom_document/1673.php.expect b/hphp/test/slow/dom_document/1673.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1673.php.expect
rename to hphp/test/slow/dom_document/1673.php.expect
diff --git a/hphp/test/tcr/dom_document/1674.php b/hphp/test/slow/dom_document/1674.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1674.php
rename to hphp/test/slow/dom_document/1674.php
diff --git a/hphp/test/tcr/dom_document/1674.php.expect b/hphp/test/slow/dom_document/1674.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1674.php.expect
rename to hphp/test/slow/dom_document/1674.php.expect
diff --git a/hphp/test/tcr/dom_document/1675.php b/hphp/test/slow/dom_document/1675.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1675.php
rename to hphp/test/slow/dom_document/1675.php
diff --git a/hphp/test/tcr/dom_document/1675.php.expect b/hphp/test/slow/dom_document/1675.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1675.php.expect
rename to hphp/test/slow/dom_document/1675.php.expect
diff --git a/hphp/test/tcr/dom_document/1676.php b/hphp/test/slow/dom_document/1676.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1676.php
rename to hphp/test/slow/dom_document/1676.php
diff --git a/hphp/test/tcr/dom_document/1676.php.expect b/hphp/test/slow/dom_document/1676.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1676.php.expect
rename to hphp/test/slow/dom_document/1676.php.expect
diff --git a/hphp/test/tcr/dom_document/1677.php b/hphp/test/slow/dom_document/1677.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1677.php
rename to hphp/test/slow/dom_document/1677.php
diff --git a/hphp/test/tcr/dom_document/1677.php.expect b/hphp/test/slow/dom_document/1677.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1677.php.expect
rename to hphp/test/slow/dom_document/1677.php.expect
diff --git a/hphp/test/tcr/dom_document/1678.php b/hphp/test/slow/dom_document/1678.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1678.php
rename to hphp/test/slow/dom_document/1678.php
diff --git a/hphp/test/tcr/dom_document/1678.php.expect b/hphp/test/slow/dom_document/1678.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1678.php.expect
rename to hphp/test/slow/dom_document/1678.php.expect
diff --git a/hphp/test/tcr/dom_document/1679.php b/hphp/test/slow/dom_document/1679.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1679.php
rename to hphp/test/slow/dom_document/1679.php
diff --git a/hphp/test/tcr/dom_document/1679.php.expect b/hphp/test/slow/dom_document/1679.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1679.php.expect
rename to hphp/test/slow/dom_document/1679.php.expect
diff --git a/hphp/test/tcr/dom_document/1680.php b/hphp/test/slow/dom_document/1680.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1680.php
rename to hphp/test/slow/dom_document/1680.php
diff --git a/hphp/test/tcr/dom_document/1680.php.expect b/hphp/test/slow/dom_document/1680.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1680.php.expect
rename to hphp/test/slow/dom_document/1680.php.expect
diff --git a/hphp/test/tcr/dom_document/1681.php b/hphp/test/slow/dom_document/1681.php
similarity index 100%
rename from hphp/test/tcr/dom_document/1681.php
rename to hphp/test/slow/dom_document/1681.php
diff --git a/hphp/test/tcr/dom_document/1681.php.expect b/hphp/test/slow/dom_document/1681.php.expect
similarity index 100%
rename from hphp/test/tcr/dom_document/1681.php.expect
rename to hphp/test/slow/dom_document/1681.php.expect
diff --git a/hphp/test/tcr/double/106.php b/hphp/test/slow/double/106.php
similarity index 100%
rename from hphp/test/tcr/double/106.php
rename to hphp/test/slow/double/106.php
diff --git a/hphp/test/tcr/double/106.php.expect b/hphp/test/slow/double/106.php.expect
similarity index 100%
rename from hphp/test/tcr/double/106.php.expect
rename to hphp/test/slow/double/106.php.expect
diff --git a/hphp/test/tcr/double/107.php b/hphp/test/slow/double/107.php
similarity index 100%
rename from hphp/test/tcr/double/107.php
rename to hphp/test/slow/double/107.php
diff --git a/hphp/test/tcr/double/107.php.expect b/hphp/test/slow/double/107.php.expect
similarity index 100%
rename from hphp/test/tcr/double/107.php.expect
rename to hphp/test/slow/double/107.php.expect
diff --git a/hphp/test/tcr/double/108.php b/hphp/test/slow/double/108.php
similarity index 100%
rename from hphp/test/tcr/double/108.php
rename to hphp/test/slow/double/108.php
diff --git a/hphp/test/tcr/double/108.php.expect b/hphp/test/slow/double/108.php.expect
similarity index 100%
rename from hphp/test/tcr/double/108.php.expect
rename to hphp/test/slow/double/108.php.expect
diff --git a/hphp/test/tcr/double/109.php b/hphp/test/slow/double/109.php
similarity index 100%
rename from hphp/test/tcr/double/109.php
rename to hphp/test/slow/double/109.php
diff --git a/hphp/test/tcr/double/109.php.expect b/hphp/test/slow/double/109.php.expect
similarity index 100%
rename from hphp/test/tcr/double/109.php.expect
rename to hphp/test/slow/double/109.php.expect
diff --git a/hphp/test/tcr/double/110.php b/hphp/test/slow/double/110.php
similarity index 100%
rename from hphp/test/tcr/double/110.php
rename to hphp/test/slow/double/110.php
diff --git a/hphp/test/tcr/double/110.php.expect b/hphp/test/slow/double/110.php.expect
similarity index 100%
rename from hphp/test/tcr/double/110.php.expect
rename to hphp/test/slow/double/110.php.expect
diff --git a/hphp/test/tcr/double/111.php b/hphp/test/slow/double/111.php
similarity index 100%
rename from hphp/test/tcr/double/111.php
rename to hphp/test/slow/double/111.php
diff --git a/hphp/test/tcr/double/111.php.expect b/hphp/test/slow/double/111.php.expect
similarity index 100%
rename from hphp/test/tcr/double/111.php.expect
rename to hphp/test/slow/double/111.php.expect
diff --git a/hphp/test/tcr/double/112.php b/hphp/test/slow/double/112.php
similarity index 100%
rename from hphp/test/tcr/double/112.php
rename to hphp/test/slow/double/112.php
diff --git a/hphp/test/tcr/double/112.php.expect b/hphp/test/slow/double/112.php.expect
similarity index 100%
rename from hphp/test/tcr/double/112.php.expect
rename to hphp/test/slow/double/112.php.expect
diff --git a/hphp/test/tcr/double/113.php b/hphp/test/slow/double/113.php
similarity index 100%
rename from hphp/test/tcr/double/113.php
rename to hphp/test/slow/double/113.php
diff --git a/hphp/test/tcr/double/113.php.expect b/hphp/test/slow/double/113.php.expect
similarity index 100%
rename from hphp/test/tcr/double/113.php.expect
rename to hphp/test/slow/double/113.php.expect
diff --git a/hphp/test/tcr/double/114.php b/hphp/test/slow/double/114.php
similarity index 100%
rename from hphp/test/tcr/double/114.php
rename to hphp/test/slow/double/114.php
diff --git a/hphp/test/tcr/double/114.php.expect b/hphp/test/slow/double/114.php.expect
similarity index 100%
rename from hphp/test/tcr/double/114.php.expect
rename to hphp/test/slow/double/114.php.expect
diff --git a/hphp/test/tcr/double/115.php b/hphp/test/slow/double/115.php
similarity index 100%
rename from hphp/test/tcr/double/115.php
rename to hphp/test/slow/double/115.php
diff --git a/hphp/test/tcr/double/115.php.expect b/hphp/test/slow/double/115.php.expect
similarity index 100%
rename from hphp/test/tcr/double/115.php.expect
rename to hphp/test/slow/double/115.php.expect
diff --git a/hphp/test/tcr/double/116.php b/hphp/test/slow/double/116.php
similarity index 100%
rename from hphp/test/tcr/double/116.php
rename to hphp/test/slow/double/116.php
diff --git a/hphp/test/tcr/double/116.php.expect b/hphp/test/slow/double/116.php.expect
similarity index 100%
rename from hphp/test/tcr/double/116.php.expect
rename to hphp/test/slow/double/116.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1127.php b/hphp/test/slow/dynamic_constants/1127.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1127.php
rename to hphp/test/slow/dynamic_constants/1127.php
diff --git a/hphp/test/tcr/dynamic_constants/1127.php.expect b/hphp/test/slow/dynamic_constants/1127.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1127.php.expect
rename to hphp/test/slow/dynamic_constants/1127.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1128.php b/hphp/test/slow/dynamic_constants/1128.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1128.php
rename to hphp/test/slow/dynamic_constants/1128.php
diff --git a/hphp/test/tcr/dynamic_constants/1128.php.expect b/hphp/test/slow/dynamic_constants/1128.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1128.php.expect
rename to hphp/test/slow/dynamic_constants/1128.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1129.php b/hphp/test/slow/dynamic_constants/1129.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1129.php
rename to hphp/test/slow/dynamic_constants/1129.php
diff --git a/hphp/test/tcr/dynamic_constants/1129.php.expect b/hphp/test/slow/dynamic_constants/1129.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1129.php.expect
rename to hphp/test/slow/dynamic_constants/1129.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1130.php b/hphp/test/slow/dynamic_constants/1130.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1130.php
rename to hphp/test/slow/dynamic_constants/1130.php
diff --git a/hphp/test/tcr/dynamic_constants/1130.php.expect b/hphp/test/slow/dynamic_constants/1130.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1130.php.expect
rename to hphp/test/slow/dynamic_constants/1130.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1131.php b/hphp/test/slow/dynamic_constants/1131.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1131.php
rename to hphp/test/slow/dynamic_constants/1131.php
diff --git a/hphp/test/tcr/dynamic_constants/1131.php.expect b/hphp/test/slow/dynamic_constants/1131.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1131.php.expect
rename to hphp/test/slow/dynamic_constants/1131.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1132.php b/hphp/test/slow/dynamic_constants/1132.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1132.php
rename to hphp/test/slow/dynamic_constants/1132.php
diff --git a/hphp/test/tcr/dynamic_constants/1132.php.expect b/hphp/test/slow/dynamic_constants/1132.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1132.php.expect
rename to hphp/test/slow/dynamic_constants/1132.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1133.php b/hphp/test/slow/dynamic_constants/1133.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1133.php
rename to hphp/test/slow/dynamic_constants/1133.php
diff --git a/hphp/test/tcr/dynamic_constants/1133.php.expect b/hphp/test/slow/dynamic_constants/1133.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1133.php.expect
rename to hphp/test/slow/dynamic_constants/1133.php.expect
diff --git a/hphp/test/tcr/dynamic_constants/1134.php b/hphp/test/slow/dynamic_constants/1134.php
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1134.php
rename to hphp/test/slow/dynamic_constants/1134.php
diff --git a/hphp/test/tcr/dynamic_constants/1134.php.expect b/hphp/test/slow/dynamic_constants/1134.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_constants/1134.php.expect
rename to hphp/test/slow/dynamic_constants/1134.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1171.php b/hphp/test/slow/dynamic_functions/1171.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1171.php
rename to hphp/test/slow/dynamic_functions/1171.php
diff --git a/hphp/test/tcr/dynamic_functions/1171.php.expect b/hphp/test/slow/dynamic_functions/1171.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1171.php.expect
rename to hphp/test/slow/dynamic_functions/1171.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1172.php b/hphp/test/slow/dynamic_functions/1172.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1172.php
rename to hphp/test/slow/dynamic_functions/1172.php
diff --git a/hphp/test/tcr/dynamic_functions/1172.php.expect b/hphp/test/slow/dynamic_functions/1172.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1172.php.expect
rename to hphp/test/slow/dynamic_functions/1172.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1173.php b/hphp/test/slow/dynamic_functions/1173.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1173.php
rename to hphp/test/slow/dynamic_functions/1173.php
diff --git a/hphp/test/tcr/dynamic_functions/1173.php.expect b/hphp/test/slow/dynamic_functions/1173.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1173.php.expect
rename to hphp/test/slow/dynamic_functions/1173.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1174.php b/hphp/test/slow/dynamic_functions/1174.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1174.php
rename to hphp/test/slow/dynamic_functions/1174.php
diff --git a/hphp/test/tcr/dynamic_functions/1174.php.expect b/hphp/test/slow/dynamic_functions/1174.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1174.php.expect
rename to hphp/test/slow/dynamic_functions/1174.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1175.php b/hphp/test/slow/dynamic_functions/1175.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1175.php
rename to hphp/test/slow/dynamic_functions/1175.php
diff --git a/hphp/test/tcr/dynamic_functions/1175.php.expect b/hphp/test/slow/dynamic_functions/1175.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1175.php.expect
rename to hphp/test/slow/dynamic_functions/1175.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1176.php b/hphp/test/slow/dynamic_functions/1176.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1176.php
rename to hphp/test/slow/dynamic_functions/1176.php
diff --git a/hphp/test/tcr/dynamic_functions/1176.php.expect b/hphp/test/slow/dynamic_functions/1176.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1176.php.expect
rename to hphp/test/slow/dynamic_functions/1176.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1177.php b/hphp/test/slow/dynamic_functions/1177.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1177.php
rename to hphp/test/slow/dynamic_functions/1177.php
diff --git a/hphp/test/tcr/dynamic_functions/1177.php.expect b/hphp/test/slow/dynamic_functions/1177.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1177.php.expect
rename to hphp/test/slow/dynamic_functions/1177.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1178.php b/hphp/test/slow/dynamic_functions/1178.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1178.php
rename to hphp/test/slow/dynamic_functions/1178.php
diff --git a/hphp/test/tcr/dynamic_functions/1178.php.expect b/hphp/test/slow/dynamic_functions/1178.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1178.php.expect
rename to hphp/test/slow/dynamic_functions/1178.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1179.php b/hphp/test/slow/dynamic_functions/1179.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1179.php
rename to hphp/test/slow/dynamic_functions/1179.php
diff --git a/hphp/test/tcr/dynamic_functions/1179.php.expect b/hphp/test/slow/dynamic_functions/1179.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1179.php.expect
rename to hphp/test/slow/dynamic_functions/1179.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1180.php b/hphp/test/slow/dynamic_functions/1180.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1180.php
rename to hphp/test/slow/dynamic_functions/1180.php
diff --git a/hphp/test/tcr/dynamic_functions/1180.php.expect b/hphp/test/slow/dynamic_functions/1180.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1180.php.expect
rename to hphp/test/slow/dynamic_functions/1180.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1181.php b/hphp/test/slow/dynamic_functions/1181.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1181.php
rename to hphp/test/slow/dynamic_functions/1181.php
diff --git a/hphp/test/tcr/dynamic_functions/1181.php.expect b/hphp/test/slow/dynamic_functions/1181.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1181.php.expect
rename to hphp/test/slow/dynamic_functions/1181.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1182.php b/hphp/test/slow/dynamic_functions/1182.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1182.php
rename to hphp/test/slow/dynamic_functions/1182.php
diff --git a/hphp/test/tcr/dynamic_functions/1182.php.expect b/hphp/test/slow/dynamic_functions/1182.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1182.php.expect
rename to hphp/test/slow/dynamic_functions/1182.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1183.php b/hphp/test/slow/dynamic_functions/1183.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1183.php
rename to hphp/test/slow/dynamic_functions/1183.php
diff --git a/hphp/test/tcr/dynamic_functions/1183.php.expect b/hphp/test/slow/dynamic_functions/1183.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1183.php.expect
rename to hphp/test/slow/dynamic_functions/1183.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1184.php b/hphp/test/slow/dynamic_functions/1184.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1184.php
rename to hphp/test/slow/dynamic_functions/1184.php
diff --git a/hphp/test/tcr/dynamic_functions/1184.php.expect b/hphp/test/slow/dynamic_functions/1184.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1184.php.expect
rename to hphp/test/slow/dynamic_functions/1184.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1185.php b/hphp/test/slow/dynamic_functions/1185.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1185.php
rename to hphp/test/slow/dynamic_functions/1185.php
diff --git a/hphp/test/tcr/dynamic_functions/1185.php.expect b/hphp/test/slow/dynamic_functions/1185.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1185.php.expect
rename to hphp/test/slow/dynamic_functions/1185.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1186.php b/hphp/test/slow/dynamic_functions/1186.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1186.php
rename to hphp/test/slow/dynamic_functions/1186.php
diff --git a/hphp/test/tcr/dynamic_functions/1186.php.expect b/hphp/test/slow/dynamic_functions/1186.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1186.php.expect
rename to hphp/test/slow/dynamic_functions/1186.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1187.php b/hphp/test/slow/dynamic_functions/1187.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1187.php
rename to hphp/test/slow/dynamic_functions/1187.php
diff --git a/hphp/test/tcr/ext_image/1790.php.expect b/hphp/test/slow/dynamic_functions/1187.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1790.php.expect
rename to hphp/test/slow/dynamic_functions/1187.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1188.php b/hphp/test/slow/dynamic_functions/1188.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1188.php
rename to hphp/test/slow/dynamic_functions/1188.php
diff --git a/hphp/test/tcr/dynamic_functions/1188.php.expect b/hphp/test/slow/dynamic_functions/1188.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1188.php.expect
rename to hphp/test/slow/dynamic_functions/1188.php.expect
diff --git a/hphp/test/tcr/dynamic_functions/1189.php b/hphp/test/slow/dynamic_functions/1189.php
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1189.php
rename to hphp/test/slow/dynamic_functions/1189.php
diff --git a/hphp/test/tcr/dynamic_functions/1189.php.expect b/hphp/test/slow/dynamic_functions/1189.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_functions/1189.php.expect
rename to hphp/test/slow/dynamic_functions/1189.php.expect
diff --git a/hphp/test/tcr/dynamic_invoke_functions_test_1_and_2.hphp_opts b/hphp/test/slow/dynamic_invoke_functions_test_1_and_2.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_invoke_functions_test_1_and_2.hphp_opts
rename to hphp/test/slow/dynamic_invoke_functions_test_1_and_2.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1202.php b/hphp/test/slow/dynamic_methods/1202.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1202.php
rename to hphp/test/slow/dynamic_methods/1202.php
diff --git a/hphp/test/tcr/dynamic_methods/1202.php.expect b/hphp/test/slow/dynamic_methods/1202.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1202.php.expect
rename to hphp/test/slow/dynamic_methods/1202.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1202.php.hphp_opts b/hphp/test/slow/dynamic_methods/1202.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1202.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1202.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1203.php b/hphp/test/slow/dynamic_methods/1203.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1203.php
rename to hphp/test/slow/dynamic_methods/1203.php
diff --git a/hphp/test/tcr/dynamic_methods/1203.php.expect b/hphp/test/slow/dynamic_methods/1203.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1203.php.expect
rename to hphp/test/slow/dynamic_methods/1203.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1203.php.hphp_opts b/hphp/test/slow/dynamic_methods/1203.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1203.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1203.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1204.php b/hphp/test/slow/dynamic_methods/1204.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1204.php
rename to hphp/test/slow/dynamic_methods/1204.php
diff --git a/hphp/test/tcr/dynamic_methods/1204.php.expect b/hphp/test/slow/dynamic_methods/1204.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1204.php.expect
rename to hphp/test/slow/dynamic_methods/1204.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1204.php.hphp_opts b/hphp/test/slow/dynamic_methods/1204.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1204.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1204.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1205.php b/hphp/test/slow/dynamic_methods/1205.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1205.php
rename to hphp/test/slow/dynamic_methods/1205.php
diff --git a/hphp/test/tcr/ext_spl_file/1797.php.expect b/hphp/test/slow/dynamic_methods/1205.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1797.php.expect
rename to hphp/test/slow/dynamic_methods/1205.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1205.php.hphp_opts b/hphp/test/slow/dynamic_methods/1205.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1205.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1205.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1206.php b/hphp/test/slow/dynamic_methods/1206.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1206.php
rename to hphp/test/slow/dynamic_methods/1206.php
diff --git a/hphp/test/tcr/dynamic_methods/1206.php.expect b/hphp/test/slow/dynamic_methods/1206.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1206.php.expect
rename to hphp/test/slow/dynamic_methods/1206.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1206.php.hphp_opts b/hphp/test/slow/dynamic_methods/1206.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1206.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1206.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1207.php b/hphp/test/slow/dynamic_methods/1207.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1207.php
rename to hphp/test/slow/dynamic_methods/1207.php
diff --git a/hphp/test/tcr/dynamic_methods/1207.php.expect b/hphp/test/slow/dynamic_methods/1207.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1207.php.expect
rename to hphp/test/slow/dynamic_methods/1207.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1207.php.hphp_opts b/hphp/test/slow/dynamic_methods/1207.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1207.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1207.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1208.php b/hphp/test/slow/dynamic_methods/1208.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1208.php
rename to hphp/test/slow/dynamic_methods/1208.php
diff --git a/hphp/test/tcr/dynamic_methods/1208.php.expect b/hphp/test/slow/dynamic_methods/1208.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1208.php.expect
rename to hphp/test/slow/dynamic_methods/1208.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1208.php.hphp_opts b/hphp/test/slow/dynamic_methods/1208.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1208.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1208.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1209.php b/hphp/test/slow/dynamic_methods/1209.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1209.php
rename to hphp/test/slow/dynamic_methods/1209.php
diff --git a/hphp/test/tcr/dynamic_methods/1209.php.expect b/hphp/test/slow/dynamic_methods/1209.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1209.php.expect
rename to hphp/test/slow/dynamic_methods/1209.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1209.php.hphp_opts b/hphp/test/slow/dynamic_methods/1209.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1209.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1209.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1210.php b/hphp/test/slow/dynamic_methods/1210.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1210.php
rename to hphp/test/slow/dynamic_methods/1210.php
diff --git a/hphp/test/tcr/dynamic_methods/1210.php.expect b/hphp/test/slow/dynamic_methods/1210.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1210.php.expect
rename to hphp/test/slow/dynamic_methods/1210.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1210.php.hphp_opts b/hphp/test/slow/dynamic_methods/1210.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1210.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1210.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1211.php b/hphp/test/slow/dynamic_methods/1211.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1211.php
rename to hphp/test/slow/dynamic_methods/1211.php
diff --git a/hphp/test/tcr/dynamic_methods/1211.php.expect b/hphp/test/slow/dynamic_methods/1211.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1211.php.expect
rename to hphp/test/slow/dynamic_methods/1211.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1211.php.hphp_opts b/hphp/test/slow/dynamic_methods/1211.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1211.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1211.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1212.php b/hphp/test/slow/dynamic_methods/1212.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1212.php
rename to hphp/test/slow/dynamic_methods/1212.php
diff --git a/hphp/test/tcr/dynamic_methods/1212.php.expect b/hphp/test/slow/dynamic_methods/1212.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1212.php.expect
rename to hphp/test/slow/dynamic_methods/1212.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1212.php.hphp_opts b/hphp/test/slow/dynamic_methods/1212.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1212.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1212.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1213.php b/hphp/test/slow/dynamic_methods/1213.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1213.php
rename to hphp/test/slow/dynamic_methods/1213.php
diff --git a/hphp/test/tcr/dynamic_methods/1213.php.expect b/hphp/test/slow/dynamic_methods/1213.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1213.php.expect
rename to hphp/test/slow/dynamic_methods/1213.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1213.php.hphp_opts b/hphp/test/slow/dynamic_methods/1213.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1213.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1213.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_methods/1214.php b/hphp/test/slow/dynamic_methods/1214.php
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1214.php
rename to hphp/test/slow/dynamic_methods/1214.php
diff --git a/hphp/test/tcr/dynamic_methods/1214.php.expect b/hphp/test/slow/dynamic_methods/1214.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1214.php.expect
rename to hphp/test/slow/dynamic_methods/1214.php.expect
diff --git a/hphp/test/tcr/dynamic_methods/1214.php.hphp_opts b/hphp/test/slow/dynamic_methods/1214.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/dynamic_methods/1214.php.hphp_opts
rename to hphp/test/slow/dynamic_methods/1214.php.hphp_opts
diff --git a/hphp/test/tcr/dynamic_properties/1168.php b/hphp/test/slow/dynamic_properties/1168.php
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1168.php
rename to hphp/test/slow/dynamic_properties/1168.php
diff --git a/hphp/test/tcr/dynamic_properties/1168.php.expect b/hphp/test/slow/dynamic_properties/1168.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1168.php.expect
rename to hphp/test/slow/dynamic_properties/1168.php.expect
diff --git a/hphp/test/tcr/dynamic_properties/1169.php b/hphp/test/slow/dynamic_properties/1169.php
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1169.php
rename to hphp/test/slow/dynamic_properties/1169.php
diff --git a/hphp/test/tcr/dynamic_properties/1169.php.expect b/hphp/test/slow/dynamic_properties/1169.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1169.php.expect
rename to hphp/test/slow/dynamic_properties/1169.php.expect
diff --git a/hphp/test/tcr/dynamic_properties/1170.php b/hphp/test/slow/dynamic_properties/1170.php
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1170.php
rename to hphp/test/slow/dynamic_properties/1170.php
diff --git a/hphp/test/tcr/dynamic_properties/1170.php.expect b/hphp/test/slow/dynamic_properties/1170.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_properties/1170.php.expect
rename to hphp/test/slow/dynamic_properties/1170.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1135.php b/hphp/test/slow/dynamic_variables/1135.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1135.php
rename to hphp/test/slow/dynamic_variables/1135.php
diff --git a/hphp/test/tcr/dynamic_variables/1135.php.expect b/hphp/test/slow/dynamic_variables/1135.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1135.php.expect
rename to hphp/test/slow/dynamic_variables/1135.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1136.php b/hphp/test/slow/dynamic_variables/1136.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1136.php
rename to hphp/test/slow/dynamic_variables/1136.php
diff --git a/hphp/test/tcr/dynamic_variables/1136.php.expect b/hphp/test/slow/dynamic_variables/1136.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1136.php.expect
rename to hphp/test/slow/dynamic_variables/1136.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1137.php b/hphp/test/slow/dynamic_variables/1137.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1137.php
rename to hphp/test/slow/dynamic_variables/1137.php
diff --git a/hphp/test/tcr/dynamic_variables/1137.php.expect b/hphp/test/slow/dynamic_variables/1137.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1137.php.expect
rename to hphp/test/slow/dynamic_variables/1137.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1138.php b/hphp/test/slow/dynamic_variables/1138.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1138.php
rename to hphp/test/slow/dynamic_variables/1138.php
diff --git a/hphp/test/tcr/dynamic_variables/1138.php.expect b/hphp/test/slow/dynamic_variables/1138.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1138.php.expect
rename to hphp/test/slow/dynamic_variables/1138.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1139.php b/hphp/test/slow/dynamic_variables/1139.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1139.php
rename to hphp/test/slow/dynamic_variables/1139.php
diff --git a/hphp/test/tcr/dynamic_variables/1139.php.expect b/hphp/test/slow/dynamic_variables/1139.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1139.php.expect
rename to hphp/test/slow/dynamic_variables/1139.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1140.php b/hphp/test/slow/dynamic_variables/1140.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1140.php
rename to hphp/test/slow/dynamic_variables/1140.php
diff --git a/hphp/test/tcr/dynamic_variables/1140.php.expect b/hphp/test/slow/dynamic_variables/1140.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1140.php.expect
rename to hphp/test/slow/dynamic_variables/1140.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1141.php b/hphp/test/slow/dynamic_variables/1141.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1141.php
rename to hphp/test/slow/dynamic_variables/1141.php
diff --git a/hphp/test/tcr/dynamic_variables/1141.php.expect b/hphp/test/slow/dynamic_variables/1141.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1141.php.expect
rename to hphp/test/slow/dynamic_variables/1141.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1142.php b/hphp/test/slow/dynamic_variables/1142.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1142.php
rename to hphp/test/slow/dynamic_variables/1142.php
diff --git a/hphp/test/tcr/dynamic_variables/1142.php.expect b/hphp/test/slow/dynamic_variables/1142.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1142.php.expect
rename to hphp/test/slow/dynamic_variables/1142.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1143.php b/hphp/test/slow/dynamic_variables/1143.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1143.php
rename to hphp/test/slow/dynamic_variables/1143.php
diff --git a/hphp/test/tcr/dynamic_variables/1143.php.expect b/hphp/test/slow/dynamic_variables/1143.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1143.php.expect
rename to hphp/test/slow/dynamic_variables/1143.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1144.php b/hphp/test/slow/dynamic_variables/1144.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1144.php
rename to hphp/test/slow/dynamic_variables/1144.php
diff --git a/hphp/test/tcr/dynamic_variables/1144.php.expect b/hphp/test/slow/dynamic_variables/1144.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1144.php.expect
rename to hphp/test/slow/dynamic_variables/1144.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1145.php b/hphp/test/slow/dynamic_variables/1145.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1145.php
rename to hphp/test/slow/dynamic_variables/1145.php
diff --git a/hphp/test/tcr/dynamic_variables/1145.php.expect b/hphp/test/slow/dynamic_variables/1145.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1145.php.expect
rename to hphp/test/slow/dynamic_variables/1145.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1146.php b/hphp/test/slow/dynamic_variables/1146.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1146.php
rename to hphp/test/slow/dynamic_variables/1146.php
diff --git a/hphp/test/tcr/dynamic_variables/1146.php.expect b/hphp/test/slow/dynamic_variables/1146.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1146.php.expect
rename to hphp/test/slow/dynamic_variables/1146.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1147.php b/hphp/test/slow/dynamic_variables/1147.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1147.php
rename to hphp/test/slow/dynamic_variables/1147.php
diff --git a/hphp/test/tcr/dynamic_variables/1147.php.expect b/hphp/test/slow/dynamic_variables/1147.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1147.php.expect
rename to hphp/test/slow/dynamic_variables/1147.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1148.php b/hphp/test/slow/dynamic_variables/1148.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1148.php
rename to hphp/test/slow/dynamic_variables/1148.php
diff --git a/hphp/test/tcr/dynamic_variables/1148.php.expect b/hphp/test/slow/dynamic_variables/1148.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1148.php.expect
rename to hphp/test/slow/dynamic_variables/1148.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1149.php b/hphp/test/slow/dynamic_variables/1149.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1149.php
rename to hphp/test/slow/dynamic_variables/1149.php
diff --git a/hphp/test/tcr/dynamic_variables/1149.php.expect b/hphp/test/slow/dynamic_variables/1149.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1149.php.expect
rename to hphp/test/slow/dynamic_variables/1149.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1150.php b/hphp/test/slow/dynamic_variables/1150.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1150.php
rename to hphp/test/slow/dynamic_variables/1150.php
diff --git a/hphp/test/tcr/dynamic_variables/1150.php.expect b/hphp/test/slow/dynamic_variables/1150.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1150.php.expect
rename to hphp/test/slow/dynamic_variables/1150.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1151.php b/hphp/test/slow/dynamic_variables/1151.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1151.php
rename to hphp/test/slow/dynamic_variables/1151.php
diff --git a/hphp/test/tcr/dynamic_variables/1151.php.expect b/hphp/test/slow/dynamic_variables/1151.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1151.php.expect
rename to hphp/test/slow/dynamic_variables/1151.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1152.php b/hphp/test/slow/dynamic_variables/1152.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1152.php
rename to hphp/test/slow/dynamic_variables/1152.php
diff --git a/hphp/test/tcr/dynamic_variables/1152.php.expect b/hphp/test/slow/dynamic_variables/1152.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1152.php.expect
rename to hphp/test/slow/dynamic_variables/1152.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1153.php b/hphp/test/slow/dynamic_variables/1153.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1153.php
rename to hphp/test/slow/dynamic_variables/1153.php
diff --git a/hphp/test/tcr/dynamic_variables/1153.php.expect b/hphp/test/slow/dynamic_variables/1153.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1153.php.expect
rename to hphp/test/slow/dynamic_variables/1153.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1154.php b/hphp/test/slow/dynamic_variables/1154.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1154.php
rename to hphp/test/slow/dynamic_variables/1154.php
diff --git a/hphp/test/tcr/dynamic_variables/1154.php.expect b/hphp/test/slow/dynamic_variables/1154.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1154.php.expect
rename to hphp/test/slow/dynamic_variables/1154.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1155.php b/hphp/test/slow/dynamic_variables/1155.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1155.php
rename to hphp/test/slow/dynamic_variables/1155.php
diff --git a/hphp/test/tcr/dynamic_variables/1155.php.expect b/hphp/test/slow/dynamic_variables/1155.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1155.php.expect
rename to hphp/test/slow/dynamic_variables/1155.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1156.php b/hphp/test/slow/dynamic_variables/1156.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1156.php
rename to hphp/test/slow/dynamic_variables/1156.php
diff --git a/hphp/test/tcr/dynamic_variables/1156.php.expect b/hphp/test/slow/dynamic_variables/1156.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1156.php.expect
rename to hphp/test/slow/dynamic_variables/1156.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1157.php b/hphp/test/slow/dynamic_variables/1157.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1157.php
rename to hphp/test/slow/dynamic_variables/1157.php
diff --git a/hphp/test/tcr/dynamic_variables/1157.php.expect b/hphp/test/slow/dynamic_variables/1157.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1157.php.expect
rename to hphp/test/slow/dynamic_variables/1157.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1158.php b/hphp/test/slow/dynamic_variables/1158.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1158.php
rename to hphp/test/slow/dynamic_variables/1158.php
diff --git a/hphp/test/tcr/dynamic_variables/1158.php.expect b/hphp/test/slow/dynamic_variables/1158.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1158.php.expect
rename to hphp/test/slow/dynamic_variables/1158.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1159.php b/hphp/test/slow/dynamic_variables/1159.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1159.php
rename to hphp/test/slow/dynamic_variables/1159.php
diff --git a/hphp/test/tcr/dynamic_variables/1159.php.expect b/hphp/test/slow/dynamic_variables/1159.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1159.php.expect
rename to hphp/test/slow/dynamic_variables/1159.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1160.php b/hphp/test/slow/dynamic_variables/1160.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1160.php
rename to hphp/test/slow/dynamic_variables/1160.php
diff --git a/hphp/test/tcr/dynamic_variables/1160.php.expect b/hphp/test/slow/dynamic_variables/1160.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1160.php.expect
rename to hphp/test/slow/dynamic_variables/1160.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1161.php b/hphp/test/slow/dynamic_variables/1161.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1161.php
rename to hphp/test/slow/dynamic_variables/1161.php
diff --git a/hphp/test/tcr/dynamic_variables/1161.php.expect b/hphp/test/slow/dynamic_variables/1161.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1161.php.expect
rename to hphp/test/slow/dynamic_variables/1161.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1162.php b/hphp/test/slow/dynamic_variables/1162.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1162.php
rename to hphp/test/slow/dynamic_variables/1162.php
diff --git a/hphp/test/tcr/dynamic_variables/1162.php.expect b/hphp/test/slow/dynamic_variables/1162.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1162.php.expect
rename to hphp/test/slow/dynamic_variables/1162.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1163.php b/hphp/test/slow/dynamic_variables/1163.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1163.php
rename to hphp/test/slow/dynamic_variables/1163.php
diff --git a/hphp/test/tcr/dynamic_variables/1163.php.expect b/hphp/test/slow/dynamic_variables/1163.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1163.php.expect
rename to hphp/test/slow/dynamic_variables/1163.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1164.php b/hphp/test/slow/dynamic_variables/1164.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1164.php
rename to hphp/test/slow/dynamic_variables/1164.php
diff --git a/hphp/test/tcr/dynamic_variables/1164.php.expect b/hphp/test/slow/dynamic_variables/1164.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1164.php.expect
rename to hphp/test/slow/dynamic_variables/1164.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1165.php b/hphp/test/slow/dynamic_variables/1165.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1165.php
rename to hphp/test/slow/dynamic_variables/1165.php
diff --git a/hphp/test/tcr/dynamic_variables/1165.php.expect b/hphp/test/slow/dynamic_variables/1165.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1165.php.expect
rename to hphp/test/slow/dynamic_variables/1165.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1166.php b/hphp/test/slow/dynamic_variables/1166.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1166.php
rename to hphp/test/slow/dynamic_variables/1166.php
diff --git a/hphp/test/tcr/dynamic_variables/1166.php.expect b/hphp/test/slow/dynamic_variables/1166.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1166.php.expect
rename to hphp/test/slow/dynamic_variables/1166.php.expect
diff --git a/hphp/test/tcr/dynamic_variables/1167.php b/hphp/test/slow/dynamic_variables/1167.php
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1167.php
rename to hphp/test/slow/dynamic_variables/1167.php
diff --git a/hphp/test/tcr/dynamic_variables/1167.php.expect b/hphp/test/slow/dynamic_variables/1167.php.expect
similarity index 100%
rename from hphp/test/tcr/dynamic_variables/1167.php.expect
rename to hphp/test/slow/dynamic_variables/1167.php.expect
diff --git a/hphp/test/tcr/error_handler/1366.php b/hphp/test/slow/error_handler/1366.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1366.php
rename to hphp/test/slow/error_handler/1366.php
diff --git a/hphp/test/tcr/error_handler/1366.php.expect b/hphp/test/slow/error_handler/1366.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1366.php.expect
rename to hphp/test/slow/error_handler/1366.php.expect
diff --git a/hphp/test/tcr/error_handler/1367.php b/hphp/test/slow/error_handler/1367.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1367.php
rename to hphp/test/slow/error_handler/1367.php
diff --git a/hphp/test/tcr/error_handler/1367.php.expect b/hphp/test/slow/error_handler/1367.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1367.php.expect
rename to hphp/test/slow/error_handler/1367.php.expect
diff --git a/hphp/test/tcr/error_handler/1368.php b/hphp/test/slow/error_handler/1368.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1368.php
rename to hphp/test/slow/error_handler/1368.php
diff --git a/hphp/test/tcr/error_handler/1368.php.expect b/hphp/test/slow/error_handler/1368.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1368.php.expect
rename to hphp/test/slow/error_handler/1368.php.expect
diff --git a/hphp/test/tcr/error_handler/1369.php b/hphp/test/slow/error_handler/1369.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1369.php
rename to hphp/test/slow/error_handler/1369.php
diff --git a/hphp/test/tcr/error_handler/1369.php.expect b/hphp/test/slow/error_handler/1369.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1369.php.expect
rename to hphp/test/slow/error_handler/1369.php.expect
diff --git a/hphp/test/tcr/error_handler/1370.php b/hphp/test/slow/error_handler/1370.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1370.php
rename to hphp/test/slow/error_handler/1370.php
diff --git a/hphp/test/tcr/error_handler/1370.php.expect b/hphp/test/slow/error_handler/1370.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1370.php.expect
rename to hphp/test/slow/error_handler/1370.php.expect
diff --git a/hphp/test/tcr/error_handler/1371.php b/hphp/test/slow/error_handler/1371.php
similarity index 100%
rename from hphp/test/tcr/error_handler/1371.php
rename to hphp/test/slow/error_handler/1371.php
diff --git a/hphp/test/tcr/error_handler/1371.php.expect b/hphp/test/slow/error_handler/1371.php.expect
similarity index 100%
rename from hphp/test/tcr/error_handler/1371.php.expect
rename to hphp/test/slow/error_handler/1371.php.expect
diff --git a/hphp/test/tcr/eval_order/1499.php b/hphp/test/slow/eval_order/1499.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1499.php
rename to hphp/test/slow/eval_order/1499.php
diff --git a/hphp/test/tcr/eval_order/1499.php.expect b/hphp/test/slow/eval_order/1499.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1499.php.expect
rename to hphp/test/slow/eval_order/1499.php.expect
diff --git a/hphp/test/tcr/eval_order/1500.php b/hphp/test/slow/eval_order/1500.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1500.php
rename to hphp/test/slow/eval_order/1500.php
diff --git a/hphp/test/tcr/eval_order/1500.php.expect b/hphp/test/slow/eval_order/1500.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1500.php.expect
rename to hphp/test/slow/eval_order/1500.php.expect
diff --git a/hphp/test/tcr/eval_order/1501.php b/hphp/test/slow/eval_order/1501.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1501.php
rename to hphp/test/slow/eval_order/1501.php
diff --git a/hphp/test/tcr/eval_order/1501.php.expect b/hphp/test/slow/eval_order/1501.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1501.php.expect
rename to hphp/test/slow/eval_order/1501.php.expect
diff --git a/hphp/test/tcr/eval_order/1502.php b/hphp/test/slow/eval_order/1502.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1502.php
rename to hphp/test/slow/eval_order/1502.php
diff --git a/hphp/test/tcr/eval_order/1502.php.expect b/hphp/test/slow/eval_order/1502.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1502.php.expect
rename to hphp/test/slow/eval_order/1502.php.expect
diff --git a/hphp/test/tcr/eval_order/1503.php b/hphp/test/slow/eval_order/1503.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1503.php
rename to hphp/test/slow/eval_order/1503.php
diff --git a/hphp/test/tcr/eval_order/1503.php.expect b/hphp/test/slow/eval_order/1503.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1503.php.expect
rename to hphp/test/slow/eval_order/1503.php.expect
diff --git a/hphp/test/tcr/eval_order/1504.php b/hphp/test/slow/eval_order/1504.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1504.php
rename to hphp/test/slow/eval_order/1504.php
diff --git a/hphp/test/tcr/eval_order/1504.php.expect b/hphp/test/slow/eval_order/1504.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1504.php.expect
rename to hphp/test/slow/eval_order/1504.php.expect
diff --git a/hphp/test/tcr/eval_order/1505.php b/hphp/test/slow/eval_order/1505.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1505.php
rename to hphp/test/slow/eval_order/1505.php
diff --git a/hphp/test/tcr/eval_order/1505.php.expect b/hphp/test/slow/eval_order/1505.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1505.php.expect
rename to hphp/test/slow/eval_order/1505.php.expect
diff --git a/hphp/test/tcr/eval_order/1506.php b/hphp/test/slow/eval_order/1506.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1506.php
rename to hphp/test/slow/eval_order/1506.php
diff --git a/hphp/test/tcr/eval_order/1506.php.expect b/hphp/test/slow/eval_order/1506.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1506.php.expect
rename to hphp/test/slow/eval_order/1506.php.expect
diff --git a/hphp/test/tcr/eval_order/1507.php b/hphp/test/slow/eval_order/1507.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1507.php
rename to hphp/test/slow/eval_order/1507.php
diff --git a/hphp/test/tcr/eval_order/1507.php.expect b/hphp/test/slow/eval_order/1507.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1507.php.expect
rename to hphp/test/slow/eval_order/1507.php.expect
diff --git a/hphp/test/tcr/eval_order/1508.php b/hphp/test/slow/eval_order/1508.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1508.php
rename to hphp/test/slow/eval_order/1508.php
diff --git a/hphp/test/tcr/eval_order/1508.php.expect b/hphp/test/slow/eval_order/1508.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1508.php.expect
rename to hphp/test/slow/eval_order/1508.php.expect
diff --git a/hphp/test/tcr/eval_order/1509.php b/hphp/test/slow/eval_order/1509.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1509.php
rename to hphp/test/slow/eval_order/1509.php
diff --git a/hphp/test/tcr/eval_order/1509.php.expect b/hphp/test/slow/eval_order/1509.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1509.php.expect
rename to hphp/test/slow/eval_order/1509.php.expect
diff --git a/hphp/test/tcr/eval_order/1510.php b/hphp/test/slow/eval_order/1510.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1510.php
rename to hphp/test/slow/eval_order/1510.php
diff --git a/hphp/test/tcr/eval_order/1510.php.expect b/hphp/test/slow/eval_order/1510.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1510.php.expect
rename to hphp/test/slow/eval_order/1510.php.expect
diff --git a/hphp/test/tcr/eval_order/1511.php b/hphp/test/slow/eval_order/1511.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1511.php
rename to hphp/test/slow/eval_order/1511.php
diff --git a/hphp/test/tcr/eval_order/1511.php.expect b/hphp/test/slow/eval_order/1511.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1511.php.expect
rename to hphp/test/slow/eval_order/1511.php.expect
diff --git a/hphp/test/tcr/eval_order/1512.php b/hphp/test/slow/eval_order/1512.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1512.php
rename to hphp/test/slow/eval_order/1512.php
diff --git a/hphp/test/tcr/eval_order/1512.php.expect b/hphp/test/slow/eval_order/1512.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1512.php.expect
rename to hphp/test/slow/eval_order/1512.php.expect
diff --git a/hphp/test/tcr/eval_order/1513.php b/hphp/test/slow/eval_order/1513.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1513.php
rename to hphp/test/slow/eval_order/1513.php
diff --git a/hphp/test/tcr/eval_order/1513.php.expect b/hphp/test/slow/eval_order/1513.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1513.php.expect
rename to hphp/test/slow/eval_order/1513.php.expect
diff --git a/hphp/test/tcr/eval_order/1514.php b/hphp/test/slow/eval_order/1514.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1514.php
rename to hphp/test/slow/eval_order/1514.php
diff --git a/hphp/test/tcr/eval_order/1514.php.expect b/hphp/test/slow/eval_order/1514.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1514.php.expect
rename to hphp/test/slow/eval_order/1514.php.expect
diff --git a/hphp/test/tcr/eval_order/1515.php b/hphp/test/slow/eval_order/1515.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1515.php
rename to hphp/test/slow/eval_order/1515.php
diff --git a/hphp/test/tcr/eval_order/1515.php.expect b/hphp/test/slow/eval_order/1515.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1515.php.expect
rename to hphp/test/slow/eval_order/1515.php.expect
diff --git a/hphp/test/tcr/eval_order/1516.php b/hphp/test/slow/eval_order/1516.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1516.php
rename to hphp/test/slow/eval_order/1516.php
diff --git a/hphp/test/tcr/eval_order/1516.php.expect b/hphp/test/slow/eval_order/1516.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1516.php.expect
rename to hphp/test/slow/eval_order/1516.php.expect
diff --git a/hphp/test/tcr/eval_order/1517.php b/hphp/test/slow/eval_order/1517.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1517.php
rename to hphp/test/slow/eval_order/1517.php
diff --git a/hphp/test/tcr/eval_order/1517.php.expect b/hphp/test/slow/eval_order/1517.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1517.php.expect
rename to hphp/test/slow/eval_order/1517.php.expect
diff --git a/hphp/test/tcr/eval_order/1518.php b/hphp/test/slow/eval_order/1518.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1518.php
rename to hphp/test/slow/eval_order/1518.php
diff --git a/hphp/test/tcr/eval_order/1518.php.expect b/hphp/test/slow/eval_order/1518.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1518.php.expect
rename to hphp/test/slow/eval_order/1518.php.expect
diff --git a/hphp/test/tcr/eval_order/1519.php b/hphp/test/slow/eval_order/1519.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1519.php
rename to hphp/test/slow/eval_order/1519.php
diff --git a/hphp/test/tcr/eval_order/1519.php.expect b/hphp/test/slow/eval_order/1519.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1519.php.expect
rename to hphp/test/slow/eval_order/1519.php.expect
diff --git a/hphp/test/tcr/eval_order/1520.php b/hphp/test/slow/eval_order/1520.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1520.php
rename to hphp/test/slow/eval_order/1520.php
diff --git a/hphp/test/tcr/eval_order/1520.php.expect b/hphp/test/slow/eval_order/1520.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1520.php.expect
rename to hphp/test/slow/eval_order/1520.php.expect
diff --git a/hphp/test/tcr/eval_order/1521.php b/hphp/test/slow/eval_order/1521.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1521.php
rename to hphp/test/slow/eval_order/1521.php
diff --git a/hphp/test/tcr/eval_order/1521.php.expect b/hphp/test/slow/eval_order/1521.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1521.php.expect
rename to hphp/test/slow/eval_order/1521.php.expect
diff --git a/hphp/test/tcr/eval_order/1522.php b/hphp/test/slow/eval_order/1522.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1522.php
rename to hphp/test/slow/eval_order/1522.php
diff --git a/hphp/test/tcr/eval_order/1522.php.expect b/hphp/test/slow/eval_order/1522.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1522.php.expect
rename to hphp/test/slow/eval_order/1522.php.expect
diff --git a/hphp/test/tcr/eval_order/1523.php b/hphp/test/slow/eval_order/1523.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1523.php
rename to hphp/test/slow/eval_order/1523.php
diff --git a/hphp/test/tcr/eval_order/1523.php.expect b/hphp/test/slow/eval_order/1523.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1523.php.expect
rename to hphp/test/slow/eval_order/1523.php.expect
diff --git a/hphp/test/tcr/eval_order/1524.php b/hphp/test/slow/eval_order/1524.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1524.php
rename to hphp/test/slow/eval_order/1524.php
diff --git a/hphp/test/tcr/eval_order/1524.php.expect b/hphp/test/slow/eval_order/1524.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1524.php.expect
rename to hphp/test/slow/eval_order/1524.php.expect
diff --git a/hphp/test/tcr/eval_order/1525.php b/hphp/test/slow/eval_order/1525.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1525.php
rename to hphp/test/slow/eval_order/1525.php
diff --git a/hphp/test/tcr/eval_order/1525.php.expect b/hphp/test/slow/eval_order/1525.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1525.php.expect
rename to hphp/test/slow/eval_order/1525.php.expect
diff --git a/hphp/test/tcr/eval_order/1526.php b/hphp/test/slow/eval_order/1526.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1526.php
rename to hphp/test/slow/eval_order/1526.php
diff --git a/hphp/test/tcr/eval_order/1526.php.expect b/hphp/test/slow/eval_order/1526.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1526.php.expect
rename to hphp/test/slow/eval_order/1526.php.expect
diff --git a/hphp/test/tcr/eval_order/1527.php b/hphp/test/slow/eval_order/1527.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1527.php
rename to hphp/test/slow/eval_order/1527.php
diff --git a/hphp/test/tcr/eval_order/1527.php.expect b/hphp/test/slow/eval_order/1527.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1527.php.expect
rename to hphp/test/slow/eval_order/1527.php.expect
diff --git a/hphp/test/tcr/eval_order/1528.php b/hphp/test/slow/eval_order/1528.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1528.php
rename to hphp/test/slow/eval_order/1528.php
diff --git a/hphp/test/tcr/eval_order/1528.php.expect b/hphp/test/slow/eval_order/1528.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1528.php.expect
rename to hphp/test/slow/eval_order/1528.php.expect
diff --git a/hphp/test/tcr/eval_order/1529.php b/hphp/test/slow/eval_order/1529.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1529.php
rename to hphp/test/slow/eval_order/1529.php
diff --git a/hphp/test/tcr/eval_order/1529.php.expect b/hphp/test/slow/eval_order/1529.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1529.php.expect
rename to hphp/test/slow/eval_order/1529.php.expect
diff --git a/hphp/test/tcr/eval_order/1530.php b/hphp/test/slow/eval_order/1530.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1530.php
rename to hphp/test/slow/eval_order/1530.php
diff --git a/hphp/test/tcr/eval_order/1530.php.expect b/hphp/test/slow/eval_order/1530.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1530.php.expect
rename to hphp/test/slow/eval_order/1530.php.expect
diff --git a/hphp/test/tcr/eval_order/1531.php b/hphp/test/slow/eval_order/1531.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1531.php
rename to hphp/test/slow/eval_order/1531.php
diff --git a/hphp/test/tcr/eval_order/1531.php.expect b/hphp/test/slow/eval_order/1531.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1531.php.expect
rename to hphp/test/slow/eval_order/1531.php.expect
diff --git a/hphp/test/tcr/eval_order/1532.php b/hphp/test/slow/eval_order/1532.php
similarity index 100%
rename from hphp/test/tcr/eval_order/1532.php
rename to hphp/test/slow/eval_order/1532.php
diff --git a/hphp/test/tcr/eval_order/1532.php.expect b/hphp/test/slow/eval_order/1532.php.expect
similarity index 100%
rename from hphp/test/tcr/eval_order/1532.php.expect
rename to hphp/test/slow/eval_order/1532.php.expect
diff --git a/hphp/test/tcr/exceptions/51.php b/hphp/test/slow/exceptions/51.php
similarity index 100%
rename from hphp/test/tcr/exceptions/51.php
rename to hphp/test/slow/exceptions/51.php
diff --git a/hphp/test/tcr/exceptions/51.php.expect b/hphp/test/slow/exceptions/51.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/51.php.expect
rename to hphp/test/slow/exceptions/51.php.expect
diff --git a/hphp/test/tcr/exceptions/52.php b/hphp/test/slow/exceptions/52.php
similarity index 100%
rename from hphp/test/tcr/exceptions/52.php
rename to hphp/test/slow/exceptions/52.php
diff --git a/hphp/test/tcr/exceptions/52.php.expect b/hphp/test/slow/exceptions/52.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/52.php.expect
rename to hphp/test/slow/exceptions/52.php.expect
diff --git a/hphp/test/tcr/exceptions/53.php b/hphp/test/slow/exceptions/53.php
similarity index 100%
rename from hphp/test/tcr/exceptions/53.php
rename to hphp/test/slow/exceptions/53.php
diff --git a/hphp/test/tcr/file/1693.php.expect b/hphp/test/slow/exceptions/53.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1693.php.expect
rename to hphp/test/slow/exceptions/53.php.expect
diff --git a/hphp/test/tcr/exceptions/54.php b/hphp/test/slow/exceptions/54.php
similarity index 100%
rename from hphp/test/tcr/exceptions/54.php
rename to hphp/test/slow/exceptions/54.php
diff --git a/hphp/test/tcr/exceptions/54.php.expect b/hphp/test/slow/exceptions/54.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/54.php.expect
rename to hphp/test/slow/exceptions/54.php.expect
diff --git a/hphp/test/tcr/exceptions/55.php b/hphp/test/slow/exceptions/55.php
similarity index 100%
rename from hphp/test/tcr/exceptions/55.php
rename to hphp/test/slow/exceptions/55.php
diff --git a/hphp/test/tcr/exceptions/55.php.expect b/hphp/test/slow/exceptions/55.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/55.php.expect
rename to hphp/test/slow/exceptions/55.php.expect
diff --git a/hphp/test/tcr/exceptions/56.php b/hphp/test/slow/exceptions/56.php
similarity index 100%
rename from hphp/test/tcr/exceptions/56.php
rename to hphp/test/slow/exceptions/56.php
diff --git a/hphp/test/tcr/exceptions/56.php.expect b/hphp/test/slow/exceptions/56.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/56.php.expect
rename to hphp/test/slow/exceptions/56.php.expect
diff --git a/hphp/test/tcr/exceptions/57.php b/hphp/test/slow/exceptions/57.php
similarity index 100%
rename from hphp/test/tcr/exceptions/57.php
rename to hphp/test/slow/exceptions/57.php
diff --git a/hphp/test/tcr/exceptions/57.php.expect b/hphp/test/slow/exceptions/57.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/57.php.expect
rename to hphp/test/slow/exceptions/57.php.expect
diff --git a/hphp/test/tcr/exceptions/58.php b/hphp/test/slow/exceptions/58.php
similarity index 100%
rename from hphp/test/tcr/exceptions/58.php
rename to hphp/test/slow/exceptions/58.php
diff --git a/hphp/test/tcr/exceptions/58.php.expect b/hphp/test/slow/exceptions/58.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/58.php.expect
rename to hphp/test/slow/exceptions/58.php.expect
diff --git a/hphp/test/tcr/exceptions/59.php b/hphp/test/slow/exceptions/59.php
similarity index 100%
rename from hphp/test/tcr/exceptions/59.php
rename to hphp/test/slow/exceptions/59.php
diff --git a/hphp/test/tcr/exceptions/59.php.expect b/hphp/test/slow/exceptions/59.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/59.php.expect
rename to hphp/test/slow/exceptions/59.php.expect
diff --git a/hphp/test/tcr/exceptions/60.php b/hphp/test/slow/exceptions/60.php
similarity index 100%
rename from hphp/test/tcr/exceptions/60.php
rename to hphp/test/slow/exceptions/60.php
diff --git a/hphp/test/tcr/exceptions/60.php.expect b/hphp/test/slow/exceptions/60.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/60.php.expect
rename to hphp/test/slow/exceptions/60.php.expect
diff --git a/hphp/test/tcr/exceptions/61.php b/hphp/test/slow/exceptions/61.php
similarity index 100%
rename from hphp/test/tcr/exceptions/61.php
rename to hphp/test/slow/exceptions/61.php
diff --git a/hphp/test/tcr/exceptions/61.php.expect b/hphp/test/slow/exceptions/61.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/61.php.expect
rename to hphp/test/slow/exceptions/61.php.expect
diff --git a/hphp/test/tcr/exceptions/62.php b/hphp/test/slow/exceptions/62.php
similarity index 100%
rename from hphp/test/tcr/exceptions/62.php
rename to hphp/test/slow/exceptions/62.php
diff --git a/hphp/test/tcr/exceptions/62.php.expect b/hphp/test/slow/exceptions/62.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/62.php.expect
rename to hphp/test/slow/exceptions/62.php.expect
diff --git a/hphp/test/tcr/exceptions/63.php b/hphp/test/slow/exceptions/63.php
similarity index 100%
rename from hphp/test/tcr/exceptions/63.php
rename to hphp/test/slow/exceptions/63.php
diff --git a/hphp/test/tcr/exceptions/63.php.expect b/hphp/test/slow/exceptions/63.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/63.php.expect
rename to hphp/test/slow/exceptions/63.php.expect
diff --git a/hphp/test/tcr/exceptions/64.php b/hphp/test/slow/exceptions/64.php
similarity index 100%
rename from hphp/test/tcr/exceptions/64.php
rename to hphp/test/slow/exceptions/64.php
diff --git a/hphp/test/tcr/exceptions/64.php.expect b/hphp/test/slow/exceptions/64.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/64.php.expect
rename to hphp/test/slow/exceptions/64.php.expect
diff --git a/hphp/test/tcr/exceptions/65.php b/hphp/test/slow/exceptions/65.php
similarity index 100%
rename from hphp/test/tcr/exceptions/65.php
rename to hphp/test/slow/exceptions/65.php
diff --git a/hphp/test/tcr/exceptions/65.php.expect b/hphp/test/slow/exceptions/65.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/65.php.expect
rename to hphp/test/slow/exceptions/65.php.expect
diff --git a/hphp/test/tcr/exceptions/66.php b/hphp/test/slow/exceptions/66.php
similarity index 100%
rename from hphp/test/tcr/exceptions/66.php
rename to hphp/test/slow/exceptions/66.php
diff --git a/hphp/test/tcr/exceptions/66.php.expect b/hphp/test/slow/exceptions/66.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/66.php.expect
rename to hphp/test/slow/exceptions/66.php.expect
diff --git a/hphp/test/tcr/exceptions/67.php b/hphp/test/slow/exceptions/67.php
similarity index 100%
rename from hphp/test/tcr/exceptions/67.php
rename to hphp/test/slow/exceptions/67.php
diff --git a/hphp/test/tcr/exceptions/67.php.expect b/hphp/test/slow/exceptions/67.php.expect
similarity index 100%
rename from hphp/test/tcr/exceptions/67.php.expect
rename to hphp/test/slow/exceptions/67.php.expect
diff --git a/hphp/test/tcr/exit/1560.php b/hphp/test/slow/exit/1560.php
similarity index 100%
rename from hphp/test/tcr/exit/1560.php
rename to hphp/test/slow/exit/1560.php
diff --git a/hphp/test/tcr/exit/1560.php.expect b/hphp/test/slow/exit/1560.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1560.php.expect
rename to hphp/test/slow/exit/1560.php.expect
diff --git a/hphp/test/tcr/exit/1561.php b/hphp/test/slow/exit/1561.php
similarity index 100%
rename from hphp/test/tcr/exit/1561.php
rename to hphp/test/slow/exit/1561.php
diff --git a/hphp/test/tcr/exit/1561.php.expect b/hphp/test/slow/exit/1561.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1561.php.expect
rename to hphp/test/slow/exit/1561.php.expect
diff --git a/hphp/test/tcr/exit/1562.php b/hphp/test/slow/exit/1562.php
similarity index 100%
rename from hphp/test/tcr/exit/1562.php
rename to hphp/test/slow/exit/1562.php
diff --git a/hphp/test/tcr/exit/1562.php.expect b/hphp/test/slow/exit/1562.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1562.php.expect
rename to hphp/test/slow/exit/1562.php.expect
diff --git a/hphp/test/tcr/exit/1563.php b/hphp/test/slow/exit/1563.php
similarity index 100%
rename from hphp/test/tcr/exit/1563.php
rename to hphp/test/slow/exit/1563.php
diff --git a/hphp/test/tcr/exit/1563.php.expect b/hphp/test/slow/exit/1563.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1563.php.expect
rename to hphp/test/slow/exit/1563.php.expect
diff --git a/hphp/test/tcr/exit/1564.php b/hphp/test/slow/exit/1564.php
similarity index 100%
rename from hphp/test/tcr/exit/1564.php
rename to hphp/test/slow/exit/1564.php
diff --git a/hphp/test/tcr/exit/1564.php.expect b/hphp/test/slow/exit/1564.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1564.php.expect
rename to hphp/test/slow/exit/1564.php.expect
diff --git a/hphp/test/tcr/exit/1565.php b/hphp/test/slow/exit/1565.php
similarity index 100%
rename from hphp/test/tcr/exit/1565.php
rename to hphp/test/slow/exit/1565.php
diff --git a/hphp/test/tcr/exit/1565.php.expect b/hphp/test/slow/exit/1565.php.expect
similarity index 100%
rename from hphp/test/tcr/exit/1565.php.expect
rename to hphp/test/slow/exit/1565.php.expect
diff --git a/hphp/test/tcr/ext_array/1766.php b/hphp/test/slow/ext_array/1766.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1766.php
rename to hphp/test/slow/ext_array/1766.php
diff --git a/hphp/test/tcr/ext_array/1766.php.expect b/hphp/test/slow/ext_array/1766.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1766.php.expect
rename to hphp/test/slow/ext_array/1766.php.expect
diff --git a/hphp/test/tcr/ext_array/1767.php b/hphp/test/slow/ext_array/1767.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1767.php
rename to hphp/test/slow/ext_array/1767.php
diff --git a/hphp/test/tcr/ext_array/1767.php.expect b/hphp/test/slow/ext_array/1767.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1767.php.expect
rename to hphp/test/slow/ext_array/1767.php.expect
diff --git a/hphp/test/tcr/ext_array/1768.php b/hphp/test/slow/ext_array/1768.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1768.php
rename to hphp/test/slow/ext_array/1768.php
diff --git a/hphp/test/tcr/ext_array/1768.php.expect b/hphp/test/slow/ext_array/1768.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1768.php.expect
rename to hphp/test/slow/ext_array/1768.php.expect
diff --git a/hphp/test/tcr/ext_array/1769.php b/hphp/test/slow/ext_array/1769.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1769.php
rename to hphp/test/slow/ext_array/1769.php
diff --git a/hphp/test/tcr/ext_array/1769.php.expect b/hphp/test/slow/ext_array/1769.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1769.php.expect
rename to hphp/test/slow/ext_array/1769.php.expect
diff --git a/hphp/test/tcr/ext_array/1770.php b/hphp/test/slow/ext_array/1770.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1770.php
rename to hphp/test/slow/ext_array/1770.php
diff --git a/hphp/test/tcr/ext_array/1770.php.expect b/hphp/test/slow/ext_array/1770.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1770.php.expect
rename to hphp/test/slow/ext_array/1770.php.expect
diff --git a/hphp/test/tcr/ext_array/1771.php b/hphp/test/slow/ext_array/1771.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1771.php
rename to hphp/test/slow/ext_array/1771.php
diff --git a/hphp/test/tcr/ext_array/1771.php.expect b/hphp/test/slow/ext_array/1771.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1771.php.expect
rename to hphp/test/slow/ext_array/1771.php.expect
diff --git a/hphp/test/tcr/ext_array/1772.php b/hphp/test/slow/ext_array/1772.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1772.php
rename to hphp/test/slow/ext_array/1772.php
diff --git a/hphp/test/tcr/ext_array/1772.php.expect b/hphp/test/slow/ext_array/1772.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1772.php.expect
rename to hphp/test/slow/ext_array/1772.php.expect
diff --git a/hphp/test/tcr/ext_array/1773.php b/hphp/test/slow/ext_array/1773.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1773.php
rename to hphp/test/slow/ext_array/1773.php
diff --git a/hphp/test/tcr/ext_array/1773.php.expect b/hphp/test/slow/ext_array/1773.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1773.php.expect
rename to hphp/test/slow/ext_array/1773.php.expect
diff --git a/hphp/test/tcr/ext_array/1774.php b/hphp/test/slow/ext_array/1774.php
similarity index 100%
rename from hphp/test/tcr/ext_array/1774.php
rename to hphp/test/slow/ext_array/1774.php
diff --git a/hphp/test/tcr/ext_array/1774.php.expect b/hphp/test/slow/ext_array/1774.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_array/1774.php.expect
rename to hphp/test/slow/ext_array/1774.php.expect
diff --git a/hphp/test/tcr/ext_collator/1810.php b/hphp/test/slow/ext_collator/1810.php
similarity index 100%
rename from hphp/test/tcr/ext_collator/1810.php
rename to hphp/test/slow/ext_collator/1810.php
diff --git a/hphp/test/tcr/ext_collator/1810.php.expect b/hphp/test/slow/ext_collator/1810.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_collator/1810.php.expect
rename to hphp/test/slow/ext_collator/1810.php.expect
diff --git a/hphp/test/tcr/ext_date/1776.php b/hphp/test/slow/ext_date/1776.php
similarity index 100%
rename from hphp/test/tcr/ext_date/1776.php
rename to hphp/test/slow/ext_date/1776.php
diff --git a/hphp/test/tcr/ext_date/1776.php.expect b/hphp/test/slow/ext_date/1776.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_date/1776.php.expect
rename to hphp/test/slow/ext_date/1776.php.expect
diff --git a/hphp/test/tcr/ext_file/1775.php b/hphp/test/slow/ext_file/1775.php
similarity index 100%
rename from hphp/test/tcr/ext_file/1775.php
rename to hphp/test/slow/ext_file/1775.php
diff --git a/hphp/test/tcr/ext_file/1775.php.expect b/hphp/test/slow/ext_file/1775.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_file/1775.php.expect
rename to hphp/test/slow/ext_file/1775.php.expect
diff --git a/hphp/test/tcr/ext_image/1777.php b/hphp/test/slow/ext_image/1777.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1777.php
rename to hphp/test/slow/ext_image/1777.php
diff --git a/hphp/test/tcr/ext_image/1777.php.expect b/hphp/test/slow/ext_image/1777.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1777.php.expect
rename to hphp/test/slow/ext_image/1777.php.expect
diff --git a/hphp/test/tcr/ext_image/1778.php b/hphp/test/slow/ext_image/1778.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1778.php
rename to hphp/test/slow/ext_image/1778.php
diff --git a/hphp/test/tcr/ext_image/1778.php.expect b/hphp/test/slow/ext_image/1778.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1778.php.expect
rename to hphp/test/slow/ext_image/1778.php.expect
diff --git a/hphp/test/tcr/ext_image/1779.php b/hphp/test/slow/ext_image/1779.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1779.php
rename to hphp/test/slow/ext_image/1779.php
diff --git a/hphp/test/tcr/hphp_config.hdf b/hphp/test/slow/ext_image/1779.php.expect
similarity index 100%
rename from hphp/test/tcr/hphp_config.hdf
rename to hphp/test/slow/ext_image/1779.php.expect
diff --git a/hphp/test/tcr/ext_image/1780.php b/hphp/test/slow/ext_image/1780.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1780.php
rename to hphp/test/slow/ext_image/1780.php
diff --git a/hphp/test/tcr/ext_image/1780.php.expect b/hphp/test/slow/ext_image/1780.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1780.php.expect
rename to hphp/test/slow/ext_image/1780.php.expect
diff --git a/hphp/test/tcr/ext_image/1781.php b/hphp/test/slow/ext_image/1781.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1781.php
rename to hphp/test/slow/ext_image/1781.php
diff --git a/hphp/test/tcr/if_statement/1412.php.expect b/hphp/test/slow/ext_image/1781.php.expect
similarity index 100%
rename from hphp/test/tcr/if_statement/1412.php.expect
rename to hphp/test/slow/ext_image/1781.php.expect
diff --git a/hphp/test/tcr/ext_image/1782.php b/hphp/test/slow/ext_image/1782.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1782.php
rename to hphp/test/slow/ext_image/1782.php
diff --git a/hphp/test/tcr/if_statement/1413.php.expect b/hphp/test/slow/ext_image/1782.php.expect
similarity index 100%
rename from hphp/test/tcr/if_statement/1413.php.expect
rename to hphp/test/slow/ext_image/1782.php.expect
diff --git a/hphp/test/tcr/ext_image/1783.php b/hphp/test/slow/ext_image/1783.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1783.php
rename to hphp/test/slow/ext_image/1783.php
diff --git a/hphp/test/tcr/inlining/1831.php.expect b/hphp/test/slow/ext_image/1783.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1831.php.expect
rename to hphp/test/slow/ext_image/1783.php.expect
diff --git a/hphp/test/tcr/ext_image/1784.php b/hphp/test/slow/ext_image/1784.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1784.php
rename to hphp/test/slow/ext_image/1784.php
diff --git a/hphp/test/tcr/inlining/1836.php.expect b/hphp/test/slow/ext_image/1784.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1836.php.expect
rename to hphp/test/slow/ext_image/1784.php.expect
diff --git a/hphp/test/tcr/ext_image/1785.php b/hphp/test/slow/ext_image/1785.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1785.php
rename to hphp/test/slow/ext_image/1785.php
diff --git a/hphp/test/tcr/inlining/1837.php.expect b/hphp/test/slow/ext_image/1785.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1837.php.expect
rename to hphp/test/slow/ext_image/1785.php.expect
diff --git a/hphp/test/tcr/ext_image/1786.php b/hphp/test/slow/ext_image/1786.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1786.php
rename to hphp/test/slow/ext_image/1786.php
diff --git a/hphp/test/tcr/inlining/1838.php.expect b/hphp/test/slow/ext_image/1786.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1838.php.expect
rename to hphp/test/slow/ext_image/1786.php.expect
diff --git a/hphp/test/tcr/ext_image/1787.php b/hphp/test/slow/ext_image/1787.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1787.php
rename to hphp/test/slow/ext_image/1787.php
diff --git a/hphp/test/tcr/int_isset/1724.php.expect b/hphp/test/slow/ext_image/1787.php.expect
similarity index 100%
rename from hphp/test/tcr/int_isset/1724.php.expect
rename to hphp/test/slow/ext_image/1787.php.expect
diff --git a/hphp/test/tcr/ext_image/1788.php b/hphp/test/slow/ext_image/1788.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1788.php
rename to hphp/test/slow/ext_image/1788.php
diff --git a/hphp/test/tcr/invalid_argument/1382.php.expect b/hphp/test/slow/ext_image/1788.php.expect
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1382.php.expect
rename to hphp/test/slow/ext_image/1788.php.expect
diff --git a/hphp/test/tcr/ext_image/1789.php b/hphp/test/slow/ext_image/1789.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1789.php
rename to hphp/test/slow/ext_image/1789.php
diff --git a/hphp/test/tcr/list_assignment/33.php.expect b/hphp/test/slow/ext_image/1789.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/33.php.expect
rename to hphp/test/slow/ext_image/1789.php.expect
diff --git a/hphp/test/tcr/ext_image/1790.php b/hphp/test/slow/ext_image/1790.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1790.php
rename to hphp/test/slow/ext_image/1790.php
diff --git a/hphp/test/tcr/list_assignment/34.php.expect b/hphp/test/slow/ext_image/1790.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/34.php.expect
rename to hphp/test/slow/ext_image/1790.php.expect
diff --git a/hphp/test/tcr/ext_image/1791.php b/hphp/test/slow/ext_image/1791.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1791.php
rename to hphp/test/slow/ext_image/1791.php
diff --git a/hphp/test/tcr/ext_image/1791.php.expect b/hphp/test/slow/ext_image/1791.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1791.php.expect
rename to hphp/test/slow/ext_image/1791.php.expect
diff --git a/hphp/test/tcr/ext_image/1792.php b/hphp/test/slow/ext_image/1792.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1792.php
rename to hphp/test/slow/ext_image/1792.php
diff --git a/hphp/test/tcr/ext_image/1792.php.expect b/hphp/test/slow/ext_image/1792.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1792.php.expect
rename to hphp/test/slow/ext_image/1792.php.expect
diff --git a/hphp/test/tcr/ext_image/1793.php b/hphp/test/slow/ext_image/1793.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1793.php
rename to hphp/test/slow/ext_image/1793.php
diff --git a/hphp/test/tcr/ext_image/1793.php.expect b/hphp/test/slow/ext_image/1793.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1793.php.expect
rename to hphp/test/slow/ext_image/1793.php.expect
diff --git a/hphp/test/tcr/ext_image/1794.php b/hphp/test/slow/ext_image/1794.php
similarity index 100%
rename from hphp/test/tcr/ext_image/1794.php
rename to hphp/test/slow/ext_image/1794.php
diff --git a/hphp/test/tcr/ext_image/1794.php.expect b/hphp/test/slow/ext_image/1794.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_image/1794.php.expect
rename to hphp/test/slow/ext_image/1794.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1798.php b/hphp/test/slow/ext_iterator/1798.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1798.php
rename to hphp/test/slow/ext_iterator/1798.php
diff --git a/hphp/test/tcr/ext_iterator/1798.php.expect b/hphp/test/slow/ext_iterator/1798.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1798.php.expect
rename to hphp/test/slow/ext_iterator/1798.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1799.php b/hphp/test/slow/ext_iterator/1799.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1799.php
rename to hphp/test/slow/ext_iterator/1799.php
diff --git a/hphp/test/tcr/ext_iterator/1799.php.expect b/hphp/test/slow/ext_iterator/1799.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1799.php.expect
rename to hphp/test/slow/ext_iterator/1799.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1800.php b/hphp/test/slow/ext_iterator/1800.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1800.php
rename to hphp/test/slow/ext_iterator/1800.php
diff --git a/hphp/test/tcr/ext_iterator/1800.php.expect b/hphp/test/slow/ext_iterator/1800.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1800.php.expect
rename to hphp/test/slow/ext_iterator/1800.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1801.php b/hphp/test/slow/ext_iterator/1801.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1801.php
rename to hphp/test/slow/ext_iterator/1801.php
diff --git a/hphp/test/tcr/ext_iterator/1801.php.expect b/hphp/test/slow/ext_iterator/1801.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1801.php.expect
rename to hphp/test/slow/ext_iterator/1801.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1802.php b/hphp/test/slow/ext_iterator/1802.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1802.php
rename to hphp/test/slow/ext_iterator/1802.php
diff --git a/hphp/test/tcr/ext_iterator/1802.php.expect b/hphp/test/slow/ext_iterator/1802.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1802.php.expect
rename to hphp/test/slow/ext_iterator/1802.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1803.php b/hphp/test/slow/ext_iterator/1803.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1803.php
rename to hphp/test/slow/ext_iterator/1803.php
diff --git a/hphp/test/tcr/ext_iterator/1803.php.expect b/hphp/test/slow/ext_iterator/1803.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1803.php.expect
rename to hphp/test/slow/ext_iterator/1803.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1804.php b/hphp/test/slow/ext_iterator/1804.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1804.php
rename to hphp/test/slow/ext_iterator/1804.php
diff --git a/hphp/test/tcr/ext_iterator/1804.php.expect b/hphp/test/slow/ext_iterator/1804.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1804.php.expect
rename to hphp/test/slow/ext_iterator/1804.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1805.php b/hphp/test/slow/ext_iterator/1805.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1805.php
rename to hphp/test/slow/ext_iterator/1805.php
diff --git a/hphp/test/tcr/ext_iterator/1805.php.expect b/hphp/test/slow/ext_iterator/1805.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1805.php.expect
rename to hphp/test/slow/ext_iterator/1805.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1806.php b/hphp/test/slow/ext_iterator/1806.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1806.php
rename to hphp/test/slow/ext_iterator/1806.php
diff --git a/hphp/test/tcr/ext_iterator/1806.php.expect b/hphp/test/slow/ext_iterator/1806.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1806.php.expect
rename to hphp/test/slow/ext_iterator/1806.php.expect
diff --git a/hphp/test/tcr/ext_iterator/1807.php b/hphp/test/slow/ext_iterator/1807.php
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1807.php
rename to hphp/test/slow/ext_iterator/1807.php
diff --git a/hphp/test/tcr/ext_iterator/1807.php.expect b/hphp/test/slow/ext_iterator/1807.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_iterator/1807.php.expect
rename to hphp/test/slow/ext_iterator/1807.php.expect
diff --git a/hphp/test/tcr/ext_misc/1373.php b/hphp/test/slow/ext_misc/1373.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1373.php
rename to hphp/test/slow/ext_misc/1373.php
diff --git a/hphp/test/tcr/ext_misc/1373.php.expect b/hphp/test/slow/ext_misc/1373.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1373.php.expect
rename to hphp/test/slow/ext_misc/1373.php.expect
diff --git a/hphp/test/tcr/ext_misc/1373.php.hphp_opts b/hphp/test/slow/ext_misc/1373.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1373.php.hphp_opts
rename to hphp/test/slow/ext_misc/1373.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1373.php.opts b/hphp/test/slow/ext_misc/1373.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1373.php.opts
rename to hphp/test/slow/ext_misc/1373.php.opts
diff --git a/hphp/test/tcr/ext_misc/1374.php b/hphp/test/slow/ext_misc/1374.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1374.php
rename to hphp/test/slow/ext_misc/1374.php
diff --git a/hphp/test/tcr/ext_misc/1374.php.expect b/hphp/test/slow/ext_misc/1374.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1374.php.expect
rename to hphp/test/slow/ext_misc/1374.php.expect
diff --git a/hphp/test/tcr/ext_misc/1374.php.hphp_opts b/hphp/test/slow/ext_misc/1374.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1374.php.hphp_opts
rename to hphp/test/slow/ext_misc/1374.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1374.php.opts b/hphp/test/slow/ext_misc/1374.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1374.php.opts
rename to hphp/test/slow/ext_misc/1374.php.opts
diff --git a/hphp/test/tcr/ext_misc/1375.php b/hphp/test/slow/ext_misc/1375.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1375.php
rename to hphp/test/slow/ext_misc/1375.php
diff --git a/hphp/test/tcr/ext_misc/1375.php.expect b/hphp/test/slow/ext_misc/1375.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1375.php.expect
rename to hphp/test/slow/ext_misc/1375.php.expect
diff --git a/hphp/test/tcr/ext_misc/1375.php.hphp_opts b/hphp/test/slow/ext_misc/1375.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1375.php.hphp_opts
rename to hphp/test/slow/ext_misc/1375.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1375.php.opts b/hphp/test/slow/ext_misc/1375.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1375.php.opts
rename to hphp/test/slow/ext_misc/1375.php.opts
diff --git a/hphp/test/tcr/ext_misc/1376.php b/hphp/test/slow/ext_misc/1376.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1376.php
rename to hphp/test/slow/ext_misc/1376.php
diff --git a/hphp/test/tcr/ext_misc/1376.php.expect b/hphp/test/slow/ext_misc/1376.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1376.php.expect
rename to hphp/test/slow/ext_misc/1376.php.expect
diff --git a/hphp/test/tcr/ext_misc/1376.php.hphp_opts b/hphp/test/slow/ext_misc/1376.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1376.php.hphp_opts
rename to hphp/test/slow/ext_misc/1376.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1376.php.opts b/hphp/test/slow/ext_misc/1376.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1376.php.opts
rename to hphp/test/slow/ext_misc/1376.php.opts
diff --git a/hphp/test/tcr/ext_misc/1377.php b/hphp/test/slow/ext_misc/1377.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1377.php
rename to hphp/test/slow/ext_misc/1377.php
diff --git a/hphp/test/tcr/ext_misc/1377.php.expect b/hphp/test/slow/ext_misc/1377.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1377.php.expect
rename to hphp/test/slow/ext_misc/1377.php.expect
diff --git a/hphp/test/tcr/ext_misc/1377.php.hphp_opts b/hphp/test/slow/ext_misc/1377.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1377.php.hphp_opts
rename to hphp/test/slow/ext_misc/1377.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1377.php.opts b/hphp/test/slow/ext_misc/1377.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1377.php.opts
rename to hphp/test/slow/ext_misc/1377.php.opts
diff --git a/hphp/test/tcr/ext_misc/1378.php b/hphp/test/slow/ext_misc/1378.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1378.php
rename to hphp/test/slow/ext_misc/1378.php
diff --git a/hphp/test/tcr/ext_misc/1378.php.expect b/hphp/test/slow/ext_misc/1378.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1378.php.expect
rename to hphp/test/slow/ext_misc/1378.php.expect
diff --git a/hphp/test/tcr/ext_misc/1378.php.hphp_opts b/hphp/test/slow/ext_misc/1378.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1378.php.hphp_opts
rename to hphp/test/slow/ext_misc/1378.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1378.php.opts b/hphp/test/slow/ext_misc/1378.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1378.php.opts
rename to hphp/test/slow/ext_misc/1378.php.opts
diff --git a/hphp/test/tcr/ext_misc/1379.php b/hphp/test/slow/ext_misc/1379.php
similarity index 100%
rename from hphp/test/tcr/ext_misc/1379.php
rename to hphp/test/slow/ext_misc/1379.php
diff --git a/hphp/test/tcr/ext_misc/1379.php.expect b/hphp/test/slow/ext_misc/1379.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_misc/1379.php.expect
rename to hphp/test/slow/ext_misc/1379.php.expect
diff --git a/hphp/test/tcr/ext_misc/1379.php.hphp_opts b/hphp/test/slow/ext_misc/1379.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1379.php.hphp_opts
rename to hphp/test/slow/ext_misc/1379.php.hphp_opts
diff --git a/hphp/test/tcr/ext_misc/1379.php.opts b/hphp/test/slow/ext_misc/1379.php.opts
similarity index 100%
rename from hphp/test/tcr/ext_misc/1379.php.opts
rename to hphp/test/slow/ext_misc/1379.php.opts
diff --git a/hphp/test/tcr/ext_soap/1808.php b/hphp/test/slow/ext_soap/1808.php
similarity index 100%
rename from hphp/test/tcr/ext_soap/1808.php
rename to hphp/test/slow/ext_soap/1808.php
diff --git a/hphp/test/tcr/ext_soap/1808.php.expect b/hphp/test/slow/ext_soap/1808.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_soap/1808.php.expect
rename to hphp/test/slow/ext_soap/1808.php.expect
diff --git a/hphp/test/tcr/ext_soap/1809.php b/hphp/test/slow/ext_soap/1809.php
similarity index 100%
rename from hphp/test/tcr/ext_soap/1809.php
rename to hphp/test/slow/ext_soap/1809.php
diff --git a/hphp/test/tcr/ext_soap/1809.php.expect b/hphp/test/slow/ext_soap/1809.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_soap/1809.php.expect
rename to hphp/test/slow/ext_soap/1809.php.expect
diff --git a/hphp/test/tcr/ext_socket/1811.php b/hphp/test/slow/ext_socket/1811.php
similarity index 100%
rename from hphp/test/tcr/ext_socket/1811.php
rename to hphp/test/slow/ext_socket/1811.php
diff --git a/hphp/test/tcr/ext_socket/1811.php.expect b/hphp/test/slow/ext_socket/1811.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_socket/1811.php.expect
rename to hphp/test/slow/ext_socket/1811.php.expect
diff --git a/hphp/test/tcr/ext_spl_file/1795.php b/hphp/test/slow/ext_spl_file/1795.php
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1795.php
rename to hphp/test/slow/ext_spl_file/1795.php
diff --git a/hphp/test/tcr/ext_spl_file/1795.php.expect b/hphp/test/slow/ext_spl_file/1795.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1795.php.expect
rename to hphp/test/slow/ext_spl_file/1795.php.expect
diff --git a/hphp/test/tcr/ext_spl_file/1796.php b/hphp/test/slow/ext_spl_file/1796.php
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1796.php
rename to hphp/test/slow/ext_spl_file/1796.php
diff --git a/hphp/test/tcr/ext_spl_file/1796.php.expect b/hphp/test/slow/ext_spl_file/1796.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1796.php.expect
rename to hphp/test/slow/ext_spl_file/1796.php.expect
diff --git a/hphp/test/tcr/ext_spl_file/1797.php b/hphp/test/slow/ext_spl_file/1797.php
similarity index 100%
rename from hphp/test/tcr/ext_spl_file/1797.php
rename to hphp/test/slow/ext_spl_file/1797.php
diff --git a/hphp/test/tcr/list_assignment/48.php.expect b/hphp/test/slow/ext_spl_file/1797.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/48.php.expect
rename to hphp/test/slow/ext_spl_file/1797.php.expect
diff --git a/hphp/test/tcr/ext_string/1761.php b/hphp/test/slow/ext_string/1761.php
similarity index 100%
rename from hphp/test/tcr/ext_string/1761.php
rename to hphp/test/slow/ext_string/1761.php
diff --git a/hphp/test/tcr/ext_string/1761.php.expect b/hphp/test/slow/ext_string/1761.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_string/1761.php.expect
rename to hphp/test/slow/ext_string/1761.php.expect
diff --git a/hphp/test/tcr/ext_string/1762.php b/hphp/test/slow/ext_string/1762.php
similarity index 100%
rename from hphp/test/tcr/ext_string/1762.php
rename to hphp/test/slow/ext_string/1762.php
diff --git a/hphp/test/tcr/ext_string/1762.php.expect b/hphp/test/slow/ext_string/1762.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_string/1762.php.expect
rename to hphp/test/slow/ext_string/1762.php.expect
diff --git a/hphp/test/tcr/ext_string/1763.php b/hphp/test/slow/ext_string/1763.php
similarity index 100%
rename from hphp/test/tcr/ext_string/1763.php
rename to hphp/test/slow/ext_string/1763.php
diff --git a/hphp/test/tcr/ext_string/1763.php.expect b/hphp/test/slow/ext_string/1763.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_string/1763.php.expect
rename to hphp/test/slow/ext_string/1763.php.expect
diff --git a/hphp/test/tcr/ext_string/1764.php b/hphp/test/slow/ext_string/1764.php
similarity index 100%
rename from hphp/test/tcr/ext_string/1764.php
rename to hphp/test/slow/ext_string/1764.php
diff --git a/hphp/test/tcr/ext_string/1764.php.expect b/hphp/test/slow/ext_string/1764.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_string/1764.php.expect
rename to hphp/test/slow/ext_string/1764.php.expect
diff --git a/hphp/test/tcr/ext_string/1765.php b/hphp/test/slow/ext_string/1765.php
similarity index 100%
rename from hphp/test/tcr/ext_string/1765.php
rename to hphp/test/slow/ext_string/1765.php
diff --git a/hphp/test/tcr/ext_string/1765.php.expect b/hphp/test/slow/ext_string/1765.php.expect
similarity index 100%
rename from hphp/test/tcr/ext_string/1765.php.expect
rename to hphp/test/slow/ext_string/1765.php.expect
diff --git a/hphp/test/tcr/file/1682.php b/hphp/test/slow/file/1682.php
similarity index 100%
rename from hphp/test/tcr/file/1682.php
rename to hphp/test/slow/file/1682.php
diff --git a/hphp/test/tcr/file/1682.php.expect b/hphp/test/slow/file/1682.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1682.php.expect
rename to hphp/test/slow/file/1682.php.expect
diff --git a/hphp/test/tcr/file/1683.php b/hphp/test/slow/file/1683.php
similarity index 100%
rename from hphp/test/tcr/file/1683.php
rename to hphp/test/slow/file/1683.php
diff --git a/hphp/test/tcr/file/1683.php.expect b/hphp/test/slow/file/1683.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1683.php.expect
rename to hphp/test/slow/file/1683.php.expect
diff --git a/hphp/test/tcr/file/1684.php b/hphp/test/slow/file/1684.php
similarity index 100%
rename from hphp/test/tcr/file/1684.php
rename to hphp/test/slow/file/1684.php
diff --git a/hphp/test/tcr/file/1684.php.expect b/hphp/test/slow/file/1684.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1684.php.expect
rename to hphp/test/slow/file/1684.php.expect
diff --git a/hphp/test/tcr/file/1685.php b/hphp/test/slow/file/1685.php
similarity index 100%
rename from hphp/test/tcr/file/1685.php
rename to hphp/test/slow/file/1685.php
diff --git a/hphp/test/tcr/file/1685.php.expect b/hphp/test/slow/file/1685.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1685.php.expect
rename to hphp/test/slow/file/1685.php.expect
diff --git a/hphp/test/tcr/file/1686.php b/hphp/test/slow/file/1686.php
similarity index 100%
rename from hphp/test/tcr/file/1686.php
rename to hphp/test/slow/file/1686.php
diff --git a/hphp/test/tcr/file/1686.php.expect b/hphp/test/slow/file/1686.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1686.php.expect
rename to hphp/test/slow/file/1686.php.expect
diff --git a/hphp/test/tcr/file/1687.php b/hphp/test/slow/file/1687.php
similarity index 100%
rename from hphp/test/tcr/file/1687.php
rename to hphp/test/slow/file/1687.php
diff --git a/hphp/test/tcr/file/1687.php.expect b/hphp/test/slow/file/1687.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1687.php.expect
rename to hphp/test/slow/file/1687.php.expect
diff --git a/hphp/test/tcr/file/1688.php b/hphp/test/slow/file/1688.php
similarity index 100%
rename from hphp/test/tcr/file/1688.php
rename to hphp/test/slow/file/1688.php
diff --git a/hphp/test/tcr/file/1688.php.expect b/hphp/test/slow/file/1688.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1688.php.expect
rename to hphp/test/slow/file/1688.php.expect
diff --git a/hphp/test/tcr/file/1689.php b/hphp/test/slow/file/1689.php
similarity index 100%
rename from hphp/test/tcr/file/1689.php
rename to hphp/test/slow/file/1689.php
diff --git a/hphp/test/tcr/file/1689.php.expect b/hphp/test/slow/file/1689.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1689.php.expect
rename to hphp/test/slow/file/1689.php.expect
diff --git a/hphp/test/tcr/file/1690.php b/hphp/test/slow/file/1690.php
similarity index 100%
rename from hphp/test/tcr/file/1690.php
rename to hphp/test/slow/file/1690.php
diff --git a/hphp/test/tcr/file/1690.php.expect b/hphp/test/slow/file/1690.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1690.php.expect
rename to hphp/test/slow/file/1690.php.expect
diff --git a/hphp/test/tcr/file/1691.php b/hphp/test/slow/file/1691.php
similarity index 100%
rename from hphp/test/tcr/file/1691.php
rename to hphp/test/slow/file/1691.php
diff --git a/hphp/test/tcr/file/1691.php.expect b/hphp/test/slow/file/1691.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1691.php.expect
rename to hphp/test/slow/file/1691.php.expect
diff --git a/hphp/test/tcr/file/1692.php b/hphp/test/slow/file/1692.php
similarity index 100%
rename from hphp/test/tcr/file/1692.php
rename to hphp/test/slow/file/1692.php
diff --git a/hphp/test/tcr/file/1692.php.expect b/hphp/test/slow/file/1692.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1692.php.expect
rename to hphp/test/slow/file/1692.php.expect
diff --git a/hphp/test/tcr/file/1693.php b/hphp/test/slow/file/1693.php
similarity index 100%
rename from hphp/test/tcr/file/1693.php
rename to hphp/test/slow/file/1693.php
diff --git a/hphp/test/tcr/new_object_expression/778.php.expect b/hphp/test/slow/file/1693.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/778.php.expect
rename to hphp/test/slow/file/1693.php.expect
diff --git a/hphp/test/tcr/file/1694.php b/hphp/test/slow/file/1694.php
similarity index 100%
rename from hphp/test/tcr/file/1694.php
rename to hphp/test/slow/file/1694.php
diff --git a/hphp/test/tcr/file/1694.php.expect b/hphp/test/slow/file/1694.php.expect
similarity index 100%
rename from hphp/test/tcr/file/1694.php.expect
rename to hphp/test/slow/file/1694.php.expect
diff --git a/hphp/test/tcr/get_class/1455.php b/hphp/test/slow/get_class/1455.php
similarity index 100%
rename from hphp/test/tcr/get_class/1455.php
rename to hphp/test/slow/get_class/1455.php
diff --git a/hphp/test/tcr/get_class/1455.php.expect b/hphp/test/slow/get_class/1455.php.expect
similarity index 100%
rename from hphp/test/tcr/get_class/1455.php.expect
rename to hphp/test/slow/get_class/1455.php.expect
diff --git a/hphp/test/tcr/get_class/1456.php b/hphp/test/slow/get_class/1456.php
similarity index 100%
rename from hphp/test/tcr/get_class/1456.php
rename to hphp/test/slow/get_class/1456.php
diff --git a/hphp/test/tcr/get_class/1456.php.expect b/hphp/test/slow/get_class/1456.php.expect
similarity index 100%
rename from hphp/test/tcr/get_class/1456.php.expect
rename to hphp/test/slow/get_class/1456.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1533.php b/hphp/test/slow/get_object_vars/1533.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1533.php
rename to hphp/test/slow/get_object_vars/1533.php
diff --git a/hphp/test/tcr/get_object_vars/1533.php.expect b/hphp/test/slow/get_object_vars/1533.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1533.php.expect
rename to hphp/test/slow/get_object_vars/1533.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1534.php b/hphp/test/slow/get_object_vars/1534.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1534.php
rename to hphp/test/slow/get_object_vars/1534.php
diff --git a/hphp/test/tcr/get_object_vars/1534.php.expect b/hphp/test/slow/get_object_vars/1534.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1534.php.expect
rename to hphp/test/slow/get_object_vars/1534.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1535.php b/hphp/test/slow/get_object_vars/1535.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1535.php
rename to hphp/test/slow/get_object_vars/1535.php
diff --git a/hphp/test/tcr/get_object_vars/1535.php.expect b/hphp/test/slow/get_object_vars/1535.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1535.php.expect
rename to hphp/test/slow/get_object_vars/1535.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1536.php b/hphp/test/slow/get_object_vars/1536.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1536.php
rename to hphp/test/slow/get_object_vars/1536.php
diff --git a/hphp/test/tcr/get_object_vars/1536.php.expect b/hphp/test/slow/get_object_vars/1536.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1536.php.expect
rename to hphp/test/slow/get_object_vars/1536.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1537.php b/hphp/test/slow/get_object_vars/1537.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1537.php
rename to hphp/test/slow/get_object_vars/1537.php
diff --git a/hphp/test/tcr/get_object_vars/1537.php.expect b/hphp/test/slow/get_object_vars/1537.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1537.php.expect
rename to hphp/test/slow/get_object_vars/1537.php.expect
diff --git a/hphp/test/tcr/get_object_vars/1538.php b/hphp/test/slow/get_object_vars/1538.php
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1538.php
rename to hphp/test/slow/get_object_vars/1538.php
diff --git a/hphp/test/tcr/get_object_vars/1538.php.expect b/hphp/test/slow/get_object_vars/1538.php.expect
similarity index 100%
rename from hphp/test/tcr/get_object_vars/1538.php.expect
rename to hphp/test/slow/get_object_vars/1538.php.expect
diff --git a/hphp/test/tcr/get_parent_class/1457.php b/hphp/test/slow/get_parent_class/1457.php
similarity index 100%
rename from hphp/test/tcr/get_parent_class/1457.php
rename to hphp/test/slow/get_parent_class/1457.php
diff --git a/hphp/test/tcr/get_parent_class/1457.php.expect b/hphp/test/slow/get_parent_class/1457.php.expect
similarity index 100%
rename from hphp/test/tcr/get_parent_class/1457.php.expect
rename to hphp/test/slow/get_parent_class/1457.php.expect
diff --git a/hphp/test/tcr/get_parent_class/1458.php b/hphp/test/slow/get_parent_class/1458.php
similarity index 100%
rename from hphp/test/tcr/get_parent_class/1458.php
rename to hphp/test/slow/get_parent_class/1458.php
diff --git a/hphp/test/tcr/get_parent_class/1458.php.expect b/hphp/test/slow/get_parent_class/1458.php.expect
similarity index 100%
rename from hphp/test/tcr/get_parent_class/1458.php.expect
rename to hphp/test/slow/get_parent_class/1458.php.expect
diff --git a/hphp/test/tcr/global_statement/1388.php b/hphp/test/slow/global_statement/1388.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1388.php
rename to hphp/test/slow/global_statement/1388.php
diff --git a/hphp/test/tcr/global_statement/1388.php.expect b/hphp/test/slow/global_statement/1388.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1388.php.expect
rename to hphp/test/slow/global_statement/1388.php.expect
diff --git a/hphp/test/tcr/global_statement/1389.php b/hphp/test/slow/global_statement/1389.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1389.php
rename to hphp/test/slow/global_statement/1389.php
diff --git a/hphp/test/tcr/global_statement/1389.php.expect b/hphp/test/slow/global_statement/1389.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1389.php.expect
rename to hphp/test/slow/global_statement/1389.php.expect
diff --git a/hphp/test/tcr/global_statement/1390.php b/hphp/test/slow/global_statement/1390.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1390.php
rename to hphp/test/slow/global_statement/1390.php
diff --git a/hphp/test/tcr/global_statement/1390.php.expect b/hphp/test/slow/global_statement/1390.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1390.php.expect
rename to hphp/test/slow/global_statement/1390.php.expect
diff --git a/hphp/test/tcr/global_statement/1391.php b/hphp/test/slow/global_statement/1391.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1391.php
rename to hphp/test/slow/global_statement/1391.php
diff --git a/hphp/test/tcr/global_statement/1391.php.expect b/hphp/test/slow/global_statement/1391.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1391.php.expect
rename to hphp/test/slow/global_statement/1391.php.expect
diff --git a/hphp/test/tcr/global_statement/1392.php b/hphp/test/slow/global_statement/1392.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1392.php
rename to hphp/test/slow/global_statement/1392.php
diff --git a/hphp/test/tcr/global_statement/1392.php.expect b/hphp/test/slow/global_statement/1392.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1392.php.expect
rename to hphp/test/slow/global_statement/1392.php.expect
diff --git a/hphp/test/tcr/global_statement/1393.php b/hphp/test/slow/global_statement/1393.php
similarity index 100%
rename from hphp/test/tcr/global_statement/1393.php
rename to hphp/test/slow/global_statement/1393.php
diff --git a/hphp/test/tcr/global_statement/1393.php.expect b/hphp/test/slow/global_statement/1393.php.expect
similarity index 100%
rename from hphp/test/tcr/global_statement/1393.php.expect
rename to hphp/test/slow/global_statement/1393.php.expect
diff --git a/hphp/test/tcr/goto/1909.php b/hphp/test/slow/goto/1909.php
similarity index 100%
rename from hphp/test/tcr/goto/1909.php
rename to hphp/test/slow/goto/1909.php
diff --git a/hphp/test/tcr/goto/1909.php.expect b/hphp/test/slow/goto/1909.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1909.php.expect
rename to hphp/test/slow/goto/1909.php.expect
diff --git a/hphp/test/tcr/goto/1910.php b/hphp/test/slow/goto/1910.php
similarity index 100%
rename from hphp/test/tcr/goto/1910.php
rename to hphp/test/slow/goto/1910.php
diff --git a/hphp/test/tcr/goto/1910.php.expect b/hphp/test/slow/goto/1910.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1910.php.expect
rename to hphp/test/slow/goto/1910.php.expect
diff --git a/hphp/test/tcr/goto/1911.php b/hphp/test/slow/goto/1911.php
similarity index 100%
rename from hphp/test/tcr/goto/1911.php
rename to hphp/test/slow/goto/1911.php
diff --git a/hphp/test/tcr/goto/1911.php.expect b/hphp/test/slow/goto/1911.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1911.php.expect
rename to hphp/test/slow/goto/1911.php.expect
diff --git a/hphp/test/tcr/goto/1912.php b/hphp/test/slow/goto/1912.php
similarity index 100%
rename from hphp/test/tcr/goto/1912.php
rename to hphp/test/slow/goto/1912.php
diff --git a/hphp/test/tcr/goto/1912.php.expect b/hphp/test/slow/goto/1912.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1912.php.expect
rename to hphp/test/slow/goto/1912.php.expect
diff --git a/hphp/test/tcr/goto/1913.php b/hphp/test/slow/goto/1913.php
similarity index 100%
rename from hphp/test/tcr/goto/1913.php
rename to hphp/test/slow/goto/1913.php
diff --git a/hphp/test/tcr/goto/1913.php.expect b/hphp/test/slow/goto/1913.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1913.php.expect
rename to hphp/test/slow/goto/1913.php.expect
diff --git a/hphp/test/tcr/goto/1914.php b/hphp/test/slow/goto/1914.php
similarity index 100%
rename from hphp/test/tcr/goto/1914.php
rename to hphp/test/slow/goto/1914.php
diff --git a/hphp/test/tcr/goto/1914.php.expect b/hphp/test/slow/goto/1914.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1914.php.expect
rename to hphp/test/slow/goto/1914.php.expect
diff --git a/hphp/test/tcr/goto/1915.php b/hphp/test/slow/goto/1915.php
similarity index 100%
rename from hphp/test/tcr/goto/1915.php
rename to hphp/test/slow/goto/1915.php
diff --git a/hphp/test/tcr/goto/1915.php.expect b/hphp/test/slow/goto/1915.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1915.php.expect
rename to hphp/test/slow/goto/1915.php.expect
diff --git a/hphp/test/tcr/goto/1916.php b/hphp/test/slow/goto/1916.php
similarity index 100%
rename from hphp/test/tcr/goto/1916.php
rename to hphp/test/slow/goto/1916.php
diff --git a/hphp/test/tcr/goto/1916.php.expect b/hphp/test/slow/goto/1916.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1916.php.expect
rename to hphp/test/slow/goto/1916.php.expect
diff --git a/hphp/test/tcr/goto/1917.php b/hphp/test/slow/goto/1917.php
similarity index 100%
rename from hphp/test/tcr/goto/1917.php
rename to hphp/test/slow/goto/1917.php
diff --git a/hphp/test/tcr/goto/1917.php.expect b/hphp/test/slow/goto/1917.php.expect
similarity index 100%
rename from hphp/test/tcr/goto/1917.php.expect
rename to hphp/test/slow/goto/1917.php.expect
diff --git a/hphp/test/tcr/here_doc/1234.php b/hphp/test/slow/here_doc/1234.php
similarity index 100%
rename from hphp/test/tcr/here_doc/1234.php
rename to hphp/test/slow/here_doc/1234.php
diff --git a/hphp/test/tcr/here_doc/1234.php.expect b/hphp/test/slow/here_doc/1234.php.expect
similarity index 100%
rename from hphp/test/tcr/here_doc/1234.php.expect
rename to hphp/test/slow/here_doc/1234.php.expect
diff --git a/hphp/test/tcr/hint/2187.php b/hphp/test/slow/hint/2187.php
similarity index 100%
rename from hphp/test/tcr/hint/2187.php
rename to hphp/test/slow/hint/2187.php
diff --git a/hphp/test/tcr/hint/2187.php.expect b/hphp/test/slow/hint/2187.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2187.php.expect
rename to hphp/test/slow/hint/2187.php.expect
diff --git a/hphp/test/tcr/hint/2188.php b/hphp/test/slow/hint/2188.php
similarity index 100%
rename from hphp/test/tcr/hint/2188.php
rename to hphp/test/slow/hint/2188.php
diff --git a/hphp/test/tcr/hint/2188.php.expect b/hphp/test/slow/hint/2188.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2188.php.expect
rename to hphp/test/slow/hint/2188.php.expect
diff --git a/hphp/test/tcr/hint/2188.php.hphp_opts b/hphp/test/slow/hint/2188.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2188.php.hphp_opts
rename to hphp/test/slow/hint/2188.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2188.php.opts b/hphp/test/slow/hint/2188.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2188.php.opts
rename to hphp/test/slow/hint/2188.php.opts
diff --git a/hphp/test/tcr/hint/2189.php b/hphp/test/slow/hint/2189.php
similarity index 100%
rename from hphp/test/tcr/hint/2189.php
rename to hphp/test/slow/hint/2189.php
diff --git a/hphp/test/tcr/hint/2189.php.expect b/hphp/test/slow/hint/2189.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2189.php.expect
rename to hphp/test/slow/hint/2189.php.expect
diff --git a/hphp/test/tcr/hint/2189.php.hphp_opts b/hphp/test/slow/hint/2189.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2189.php.hphp_opts
rename to hphp/test/slow/hint/2189.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2189.php.opts b/hphp/test/slow/hint/2189.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2189.php.opts
rename to hphp/test/slow/hint/2189.php.opts
diff --git a/hphp/test/tcr/hint/2190.php b/hphp/test/slow/hint/2190.php
similarity index 100%
rename from hphp/test/tcr/hint/2190.php
rename to hphp/test/slow/hint/2190.php
diff --git a/hphp/test/tcr/hint/2190.php.expect b/hphp/test/slow/hint/2190.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2190.php.expect
rename to hphp/test/slow/hint/2190.php.expect
diff --git a/hphp/test/tcr/hint/2190.php.hphp_opts b/hphp/test/slow/hint/2190.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2190.php.hphp_opts
rename to hphp/test/slow/hint/2190.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2190.php.opts b/hphp/test/slow/hint/2190.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2190.php.opts
rename to hphp/test/slow/hint/2190.php.opts
diff --git a/hphp/test/tcr/hint/2191.php b/hphp/test/slow/hint/2191.php
similarity index 100%
rename from hphp/test/tcr/hint/2191.php
rename to hphp/test/slow/hint/2191.php
diff --git a/hphp/test/tcr/hint/2191.php.expect b/hphp/test/slow/hint/2191.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2191.php.expect
rename to hphp/test/slow/hint/2191.php.expect
diff --git a/hphp/test/tcr/hint/2191.php.hphp_opts b/hphp/test/slow/hint/2191.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2191.php.hphp_opts
rename to hphp/test/slow/hint/2191.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2191.php.opts b/hphp/test/slow/hint/2191.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2191.php.opts
rename to hphp/test/slow/hint/2191.php.opts
diff --git a/hphp/test/tcr/hint/2192.php b/hphp/test/slow/hint/2192.php
similarity index 100%
rename from hphp/test/tcr/hint/2192.php
rename to hphp/test/slow/hint/2192.php
diff --git a/hphp/test/tcr/hint/2192.php.expect b/hphp/test/slow/hint/2192.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2192.php.expect
rename to hphp/test/slow/hint/2192.php.expect
diff --git a/hphp/test/tcr/hint/2192.php.hphp_opts b/hphp/test/slow/hint/2192.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2192.php.hphp_opts
rename to hphp/test/slow/hint/2192.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2192.php.opts b/hphp/test/slow/hint/2192.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2192.php.opts
rename to hphp/test/slow/hint/2192.php.opts
diff --git a/hphp/test/tcr/hint/2193.php b/hphp/test/slow/hint/2193.php
similarity index 100%
rename from hphp/test/tcr/hint/2193.php
rename to hphp/test/slow/hint/2193.php
diff --git a/hphp/test/tcr/hint/2193.php.expect b/hphp/test/slow/hint/2193.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2193.php.expect
rename to hphp/test/slow/hint/2193.php.expect
diff --git a/hphp/test/tcr/hint/2193.php.hphp_opts b/hphp/test/slow/hint/2193.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2193.php.hphp_opts
rename to hphp/test/slow/hint/2193.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2193.php.opts b/hphp/test/slow/hint/2193.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2193.php.opts
rename to hphp/test/slow/hint/2193.php.opts
diff --git a/hphp/test/tcr/hint/2194.php b/hphp/test/slow/hint/2194.php
similarity index 100%
rename from hphp/test/tcr/hint/2194.php
rename to hphp/test/slow/hint/2194.php
diff --git a/hphp/test/tcr/hint/2194.php.expect b/hphp/test/slow/hint/2194.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2194.php.expect
rename to hphp/test/slow/hint/2194.php.expect
diff --git a/hphp/test/tcr/hint/2194.php.hphp_opts b/hphp/test/slow/hint/2194.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2194.php.hphp_opts
rename to hphp/test/slow/hint/2194.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2194.php.opts b/hphp/test/slow/hint/2194.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2194.php.opts
rename to hphp/test/slow/hint/2194.php.opts
diff --git a/hphp/test/tcr/hint/2195.php b/hphp/test/slow/hint/2195.php
similarity index 100%
rename from hphp/test/tcr/hint/2195.php
rename to hphp/test/slow/hint/2195.php
diff --git a/hphp/test/tcr/hint/2195.php.expect b/hphp/test/slow/hint/2195.php.expect
similarity index 100%
rename from hphp/test/tcr/hint/2195.php.expect
rename to hphp/test/slow/hint/2195.php.expect
diff --git a/hphp/test/tcr/hint/2195.php.hphp_opts b/hphp/test/slow/hint/2195.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hint/2195.php.hphp_opts
rename to hphp/test/slow/hint/2195.php.hphp_opts
diff --git a/hphp/test/tcr/hint/2195.php.opts b/hphp/test/slow/hint/2195.php.opts
similarity index 100%
rename from hphp/test/tcr/hint/2195.php.opts
rename to hphp/test/slow/hint/2195.php.opts
diff --git a/hphp/test/tcr/hiphop.hphp_opts b/hphp/test/slow/hiphop.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hiphop.hphp_opts
rename to hphp/test/slow/hiphop.hphp_opts
diff --git a/hphp/test/tcr/hiphop.opts b/hphp/test/slow/hiphop.opts
similarity index 100%
rename from hphp/test/tcr/hiphop.opts
rename to hphp/test/slow/hiphop.opts
diff --git a/hphp/test/tcr/hiphop_and_array_access_idempotent.hphp_opts b/hphp/test/slow/hiphop_and_array_access_idempotent.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hiphop_and_array_access_idempotent.hphp_opts
rename to hphp/test/slow/hiphop_and_array_access_idempotent.hphp_opts
diff --git a/hphp/test/tcr/hiphop_and_auto_inline_5.hphp_opts b/hphp/test/slow/hiphop_and_auto_inline_5.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hiphop_and_auto_inline_5.hphp_opts
rename to hphp/test/slow/hiphop_and_auto_inline_5.hphp_opts
diff --git a/hphp/test/tcr/hiphop_and_copy_prop.hphp_opts b/hphp/test/slow/hiphop_and_copy_prop.hphp_opts
similarity index 100%
rename from hphp/test/tcr/hiphop_and_copy_prop.hphp_opts
rename to hphp/test/slow/hiphop_and_copy_prop.hphp_opts
diff --git a/hphp/test/tcr/hiphop_and_rename.opts b/hphp/test/slow/hiphop_and_rename.opts
similarity index 100%
rename from hphp/test/tcr/hiphop_and_rename.opts
rename to hphp/test/slow/hiphop_and_rename.opts
diff --git a/hphp/test/tcr/hoisting/1866.php b/hphp/test/slow/hoisting/1866.php
similarity index 100%
rename from hphp/test/tcr/hoisting/1866.php
rename to hphp/test/slow/hoisting/1866.php
diff --git a/hphp/test/tcr/hoisting/1866.php.expect b/hphp/test/slow/hoisting/1866.php.expect
similarity index 100%
rename from hphp/test/tcr/hoisting/1866.php.expect
rename to hphp/test/slow/hoisting/1866.php.expect
diff --git a/hphp/test/tcr/hoisting/1867.php b/hphp/test/slow/hoisting/1867.php
similarity index 100%
rename from hphp/test/tcr/hoisting/1867.php
rename to hphp/test/slow/hoisting/1867.php
diff --git a/hphp/test/tcr/hoisting/1867.php.expect b/hphp/test/slow/hoisting/1867.php.expect
similarity index 100%
rename from hphp/test/tcr/hoisting/1867.php.expect
rename to hphp/test/slow/hoisting/1867.php.expect
diff --git a/hphp/test/tcr/hoisting/1868.php b/hphp/test/slow/hoisting/1868.php
similarity index 100%
rename from hphp/test/tcr/hoisting/1868.php
rename to hphp/test/slow/hoisting/1868.php
diff --git a/hphp/test/tcr/hoisting/1868.php.expect b/hphp/test/slow/hoisting/1868.php.expect
similarity index 100%
rename from hphp/test/tcr/hoisting/1868.php.expect
rename to hphp/test/slow/hoisting/1868.php.expect
diff --git a/hphp/test/tcr/hoisting/1869.php b/hphp/test/slow/hoisting/1869.php
similarity index 100%
rename from hphp/test/tcr/hoisting/1869.php
rename to hphp/test/slow/hoisting/1869.php
diff --git a/hphp/test/tcr/hoisting/1869.php.expect b/hphp/test/slow/hoisting/1869.php.expect
similarity index 100%
rename from hphp/test/tcr/hoisting/1869.php.expect
rename to hphp/test/slow/hoisting/1869.php.expect
diff --git a/hphp/test/tcr/new_object_expression/782.php.expect b/hphp/test/slow/hphp_config.hdf
similarity index 100%
rename from hphp/test/tcr/new_object_expression/782.php.expect
rename to hphp/test/slow/hphp_config.hdf
diff --git a/hphp/test/tcr/if_statement/1411.php b/hphp/test/slow/if_statement/1411.php
similarity index 100%
rename from hphp/test/tcr/if_statement/1411.php
rename to hphp/test/slow/if_statement/1411.php
diff --git a/hphp/test/tcr/if_statement/1411.php.expect b/hphp/test/slow/if_statement/1411.php.expect
similarity index 100%
rename from hphp/test/tcr/if_statement/1411.php.expect
rename to hphp/test/slow/if_statement/1411.php.expect
diff --git a/hphp/test/tcr/if_statement/1412.php b/hphp/test/slow/if_statement/1412.php
similarity index 100%
rename from hphp/test/tcr/if_statement/1412.php
rename to hphp/test/slow/if_statement/1412.php
diff --git a/hphp/test/tcr/object_magic_method/755.php.expect b/hphp/test/slow/if_statement/1412.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/755.php.expect
rename to hphp/test/slow/if_statement/1412.php.expect
diff --git a/hphp/test/tcr/if_statement/1413.php b/hphp/test/slow/if_statement/1413.php
similarity index 100%
rename from hphp/test/tcr/if_statement/1413.php
rename to hphp/test/slow/if_statement/1413.php
diff --git a/hphp/test/tcr/object_method/721.php.expect b/hphp/test/slow/if_statement/1413.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/721.php.expect
rename to hphp/test/slow/if_statement/1413.php.expect
diff --git a/hphp/test/tcr/if_statement/1414.php b/hphp/test/slow/if_statement/1414.php
similarity index 100%
rename from hphp/test/tcr/if_statement/1414.php
rename to hphp/test/slow/if_statement/1414.php
diff --git a/hphp/test/tcr/if_statement/1414.php.expect b/hphp/test/slow/if_statement/1414.php.expect
similarity index 100%
rename from hphp/test/tcr/if_statement/1414.php.expect
rename to hphp/test/slow/if_statement/1414.php.expect
diff --git a/hphp/test/tcr/inlining/1828.php b/hphp/test/slow/inlining/1828.php
similarity index 100%
rename from hphp/test/tcr/inlining/1828.php
rename to hphp/test/slow/inlining/1828.php
diff --git a/hphp/test/tcr/inlining/1828.php.expect b/hphp/test/slow/inlining/1828.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1828.php.expect
rename to hphp/test/slow/inlining/1828.php.expect
diff --git a/hphp/test/tcr/inlining/1828.php.hphp_opts b/hphp/test/slow/inlining/1828.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1828.php.hphp_opts
rename to hphp/test/slow/inlining/1828.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1829.php b/hphp/test/slow/inlining/1829.php
similarity index 100%
rename from hphp/test/tcr/inlining/1829.php
rename to hphp/test/slow/inlining/1829.php
diff --git a/hphp/test/tcr/inlining/1829.php.expect b/hphp/test/slow/inlining/1829.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1829.php.expect
rename to hphp/test/slow/inlining/1829.php.expect
diff --git a/hphp/test/tcr/inlining/1829.php.hphp_opts b/hphp/test/slow/inlining/1829.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1829.php.hphp_opts
rename to hphp/test/slow/inlining/1829.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1830.php b/hphp/test/slow/inlining/1830.php
similarity index 100%
rename from hphp/test/tcr/inlining/1830.php
rename to hphp/test/slow/inlining/1830.php
diff --git a/hphp/test/tcr/inlining/1830.php.expect b/hphp/test/slow/inlining/1830.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1830.php.expect
rename to hphp/test/slow/inlining/1830.php.expect
diff --git a/hphp/test/tcr/inlining/1830.php.hphp_opts b/hphp/test/slow/inlining/1830.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1830.php.hphp_opts
rename to hphp/test/slow/inlining/1830.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1831.php b/hphp/test/slow/inlining/1831.php
similarity index 100%
rename from hphp/test/tcr/inlining/1831.php
rename to hphp/test/slow/inlining/1831.php
diff --git a/hphp/test/tcr/object_method/729.php.expect b/hphp/test/slow/inlining/1831.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/729.php.expect
rename to hphp/test/slow/inlining/1831.php.expect
diff --git a/hphp/test/tcr/inlining/1831.php.hphp_opts b/hphp/test/slow/inlining/1831.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1831.php.hphp_opts
rename to hphp/test/slow/inlining/1831.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1832.php b/hphp/test/slow/inlining/1832.php
similarity index 100%
rename from hphp/test/tcr/inlining/1832.php
rename to hphp/test/slow/inlining/1832.php
diff --git a/hphp/test/tcr/inlining/1832.php.expect b/hphp/test/slow/inlining/1832.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1832.php.expect
rename to hphp/test/slow/inlining/1832.php.expect
diff --git a/hphp/test/tcr/inlining/1832.php.hphp_opts b/hphp/test/slow/inlining/1832.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1832.php.hphp_opts
rename to hphp/test/slow/inlining/1832.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1833.php b/hphp/test/slow/inlining/1833.php
similarity index 100%
rename from hphp/test/tcr/inlining/1833.php
rename to hphp/test/slow/inlining/1833.php
diff --git a/hphp/test/tcr/inlining/1833.php.expect b/hphp/test/slow/inlining/1833.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1833.php.expect
rename to hphp/test/slow/inlining/1833.php.expect
diff --git a/hphp/test/tcr/inlining/1833.php.hphp_opts b/hphp/test/slow/inlining/1833.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1833.php.hphp_opts
rename to hphp/test/slow/inlining/1833.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1834.php b/hphp/test/slow/inlining/1834.php
similarity index 100%
rename from hphp/test/tcr/inlining/1834.php
rename to hphp/test/slow/inlining/1834.php
diff --git a/hphp/test/tcr/inlining/1834.php.expect b/hphp/test/slow/inlining/1834.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1834.php.expect
rename to hphp/test/slow/inlining/1834.php.expect
diff --git a/hphp/test/tcr/inlining/1834.php.hphp_opts b/hphp/test/slow/inlining/1834.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1834.php.hphp_opts
rename to hphp/test/slow/inlining/1834.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1835.php b/hphp/test/slow/inlining/1835.php
similarity index 100%
rename from hphp/test/tcr/inlining/1835.php
rename to hphp/test/slow/inlining/1835.php
diff --git a/hphp/test/tcr/inlining/1835.php.expect b/hphp/test/slow/inlining/1835.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1835.php.expect
rename to hphp/test/slow/inlining/1835.php.expect
diff --git a/hphp/test/tcr/inlining/1835.php.hphp_opts b/hphp/test/slow/inlining/1835.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1835.php.hphp_opts
rename to hphp/test/slow/inlining/1835.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1836.php b/hphp/test/slow/inlining/1836.php
similarity index 100%
rename from hphp/test/tcr/inlining/1836.php
rename to hphp/test/slow/inlining/1836.php
diff --git a/hphp/test/tcr/perfect_virtual/80.php.expect b/hphp/test/slow/inlining/1836.php.expect
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/80.php.expect
rename to hphp/test/slow/inlining/1836.php.expect
diff --git a/hphp/test/tcr/inlining/1836.php.hphp_opts b/hphp/test/slow/inlining/1836.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1836.php.hphp_opts
rename to hphp/test/slow/inlining/1836.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1837.php b/hphp/test/slow/inlining/1837.php
similarity index 100%
rename from hphp/test/tcr/inlining/1837.php
rename to hphp/test/slow/inlining/1837.php
diff --git a/hphp/test/tcr/print/1447.php.expect b/hphp/test/slow/inlining/1837.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1447.php.expect
rename to hphp/test/slow/inlining/1837.php.expect
diff --git a/hphp/test/tcr/inlining/1837.php.hphp_opts b/hphp/test/slow/inlining/1837.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1837.php.hphp_opts
rename to hphp/test/slow/inlining/1837.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1838.php b/hphp/test/slow/inlining/1838.php
similarity index 100%
rename from hphp/test/tcr/inlining/1838.php
rename to hphp/test/slow/inlining/1838.php
diff --git a/hphp/test/tcr/print/1448.php.expect b/hphp/test/slow/inlining/1838.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1448.php.expect
rename to hphp/test/slow/inlining/1838.php.expect
diff --git a/hphp/test/tcr/inlining/1838.php.hphp_opts b/hphp/test/slow/inlining/1838.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1838.php.hphp_opts
rename to hphp/test/slow/inlining/1838.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1839.php b/hphp/test/slow/inlining/1839.php
similarity index 100%
rename from hphp/test/tcr/inlining/1839.php
rename to hphp/test/slow/inlining/1839.php
diff --git a/hphp/test/tcr/inlining/1839.php.expect b/hphp/test/slow/inlining/1839.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1839.php.expect
rename to hphp/test/slow/inlining/1839.php.expect
diff --git a/hphp/test/tcr/inlining/1839.php.hphp_opts b/hphp/test/slow/inlining/1839.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1839.php.hphp_opts
rename to hphp/test/slow/inlining/1839.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1839.php.opts b/hphp/test/slow/inlining/1839.php.opts
similarity index 100%
rename from hphp/test/tcr/inlining/1839.php.opts
rename to hphp/test/slow/inlining/1839.php.opts
diff --git a/hphp/test/tcr/inlining/1840.php b/hphp/test/slow/inlining/1840.php
similarity index 100%
rename from hphp/test/tcr/inlining/1840.php
rename to hphp/test/slow/inlining/1840.php
diff --git a/hphp/test/tcr/inlining/1840.php.expect b/hphp/test/slow/inlining/1840.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1840.php.expect
rename to hphp/test/slow/inlining/1840.php.expect
diff --git a/hphp/test/tcr/inlining/1840.php.hphp_opts b/hphp/test/slow/inlining/1840.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1840.php.hphp_opts
rename to hphp/test/slow/inlining/1840.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1841.php b/hphp/test/slow/inlining/1841.php
similarity index 100%
rename from hphp/test/tcr/inlining/1841.php
rename to hphp/test/slow/inlining/1841.php
diff --git a/hphp/test/tcr/inlining/1841.php.expect b/hphp/test/slow/inlining/1841.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1841.php.expect
rename to hphp/test/slow/inlining/1841.php.expect
diff --git a/hphp/test/tcr/inlining/1841.php.hphp_opts b/hphp/test/slow/inlining/1841.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1841.php.hphp_opts
rename to hphp/test/slow/inlining/1841.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1842.php b/hphp/test/slow/inlining/1842.php
similarity index 100%
rename from hphp/test/tcr/inlining/1842.php
rename to hphp/test/slow/inlining/1842.php
diff --git a/hphp/test/tcr/inlining/1842.php.expect b/hphp/test/slow/inlining/1842.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1842.php.expect
rename to hphp/test/slow/inlining/1842.php.expect
diff --git a/hphp/test/tcr/inlining/1842.php.hphp_opts b/hphp/test/slow/inlining/1842.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1842.php.hphp_opts
rename to hphp/test/slow/inlining/1842.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1843.php b/hphp/test/slow/inlining/1843.php
similarity index 100%
rename from hphp/test/tcr/inlining/1843.php
rename to hphp/test/slow/inlining/1843.php
diff --git a/hphp/test/tcr/inlining/1843.php.expect b/hphp/test/slow/inlining/1843.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1843.php.expect
rename to hphp/test/slow/inlining/1843.php.expect
diff --git a/hphp/test/tcr/inlining/1843.php.hphp_opts b/hphp/test/slow/inlining/1843.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1843.php.hphp_opts
rename to hphp/test/slow/inlining/1843.php.hphp_opts
diff --git a/hphp/test/tcr/inlining/1844.php b/hphp/test/slow/inlining/1844.php
similarity index 100%
rename from hphp/test/tcr/inlining/1844.php
rename to hphp/test/slow/inlining/1844.php
diff --git a/hphp/test/tcr/inlining/1844.php.expect b/hphp/test/slow/inlining/1844.php.expect
similarity index 100%
rename from hphp/test/tcr/inlining/1844.php.expect
rename to hphp/test/slow/inlining/1844.php.expect
diff --git a/hphp/test/tcr/inlining/1844.php.hphp_opts b/hphp/test/slow/inlining/1844.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/inlining/1844.php.hphp_opts
rename to hphp/test/slow/inlining/1844.php.hphp_opts
diff --git a/hphp/test/tcr/inner_class/10.php b/hphp/test/slow/inner_class/10.php
similarity index 100%
rename from hphp/test/tcr/inner_class/10.php
rename to hphp/test/slow/inner_class/10.php
diff --git a/hphp/test/tcr/inner_class/10.php.expect b/hphp/test/slow/inner_class/10.php.expect
similarity index 100%
rename from hphp/test/tcr/inner_class/10.php.expect
rename to hphp/test/slow/inner_class/10.php.expect
diff --git a/hphp/test/tcr/inner_class/8.php b/hphp/test/slow/inner_class/8.php
similarity index 100%
rename from hphp/test/tcr/inner_class/8.php
rename to hphp/test/slow/inner_class/8.php
diff --git a/hphp/test/tcr/inner_class/8.php.expect b/hphp/test/slow/inner_class/8.php.expect
similarity index 100%
rename from hphp/test/tcr/inner_class/8.php.expect
rename to hphp/test/slow/inner_class/8.php.expect
diff --git a/hphp/test/tcr/inner_class/9.php b/hphp/test/slow/inner_class/9.php
similarity index 100%
rename from hphp/test/tcr/inner_class/9.php
rename to hphp/test/slow/inner_class/9.php
diff --git a/hphp/test/tcr/inner_class/9.php.expect b/hphp/test/slow/inner_class/9.php.expect
similarity index 100%
rename from hphp/test/tcr/inner_class/9.php.expect
rename to hphp/test/slow/inner_class/9.php.expect
diff --git a/hphp/test/tcr/inner_function/6.php b/hphp/test/slow/inner_function/6.php
similarity index 100%
rename from hphp/test/tcr/inner_function/6.php
rename to hphp/test/slow/inner_function/6.php
diff --git a/hphp/test/tcr/inner_function/6.php.expect b/hphp/test/slow/inner_function/6.php.expect
similarity index 100%
rename from hphp/test/tcr/inner_function/6.php.expect
rename to hphp/test/slow/inner_function/6.php.expect
diff --git a/hphp/test/tcr/inner_function/7.php b/hphp/test/slow/inner_function/7.php
similarity index 100%
rename from hphp/test/tcr/inner_function/7.php
rename to hphp/test/slow/inner_function/7.php
diff --git a/hphp/test/tcr/inner_function/7.php.expect b/hphp/test/slow/inner_function/7.php.expect
similarity index 100%
rename from hphp/test/tcr/inner_function/7.php.expect
rename to hphp/test/slow/inner_function/7.php.expect
diff --git a/hphp/test/tcr/int_isset/1724.php b/hphp/test/slow/int_isset/1724.php
similarity index 100%
rename from hphp/test/tcr/int_isset/1724.php
rename to hphp/test/slow/int_isset/1724.php
diff --git a/hphp/test/tcr/redeclared_classes/1468.php.expect b/hphp/test/slow/int_isset/1724.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1468.php.expect
rename to hphp/test/slow/int_isset/1724.php.expect
diff --git a/hphp/test/tcr/integer/100.php b/hphp/test/slow/integer/100.php
similarity index 100%
rename from hphp/test/tcr/integer/100.php
rename to hphp/test/slow/integer/100.php
diff --git a/hphp/test/tcr/integer/100.php.expect b/hphp/test/slow/integer/100.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/100.php.expect
rename to hphp/test/slow/integer/100.php.expect
diff --git a/hphp/test/tcr/integer/101.php b/hphp/test/slow/integer/101.php
similarity index 100%
rename from hphp/test/tcr/integer/101.php
rename to hphp/test/slow/integer/101.php
diff --git a/hphp/test/tcr/integer/101.php.expect b/hphp/test/slow/integer/101.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/101.php.expect
rename to hphp/test/slow/integer/101.php.expect
diff --git a/hphp/test/tcr/integer/102.php b/hphp/test/slow/integer/102.php
similarity index 100%
rename from hphp/test/tcr/integer/102.php
rename to hphp/test/slow/integer/102.php
diff --git a/hphp/test/tcr/integer/102.php.expect b/hphp/test/slow/integer/102.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/102.php.expect
rename to hphp/test/slow/integer/102.php.expect
diff --git a/hphp/test/tcr/integer/103.php b/hphp/test/slow/integer/103.php
similarity index 100%
rename from hphp/test/tcr/integer/103.php
rename to hphp/test/slow/integer/103.php
diff --git a/hphp/test/tcr/integer/103.php.expect b/hphp/test/slow/integer/103.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/103.php.expect
rename to hphp/test/slow/integer/103.php.expect
diff --git a/hphp/test/tcr/integer/104.php b/hphp/test/slow/integer/104.php
similarity index 100%
rename from hphp/test/tcr/integer/104.php
rename to hphp/test/slow/integer/104.php
diff --git a/hphp/test/tcr/integer/104.php.expect b/hphp/test/slow/integer/104.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/104.php.expect
rename to hphp/test/slow/integer/104.php.expect
diff --git a/hphp/test/tcr/integer/105.php b/hphp/test/slow/integer/105.php
similarity index 100%
rename from hphp/test/tcr/integer/105.php
rename to hphp/test/slow/integer/105.php
diff --git a/hphp/test/tcr/integer/105.php.expect b/hphp/test/slow/integer/105.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/105.php.expect
rename to hphp/test/slow/integer/105.php.expect
diff --git a/hphp/test/tcr/integer/84.php b/hphp/test/slow/integer/84.php
similarity index 100%
rename from hphp/test/tcr/integer/84.php
rename to hphp/test/slow/integer/84.php
diff --git a/hphp/test/tcr/integer/84.php.expect b/hphp/test/slow/integer/84.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/84.php.expect
rename to hphp/test/slow/integer/84.php.expect
diff --git a/hphp/test/tcr/integer/85.php b/hphp/test/slow/integer/85.php
similarity index 100%
rename from hphp/test/tcr/integer/85.php
rename to hphp/test/slow/integer/85.php
diff --git a/hphp/test/tcr/integer/85.php.expect b/hphp/test/slow/integer/85.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/85.php.expect
rename to hphp/test/slow/integer/85.php.expect
diff --git a/hphp/test/tcr/integer/86.php b/hphp/test/slow/integer/86.php
similarity index 100%
rename from hphp/test/tcr/integer/86.php
rename to hphp/test/slow/integer/86.php
diff --git a/hphp/test/tcr/integer/86.php.expect b/hphp/test/slow/integer/86.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/86.php.expect
rename to hphp/test/slow/integer/86.php.expect
diff --git a/hphp/test/tcr/integer/87.php b/hphp/test/slow/integer/87.php
similarity index 100%
rename from hphp/test/tcr/integer/87.php
rename to hphp/test/slow/integer/87.php
diff --git a/hphp/test/tcr/integer/87.php.expect b/hphp/test/slow/integer/87.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/87.php.expect
rename to hphp/test/slow/integer/87.php.expect
diff --git a/hphp/test/tcr/integer/88.php b/hphp/test/slow/integer/88.php
similarity index 100%
rename from hphp/test/tcr/integer/88.php
rename to hphp/test/slow/integer/88.php
diff --git a/hphp/test/tcr/integer/88.php.expect b/hphp/test/slow/integer/88.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/88.php.expect
rename to hphp/test/slow/integer/88.php.expect
diff --git a/hphp/test/tcr/integer/89.php b/hphp/test/slow/integer/89.php
similarity index 100%
rename from hphp/test/tcr/integer/89.php
rename to hphp/test/slow/integer/89.php
diff --git a/hphp/test/tcr/integer/89.php.expect b/hphp/test/slow/integer/89.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/89.php.expect
rename to hphp/test/slow/integer/89.php.expect
diff --git a/hphp/test/tcr/integer/90.php b/hphp/test/slow/integer/90.php
similarity index 100%
rename from hphp/test/tcr/integer/90.php
rename to hphp/test/slow/integer/90.php
diff --git a/hphp/test/tcr/integer/90.php.expect b/hphp/test/slow/integer/90.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/90.php.expect
rename to hphp/test/slow/integer/90.php.expect
diff --git a/hphp/test/tcr/integer/91.php b/hphp/test/slow/integer/91.php
similarity index 100%
rename from hphp/test/tcr/integer/91.php
rename to hphp/test/slow/integer/91.php
diff --git a/hphp/test/tcr/integer/91.php.expect b/hphp/test/slow/integer/91.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/91.php.expect
rename to hphp/test/slow/integer/91.php.expect
diff --git a/hphp/test/tcr/integer/92.php b/hphp/test/slow/integer/92.php
similarity index 100%
rename from hphp/test/tcr/integer/92.php
rename to hphp/test/slow/integer/92.php
diff --git a/hphp/test/tcr/integer/92.php.expect b/hphp/test/slow/integer/92.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/92.php.expect
rename to hphp/test/slow/integer/92.php.expect
diff --git a/hphp/test/tcr/integer/93.php b/hphp/test/slow/integer/93.php
similarity index 100%
rename from hphp/test/tcr/integer/93.php
rename to hphp/test/slow/integer/93.php
diff --git a/hphp/test/tcr/integer/93.php.expect b/hphp/test/slow/integer/93.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/93.php.expect
rename to hphp/test/slow/integer/93.php.expect
diff --git a/hphp/test/tcr/integer/94.php b/hphp/test/slow/integer/94.php
similarity index 100%
rename from hphp/test/tcr/integer/94.php
rename to hphp/test/slow/integer/94.php
diff --git a/hphp/test/tcr/integer/94.php.expect b/hphp/test/slow/integer/94.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/94.php.expect
rename to hphp/test/slow/integer/94.php.expect
diff --git a/hphp/test/tcr/integer/95.php b/hphp/test/slow/integer/95.php
similarity index 100%
rename from hphp/test/tcr/integer/95.php
rename to hphp/test/slow/integer/95.php
diff --git a/hphp/test/tcr/integer/95.php.expect b/hphp/test/slow/integer/95.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/95.php.expect
rename to hphp/test/slow/integer/95.php.expect
diff --git a/hphp/test/tcr/integer/96.php b/hphp/test/slow/integer/96.php
similarity index 100%
rename from hphp/test/tcr/integer/96.php
rename to hphp/test/slow/integer/96.php
diff --git a/hphp/test/tcr/integer/96.php.expect b/hphp/test/slow/integer/96.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/96.php.expect
rename to hphp/test/slow/integer/96.php.expect
diff --git a/hphp/test/tcr/integer/97.php b/hphp/test/slow/integer/97.php
similarity index 100%
rename from hphp/test/tcr/integer/97.php
rename to hphp/test/slow/integer/97.php
diff --git a/hphp/test/tcr/integer/97.php.expect b/hphp/test/slow/integer/97.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/97.php.expect
rename to hphp/test/slow/integer/97.php.expect
diff --git a/hphp/test/tcr/integer/98.php b/hphp/test/slow/integer/98.php
similarity index 100%
rename from hphp/test/tcr/integer/98.php
rename to hphp/test/slow/integer/98.php
diff --git a/hphp/test/tcr/integer/98.php.expect b/hphp/test/slow/integer/98.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/98.php.expect
rename to hphp/test/slow/integer/98.php.expect
diff --git a/hphp/test/tcr/integer/99.php b/hphp/test/slow/integer/99.php
similarity index 100%
rename from hphp/test/tcr/integer/99.php
rename to hphp/test/slow/integer/99.php
diff --git a/hphp/test/tcr/integer/99.php.expect b/hphp/test/slow/integer/99.php.expect
similarity index 100%
rename from hphp/test/tcr/integer/99.php.expect
rename to hphp/test/slow/integer/99.php.expect
diff --git a/hphp/test/tcr/intercept/1196.php b/hphp/test/slow/intercept/1196.php
similarity index 100%
rename from hphp/test/tcr/intercept/1196.php
rename to hphp/test/slow/intercept/1196.php
diff --git a/hphp/test/tcr/intercept/1196.php.expect b/hphp/test/slow/intercept/1196.php.expect
similarity index 100%
rename from hphp/test/tcr/intercept/1196.php.expect
rename to hphp/test/slow/intercept/1196.php.expect
diff --git a/hphp/test/tcr/intercept/1196.php.opts b/hphp/test/slow/intercept/1196.php.opts
similarity index 100%
rename from hphp/test/tcr/intercept/1196.php.opts
rename to hphp/test/slow/intercept/1196.php.opts
diff --git a/hphp/test/tcr/intercept/1197.php b/hphp/test/slow/intercept/1197.php
similarity index 100%
rename from hphp/test/tcr/intercept/1197.php
rename to hphp/test/slow/intercept/1197.php
diff --git a/hphp/test/tcr/intercept/1197.php.expect b/hphp/test/slow/intercept/1197.php.expect
similarity index 100%
rename from hphp/test/tcr/intercept/1197.php.expect
rename to hphp/test/slow/intercept/1197.php.expect
diff --git a/hphp/test/tcr/intercept/1197.php.opts b/hphp/test/slow/intercept/1197.php.opts
similarity index 100%
rename from hphp/test/tcr/intercept/1197.php.opts
rename to hphp/test/slow/intercept/1197.php.opts
diff --git a/hphp/test/tcr/intercept/1198.php b/hphp/test/slow/intercept/1198.php
similarity index 100%
rename from hphp/test/tcr/intercept/1198.php
rename to hphp/test/slow/intercept/1198.php
diff --git a/hphp/test/tcr/intercept/1198.php.expect b/hphp/test/slow/intercept/1198.php.expect
similarity index 100%
rename from hphp/test/tcr/intercept/1198.php.expect
rename to hphp/test/slow/intercept/1198.php.expect
diff --git a/hphp/test/tcr/intercept/1198.php.opts b/hphp/test/slow/intercept/1198.php.opts
similarity index 100%
rename from hphp/test/tcr/intercept/1198.php.opts
rename to hphp/test/slow/intercept/1198.php.opts
diff --git a/hphp/test/tcr/intercept/1199.php b/hphp/test/slow/intercept/1199.php
similarity index 100%
rename from hphp/test/tcr/intercept/1199.php
rename to hphp/test/slow/intercept/1199.php
diff --git a/hphp/test/tcr/intercept/1199.php.expect b/hphp/test/slow/intercept/1199.php.expect
similarity index 100%
rename from hphp/test/tcr/intercept/1199.php.expect
rename to hphp/test/slow/intercept/1199.php.expect
diff --git a/hphp/test/tcr/intercept/1199.php.opts b/hphp/test/slow/intercept/1199.php.opts
similarity index 100%
rename from hphp/test/tcr/intercept/1199.php.opts
rename to hphp/test/slow/intercept/1199.php.opts
diff --git a/hphp/test/tcr/intercept/1200.php b/hphp/test/slow/intercept/1200.php
similarity index 100%
rename from hphp/test/tcr/intercept/1200.php
rename to hphp/test/slow/intercept/1200.php
diff --git a/hphp/test/tcr/intercept/1200.php.expect b/hphp/test/slow/intercept/1200.php.expect
similarity index 100%
rename from hphp/test/tcr/intercept/1200.php.expect
rename to hphp/test/slow/intercept/1200.php.expect
diff --git a/hphp/test/tcr/intercept/1200.php.opts b/hphp/test/slow/intercept/1200.php.opts
similarity index 100%
rename from hphp/test/tcr/intercept/1200.php.opts
rename to hphp/test/slow/intercept/1200.php.opts
diff --git a/hphp/test/tcr/invalid_argument/1380.php b/hphp/test/slow/invalid_argument/1380.php
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1380.php
rename to hphp/test/slow/invalid_argument/1380.php
diff --git a/hphp/test/tcr/invalid_argument/1380.php.expect b/hphp/test/slow/invalid_argument/1380.php.expect
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1380.php.expect
rename to hphp/test/slow/invalid_argument/1380.php.expect
diff --git a/hphp/test/tcr/invalid_argument/1381.php b/hphp/test/slow/invalid_argument/1381.php
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1381.php
rename to hphp/test/slow/invalid_argument/1381.php
diff --git a/hphp/test/tcr/invalid_argument/1381.php.expect b/hphp/test/slow/invalid_argument/1381.php.expect
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1381.php.expect
rename to hphp/test/slow/invalid_argument/1381.php.expect
diff --git a/hphp/test/tcr/invalid_argument/1382.php b/hphp/test/slow/invalid_argument/1382.php
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1382.php
rename to hphp/test/slow/invalid_argument/1382.php
diff --git a/hphp/test/tcr/redeclared_classes/1470.php.expect b/hphp/test/slow/invalid_argument/1382.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1470.php.expect
rename to hphp/test/slow/invalid_argument/1382.php.expect
diff --git a/hphp/test/tcr/invalid_argument/1383.php b/hphp/test/slow/invalid_argument/1383.php
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1383.php
rename to hphp/test/slow/invalid_argument/1383.php
diff --git a/hphp/test/tcr/invalid_argument/1383.php.expect b/hphp/test/slow/invalid_argument/1383.php.expect
similarity index 100%
rename from hphp/test/tcr/invalid_argument/1383.php.expect
rename to hphp/test/slow/invalid_argument/1383.php.expect
diff --git a/hphp/test/tcr/json/1551.php b/hphp/test/slow/json/1551.php
similarity index 100%
rename from hphp/test/tcr/json/1551.php
rename to hphp/test/slow/json/1551.php
diff --git a/hphp/test/tcr/json/1551.php.expect b/hphp/test/slow/json/1551.php.expect
similarity index 100%
rename from hphp/test/tcr/json/1551.php.expect
rename to hphp/test/slow/json/1551.php.expect
diff --git a/hphp/test/tcr/json/1552.php b/hphp/test/slow/json/1552.php
similarity index 100%
rename from hphp/test/tcr/json/1552.php
rename to hphp/test/slow/json/1552.php
diff --git a/hphp/test/tcr/json/1552.php.expect b/hphp/test/slow/json/1552.php.expect
similarity index 100%
rename from hphp/test/tcr/json/1552.php.expect
rename to hphp/test/slow/json/1552.php.expect
diff --git a/hphp/test/tcr/json/1553.php b/hphp/test/slow/json/1553.php
similarity index 100%
rename from hphp/test/tcr/json/1553.php
rename to hphp/test/slow/json/1553.php
diff --git a/hphp/test/tcr/json/1553.php.expect b/hphp/test/slow/json/1553.php.expect
similarity index 100%
rename from hphp/test/tcr/json/1553.php.expect
rename to hphp/test/slow/json/1553.php.expect
diff --git a/hphp/test/tcr/json/1554.php b/hphp/test/slow/json/1554.php
similarity index 100%
rename from hphp/test/tcr/json/1554.php
rename to hphp/test/slow/json/1554.php
diff --git a/hphp/test/tcr/json/1554.php.expect b/hphp/test/slow/json/1554.php.expect
similarity index 100%
rename from hphp/test/tcr/json/1554.php.expect
rename to hphp/test/slow/json/1554.php.expect
diff --git a/hphp/test/tcr/json/1555.php b/hphp/test/slow/json/1555.php
similarity index 100%
rename from hphp/test/tcr/json/1555.php
rename to hphp/test/slow/json/1555.php
diff --git a/hphp/test/tcr/json/1555.php.expect b/hphp/test/slow/json/1555.php.expect
similarity index 100%
rename from hphp/test/tcr/json/1555.php.expect
rename to hphp/test/slow/json/1555.php.expect
diff --git a/hphp/test/tcr/labels/72.php b/hphp/test/slow/labels/72.php
similarity index 100%
rename from hphp/test/tcr/labels/72.php
rename to hphp/test/slow/labels/72.php
diff --git a/hphp/test/tcr/labels/72.php.expect b/hphp/test/slow/labels/72.php.expect
similarity index 100%
rename from hphp/test/tcr/labels/72.php.expect
rename to hphp/test/slow/labels/72.php.expect
diff --git a/hphp/test/tcr/labels/73.php b/hphp/test/slow/labels/73.php
similarity index 100%
rename from hphp/test/tcr/labels/73.php
rename to hphp/test/slow/labels/73.php
diff --git a/hphp/test/tcr/labels/73.php.expect b/hphp/test/slow/labels/73.php.expect
similarity index 100%
rename from hphp/test/tcr/labels/73.php.expect
rename to hphp/test/slow/labels/73.php.expect
diff --git a/hphp/test/tcr/labels/74.php b/hphp/test/slow/labels/74.php
similarity index 100%
rename from hphp/test/tcr/labels/74.php
rename to hphp/test/slow/labels/74.php
diff --git a/hphp/test/tcr/labels/74.php.expect b/hphp/test/slow/labels/74.php.expect
similarity index 100%
rename from hphp/test/tcr/labels/74.php.expect
rename to hphp/test/slow/labels/74.php.expect
diff --git a/hphp/test/tcr/labels/75.php b/hphp/test/slow/labels/75.php
similarity index 100%
rename from hphp/test/tcr/labels/75.php
rename to hphp/test/slow/labels/75.php
diff --git a/hphp/test/tcr/labels/75.php.expect b/hphp/test/slow/labels/75.php.expect
similarity index 100%
rename from hphp/test/tcr/labels/75.php.expect
rename to hphp/test/slow/labels/75.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1874.php b/hphp/test/slow/late_static_binding/1874.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1874.php
rename to hphp/test/slow/late_static_binding/1874.php
diff --git a/hphp/test/tcr/late_static_binding/1874.php.expect b/hphp/test/slow/late_static_binding/1874.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1874.php.expect
rename to hphp/test/slow/late_static_binding/1874.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1875.php b/hphp/test/slow/late_static_binding/1875.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1875.php
rename to hphp/test/slow/late_static_binding/1875.php
diff --git a/hphp/test/tcr/late_static_binding/1875.php.expect b/hphp/test/slow/late_static_binding/1875.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1875.php.expect
rename to hphp/test/slow/late_static_binding/1875.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1876.php b/hphp/test/slow/late_static_binding/1876.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1876.php
rename to hphp/test/slow/late_static_binding/1876.php
diff --git a/hphp/test/tcr/late_static_binding/1876.php.expect b/hphp/test/slow/late_static_binding/1876.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1876.php.expect
rename to hphp/test/slow/late_static_binding/1876.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1877.php b/hphp/test/slow/late_static_binding/1877.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1877.php
rename to hphp/test/slow/late_static_binding/1877.php
diff --git a/hphp/test/tcr/late_static_binding/1877.php.expect b/hphp/test/slow/late_static_binding/1877.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1877.php.expect
rename to hphp/test/slow/late_static_binding/1877.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1878.php b/hphp/test/slow/late_static_binding/1878.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1878.php
rename to hphp/test/slow/late_static_binding/1878.php
diff --git a/hphp/test/tcr/late_static_binding/1878.php.expect b/hphp/test/slow/late_static_binding/1878.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1878.php.expect
rename to hphp/test/slow/late_static_binding/1878.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1879.php b/hphp/test/slow/late_static_binding/1879.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1879.php
rename to hphp/test/slow/late_static_binding/1879.php
diff --git a/hphp/test/tcr/late_static_binding/1879.php.expect b/hphp/test/slow/late_static_binding/1879.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1879.php.expect
rename to hphp/test/slow/late_static_binding/1879.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1880.php b/hphp/test/slow/late_static_binding/1880.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1880.php
rename to hphp/test/slow/late_static_binding/1880.php
diff --git a/hphp/test/tcr/late_static_binding/1880.php.expect b/hphp/test/slow/late_static_binding/1880.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1880.php.expect
rename to hphp/test/slow/late_static_binding/1880.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1881.php b/hphp/test/slow/late_static_binding/1881.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1881.php
rename to hphp/test/slow/late_static_binding/1881.php
diff --git a/hphp/test/tcr/late_static_binding/1881.php.expect b/hphp/test/slow/late_static_binding/1881.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1881.php.expect
rename to hphp/test/slow/late_static_binding/1881.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1882.php b/hphp/test/slow/late_static_binding/1882.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1882.php
rename to hphp/test/slow/late_static_binding/1882.php
diff --git a/hphp/test/tcr/late_static_binding/1882.php.expect b/hphp/test/slow/late_static_binding/1882.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1882.php.expect
rename to hphp/test/slow/late_static_binding/1882.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1883.php b/hphp/test/slow/late_static_binding/1883.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1883.php
rename to hphp/test/slow/late_static_binding/1883.php
diff --git a/hphp/test/tcr/late_static_binding/1883.php.expect b/hphp/test/slow/late_static_binding/1883.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1883.php.expect
rename to hphp/test/slow/late_static_binding/1883.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1884.php b/hphp/test/slow/late_static_binding/1884.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1884.php
rename to hphp/test/slow/late_static_binding/1884.php
diff --git a/hphp/test/tcr/late_static_binding/1884.php.expect b/hphp/test/slow/late_static_binding/1884.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1884.php.expect
rename to hphp/test/slow/late_static_binding/1884.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1885.php b/hphp/test/slow/late_static_binding/1885.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1885.php
rename to hphp/test/slow/late_static_binding/1885.php
diff --git a/hphp/test/tcr/late_static_binding/1885.php.expect b/hphp/test/slow/late_static_binding/1885.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1885.php.expect
rename to hphp/test/slow/late_static_binding/1885.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1886.php b/hphp/test/slow/late_static_binding/1886.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1886.php
rename to hphp/test/slow/late_static_binding/1886.php
diff --git a/hphp/test/tcr/late_static_binding/1886.php.expect b/hphp/test/slow/late_static_binding/1886.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1886.php.expect
rename to hphp/test/slow/late_static_binding/1886.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1887.php b/hphp/test/slow/late_static_binding/1887.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1887.php
rename to hphp/test/slow/late_static_binding/1887.php
diff --git a/hphp/test/tcr/late_static_binding/1887.php.expect b/hphp/test/slow/late_static_binding/1887.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1887.php.expect
rename to hphp/test/slow/late_static_binding/1887.php.expect
diff --git a/hphp/test/tcr/late_static_binding/1888.php b/hphp/test/slow/late_static_binding/1888.php
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1888.php
rename to hphp/test/slow/late_static_binding/1888.php
diff --git a/hphp/test/tcr/late_static_binding/1888.php.expect b/hphp/test/slow/late_static_binding/1888.php.expect
similarity index 100%
rename from hphp/test/tcr/late_static_binding/1888.php.expect
rename to hphp/test/slow/late_static_binding/1888.php.expect
diff --git a/hphp/test/tcr/list_assignment/30.php b/hphp/test/slow/list_assignment/30.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/30.php
rename to hphp/test/slow/list_assignment/30.php
diff --git a/hphp/test/tcr/list_assignment/30.php.expect b/hphp/test/slow/list_assignment/30.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/30.php.expect
rename to hphp/test/slow/list_assignment/30.php.expect
diff --git a/hphp/test/tcr/list_assignment/31.php b/hphp/test/slow/list_assignment/31.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/31.php
rename to hphp/test/slow/list_assignment/31.php
diff --git a/hphp/test/tcr/list_assignment/31.php.expect b/hphp/test/slow/list_assignment/31.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/31.php.expect
rename to hphp/test/slow/list_assignment/31.php.expect
diff --git a/hphp/test/tcr/list_assignment/32.php b/hphp/test/slow/list_assignment/32.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/32.php
rename to hphp/test/slow/list_assignment/32.php
diff --git a/hphp/test/tcr/list_assignment/32.php.expect b/hphp/test/slow/list_assignment/32.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/32.php.expect
rename to hphp/test/slow/list_assignment/32.php.expect
diff --git a/hphp/test/tcr/list_assignment/33.php b/hphp/test/slow/list_assignment/33.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/33.php
rename to hphp/test/slow/list_assignment/33.php
diff --git a/hphp/test/tcr/redeclared_classes/1471.php.expect b/hphp/test/slow/list_assignment/33.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1471.php.expect
rename to hphp/test/slow/list_assignment/33.php.expect
diff --git a/hphp/test/tcr/list_assignment/34.php b/hphp/test/slow/list_assignment/34.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/34.php
rename to hphp/test/slow/list_assignment/34.php
diff --git a/hphp/test/tcr/redeclared_classes/1483.php.expect b/hphp/test/slow/list_assignment/34.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1483.php.expect
rename to hphp/test/slow/list_assignment/34.php.expect
diff --git a/hphp/test/tcr/list_assignment/35.php b/hphp/test/slow/list_assignment/35.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/35.php
rename to hphp/test/slow/list_assignment/35.php
diff --git a/hphp/test/tcr/list_assignment/35.php.expect b/hphp/test/slow/list_assignment/35.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/35.php.expect
rename to hphp/test/slow/list_assignment/35.php.expect
diff --git a/hphp/test/tcr/list_assignment/36.php b/hphp/test/slow/list_assignment/36.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/36.php
rename to hphp/test/slow/list_assignment/36.php
diff --git a/hphp/test/tcr/list_assignment/36.php.expect b/hphp/test/slow/list_assignment/36.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/36.php.expect
rename to hphp/test/slow/list_assignment/36.php.expect
diff --git a/hphp/test/tcr/list_assignment/37.php b/hphp/test/slow/list_assignment/37.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/37.php
rename to hphp/test/slow/list_assignment/37.php
diff --git a/hphp/test/tcr/list_assignment/37.php.expect b/hphp/test/slow/list_assignment/37.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/37.php.expect
rename to hphp/test/slow/list_assignment/37.php.expect
diff --git a/hphp/test/tcr/list_assignment/38.php b/hphp/test/slow/list_assignment/38.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/38.php
rename to hphp/test/slow/list_assignment/38.php
diff --git a/hphp/test/tcr/list_assignment/38.php.expect b/hphp/test/slow/list_assignment/38.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/38.php.expect
rename to hphp/test/slow/list_assignment/38.php.expect
diff --git a/hphp/test/tcr/list_assignment/39.php b/hphp/test/slow/list_assignment/39.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/39.php
rename to hphp/test/slow/list_assignment/39.php
diff --git a/hphp/test/tcr/list_assignment/39.php.expect b/hphp/test/slow/list_assignment/39.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/39.php.expect
rename to hphp/test/slow/list_assignment/39.php.expect
diff --git a/hphp/test/tcr/list_assignment/40.php b/hphp/test/slow/list_assignment/40.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/40.php
rename to hphp/test/slow/list_assignment/40.php
diff --git a/hphp/test/tcr/list_assignment/40.php.expect b/hphp/test/slow/list_assignment/40.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/40.php.expect
rename to hphp/test/slow/list_assignment/40.php.expect
diff --git a/hphp/test/tcr/list_assignment/41.php b/hphp/test/slow/list_assignment/41.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/41.php
rename to hphp/test/slow/list_assignment/41.php
diff --git a/hphp/test/tcr/list_assignment/41.php.expect b/hphp/test/slow/list_assignment/41.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/41.php.expect
rename to hphp/test/slow/list_assignment/41.php.expect
diff --git a/hphp/test/tcr/list_assignment/42.php b/hphp/test/slow/list_assignment/42.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/42.php
rename to hphp/test/slow/list_assignment/42.php
diff --git a/hphp/test/tcr/list_assignment/42.php.expect b/hphp/test/slow/list_assignment/42.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/42.php.expect
rename to hphp/test/slow/list_assignment/42.php.expect
diff --git a/hphp/test/tcr/list_assignment/43.php b/hphp/test/slow/list_assignment/43.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/43.php
rename to hphp/test/slow/list_assignment/43.php
diff --git a/hphp/test/tcr/list_assignment/43.php.expect b/hphp/test/slow/list_assignment/43.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/43.php.expect
rename to hphp/test/slow/list_assignment/43.php.expect
diff --git a/hphp/test/tcr/list_assignment/44.php b/hphp/test/slow/list_assignment/44.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/44.php
rename to hphp/test/slow/list_assignment/44.php
diff --git a/hphp/test/tcr/list_assignment/44.php.expect b/hphp/test/slow/list_assignment/44.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/44.php.expect
rename to hphp/test/slow/list_assignment/44.php.expect
diff --git a/hphp/test/tcr/list_assignment/45.php b/hphp/test/slow/list_assignment/45.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/45.php
rename to hphp/test/slow/list_assignment/45.php
diff --git a/hphp/test/tcr/list_assignment/45.php.expect b/hphp/test/slow/list_assignment/45.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/45.php.expect
rename to hphp/test/slow/list_assignment/45.php.expect
diff --git a/hphp/test/tcr/list_assignment/46.php b/hphp/test/slow/list_assignment/46.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/46.php
rename to hphp/test/slow/list_assignment/46.php
diff --git a/hphp/test/tcr/list_assignment/46.php.expect b/hphp/test/slow/list_assignment/46.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/46.php.expect
rename to hphp/test/slow/list_assignment/46.php.expect
diff --git a/hphp/test/tcr/list_assignment/47.php b/hphp/test/slow/list_assignment/47.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/47.php
rename to hphp/test/slow/list_assignment/47.php
diff --git a/hphp/test/tcr/list_assignment/47.php.expect b/hphp/test/slow/list_assignment/47.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/47.php.expect
rename to hphp/test/slow/list_assignment/47.php.expect
diff --git a/hphp/test/tcr/list_assignment/48.php b/hphp/test/slow/list_assignment/48.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/48.php
rename to hphp/test/slow/list_assignment/48.php
diff --git a/hphp/test/tcr/redeclared_functions/1460.php.expect b/hphp/test/slow/list_assignment/48.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_functions/1460.php.expect
rename to hphp/test/slow/list_assignment/48.php.expect
diff --git a/hphp/test/tcr/list_assignment/49.php b/hphp/test/slow/list_assignment/49.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/49.php
rename to hphp/test/slow/list_assignment/49.php
diff --git a/hphp/test/tcr/list_assignment/49.php.expect b/hphp/test/slow/list_assignment/49.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/49.php.expect
rename to hphp/test/slow/list_assignment/49.php.expect
diff --git a/hphp/test/tcr/list_assignment/50.php b/hphp/test/slow/list_assignment/50.php
similarity index 100%
rename from hphp/test/tcr/list_assignment/50.php
rename to hphp/test/slow/list_assignment/50.php
diff --git a/hphp/test/tcr/list_assignment/50.php.expect b/hphp/test/slow/list_assignment/50.php.expect
similarity index 100%
rename from hphp/test/tcr/list_assignment/50.php.expect
rename to hphp/test/slow/list_assignment/50.php.expect
diff --git a/hphp/test/tcr/locale/173.php b/hphp/test/slow/locale/173.php
similarity index 100%
rename from hphp/test/tcr/locale/173.php
rename to hphp/test/slow/locale/173.php
diff --git a/hphp/test/tcr/locale/173.php.expect b/hphp/test/slow/locale/173.php.expect
similarity index 100%
rename from hphp/test/tcr/locale/173.php.expect
rename to hphp/test/slow/locale/173.php.expect
diff --git a/hphp/test/tcr/locale/174.php b/hphp/test/slow/locale/174.php
similarity index 100%
rename from hphp/test/tcr/locale/174.php
rename to hphp/test/slow/locale/174.php
diff --git a/hphp/test/tcr/locale/174.php.expect b/hphp/test/slow/locale/174.php.expect
similarity index 100%
rename from hphp/test/tcr/locale/174.php.expect
rename to hphp/test/slow/locale/174.php.expect
diff --git a/hphp/test/tcr/locale/175.php b/hphp/test/slow/locale/175.php
similarity index 100%
rename from hphp/test/tcr/locale/175.php
rename to hphp/test/slow/locale/175.php
diff --git a/hphp/test/tcr/locale/175.php.expect b/hphp/test/slow/locale/175.php.expect
similarity index 100%
rename from hphp/test/tcr/locale/175.php.expect
rename to hphp/test/slow/locale/175.php.expect
diff --git a/hphp/test/tcr/locale/176.php b/hphp/test/slow/locale/176.php
similarity index 100%
rename from hphp/test/tcr/locale/176.php
rename to hphp/test/slow/locale/176.php
diff --git a/hphp/test/tcr/locale/176.php.expect b/hphp/test/slow/locale/176.php.expect
similarity index 100%
rename from hphp/test/tcr/locale/176.php.expect
rename to hphp/test/slow/locale/176.php.expect
diff --git a/hphp/test/tcr/logical_operators/1451.php b/hphp/test/slow/logical_operators/1451.php
similarity index 100%
rename from hphp/test/tcr/logical_operators/1451.php
rename to hphp/test/slow/logical_operators/1451.php
diff --git a/hphp/test/tcr/logical_operators/1451.php.expect b/hphp/test/slow/logical_operators/1451.php.expect
similarity index 100%
rename from hphp/test/tcr/logical_operators/1451.php.expect
rename to hphp/test/slow/logical_operators/1451.php.expect
diff --git a/hphp/test/tcr/logical_operators/1452.php b/hphp/test/slow/logical_operators/1452.php
similarity index 100%
rename from hphp/test/tcr/logical_operators/1452.php
rename to hphp/test/slow/logical_operators/1452.php
diff --git a/hphp/test/tcr/logical_operators/1452.php.expect b/hphp/test/slow/logical_operators/1452.php.expect
similarity index 100%
rename from hphp/test/tcr/logical_operators/1452.php.expect
rename to hphp/test/slow/logical_operators/1452.php.expect
diff --git a/hphp/test/tcr/logical_operators/1453.php b/hphp/test/slow/logical_operators/1453.php
similarity index 100%
rename from hphp/test/tcr/logical_operators/1453.php
rename to hphp/test/slow/logical_operators/1453.php
diff --git a/hphp/test/tcr/logical_operators/1453.php.expect b/hphp/test/slow/logical_operators/1453.php.expect
similarity index 100%
rename from hphp/test/tcr/logical_operators/1453.php.expect
rename to hphp/test/slow/logical_operators/1453.php.expect
diff --git a/hphp/test/tcr/logical_operators/1454.php b/hphp/test/slow/logical_operators/1454.php
similarity index 100%
rename from hphp/test/tcr/logical_operators/1454.php
rename to hphp/test/slow/logical_operators/1454.php
diff --git a/hphp/test/tcr/logical_operators/1454.php.expect b/hphp/test/slow/logical_operators/1454.php.expect
similarity index 100%
rename from hphp/test/tcr/logical_operators/1454.php.expect
rename to hphp/test/slow/logical_operators/1454.php.expect
diff --git a/hphp/test/tcr/max_int/1201.php b/hphp/test/slow/max_int/1201.php
similarity index 100%
rename from hphp/test/tcr/max_int/1201.php
rename to hphp/test/slow/max_int/1201.php
diff --git a/hphp/test/tcr/max_int/1201.php.expect b/hphp/test/slow/max_int/1201.php.expect
similarity index 100%
rename from hphp/test/tcr/max_int/1201.php.expect
rename to hphp/test/slow/max_int/1201.php.expect
diff --git a/hphp/test/tcr/minus/1423.php b/hphp/test/slow/minus/1423.php
similarity index 100%
rename from hphp/test/tcr/minus/1423.php
rename to hphp/test/slow/minus/1423.php
diff --git a/hphp/test/tcr/minus/1423.php.expect b/hphp/test/slow/minus/1423.php.expect
similarity index 100%
rename from hphp/test/tcr/minus/1423.php.expect
rename to hphp/test/slow/minus/1423.php.expect
diff --git a/hphp/test/tcr/minus/1424.php b/hphp/test/slow/minus/1424.php
similarity index 100%
rename from hphp/test/tcr/minus/1424.php
rename to hphp/test/slow/minus/1424.php
diff --git a/hphp/test/tcr/minus/1424.php.expect b/hphp/test/slow/minus/1424.php.expect
similarity index 100%
rename from hphp/test/tcr/minus/1424.php.expect
rename to hphp/test/slow/minus/1424.php.expect
diff --git a/hphp/test/tcr/modulus/1429.php b/hphp/test/slow/modulus/1429.php
similarity index 100%
rename from hphp/test/tcr/modulus/1429.php
rename to hphp/test/slow/modulus/1429.php
diff --git a/hphp/test/tcr/modulus/1429.php.expect b/hphp/test/slow/modulus/1429.php.expect
similarity index 100%
rename from hphp/test/tcr/modulus/1429.php.expect
rename to hphp/test/slow/modulus/1429.php.expect
diff --git a/hphp/test/tcr/modulus/1430.php b/hphp/test/slow/modulus/1430.php
similarity index 100%
rename from hphp/test/tcr/modulus/1430.php
rename to hphp/test/slow/modulus/1430.php
diff --git a/hphp/test/tcr/modulus/1430.php.expect b/hphp/test/slow/modulus/1430.php.expect
similarity index 100%
rename from hphp/test/tcr/modulus/1430.php.expect
rename to hphp/test/slow/modulus/1430.php.expect
diff --git a/hphp/test/tcr/modulus/1431.php b/hphp/test/slow/modulus/1431.php
similarity index 100%
rename from hphp/test/tcr/modulus/1431.php
rename to hphp/test/slow/modulus/1431.php
diff --git a/hphp/test/tcr/modulus/1431.php.expect b/hphp/test/slow/modulus/1431.php.expect
similarity index 100%
rename from hphp/test/tcr/modulus/1431.php.expect
rename to hphp/test/slow/modulus/1431.php.expect
diff --git a/hphp/test/tcr/multiply/1425.php b/hphp/test/slow/multiply/1425.php
similarity index 100%
rename from hphp/test/tcr/multiply/1425.php
rename to hphp/test/slow/multiply/1425.php
diff --git a/hphp/test/tcr/multiply/1425.php.expect b/hphp/test/slow/multiply/1425.php.expect
similarity index 100%
rename from hphp/test/tcr/multiply/1425.php.expect
rename to hphp/test/slow/multiply/1425.php.expect
diff --git a/hphp/test/tcr/multiply/1426.php b/hphp/test/slow/multiply/1426.php
similarity index 100%
rename from hphp/test/tcr/multiply/1426.php
rename to hphp/test/slow/multiply/1426.php
diff --git a/hphp/test/tcr/multiply/1426.php.expect b/hphp/test/slow/multiply/1426.php.expect
similarity index 100%
rename from hphp/test/tcr/multiply/1426.php.expect
rename to hphp/test/slow/multiply/1426.php.expect
diff --git a/hphp/test/tcr/new_object_expression/775.php b/hphp/test/slow/new_object_expression/775.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/775.php
rename to hphp/test/slow/new_object_expression/775.php
diff --git a/hphp/test/tcr/new_object_expression/775.php.expect b/hphp/test/slow/new_object_expression/775.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/775.php.expect
rename to hphp/test/slow/new_object_expression/775.php.expect
diff --git a/hphp/test/tcr/new_object_expression/776.php b/hphp/test/slow/new_object_expression/776.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/776.php
rename to hphp/test/slow/new_object_expression/776.php
diff --git a/hphp/test/tcr/new_object_expression/776.php.expect b/hphp/test/slow/new_object_expression/776.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/776.php.expect
rename to hphp/test/slow/new_object_expression/776.php.expect
diff --git a/hphp/test/tcr/new_object_expression/777.php b/hphp/test/slow/new_object_expression/777.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/777.php
rename to hphp/test/slow/new_object_expression/777.php
diff --git a/hphp/test/tcr/new_object_expression/777.php.expect b/hphp/test/slow/new_object_expression/777.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/777.php.expect
rename to hphp/test/slow/new_object_expression/777.php.expect
diff --git a/hphp/test/tcr/new_object_expression/778.php b/hphp/test/slow/new_object_expression/778.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/778.php
rename to hphp/test/slow/new_object_expression/778.php
diff --git a/hphp/test/tcr/reference/1056.php.expect b/hphp/test/slow/new_object_expression/778.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1056.php.expect
rename to hphp/test/slow/new_object_expression/778.php.expect
diff --git a/hphp/test/tcr/new_object_expression/779.php b/hphp/test/slow/new_object_expression/779.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/779.php
rename to hphp/test/slow/new_object_expression/779.php
diff --git a/hphp/test/tcr/new_object_expression/779.php.expect b/hphp/test/slow/new_object_expression/779.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/779.php.expect
rename to hphp/test/slow/new_object_expression/779.php.expect
diff --git a/hphp/test/tcr/new_object_expression/780.php b/hphp/test/slow/new_object_expression/780.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/780.php
rename to hphp/test/slow/new_object_expression/780.php
diff --git a/hphp/test/tcr/new_object_expression/780.php.expect b/hphp/test/slow/new_object_expression/780.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/780.php.expect
rename to hphp/test/slow/new_object_expression/780.php.expect
diff --git a/hphp/test/tcr/new_object_expression/781.php b/hphp/test/slow/new_object_expression/781.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/781.php
rename to hphp/test/slow/new_object_expression/781.php
diff --git a/hphp/test/tcr/new_object_expression/781.php.expect b/hphp/test/slow/new_object_expression/781.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/781.php.expect
rename to hphp/test/slow/new_object_expression/781.php.expect
diff --git a/hphp/test/tcr/new_object_expression/782.php b/hphp/test/slow/new_object_expression/782.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/782.php
rename to hphp/test/slow/new_object_expression/782.php
diff --git a/hphp/test/tcr/rename_function/1194.php.expect b/hphp/test/slow/new_object_expression/782.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1194.php.expect
rename to hphp/test/slow/new_object_expression/782.php.expect
diff --git a/hphp/test/tcr/new_object_expression/783.php b/hphp/test/slow/new_object_expression/783.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/783.php
rename to hphp/test/slow/new_object_expression/783.php
diff --git a/hphp/test/tcr/new_object_expression/783.php.expect b/hphp/test/slow/new_object_expression/783.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/783.php.expect
rename to hphp/test/slow/new_object_expression/783.php.expect
diff --git a/hphp/test/tcr/new_object_expression/784.php b/hphp/test/slow/new_object_expression/784.php
similarity index 100%
rename from hphp/test/tcr/new_object_expression/784.php
rename to hphp/test/slow/new_object_expression/784.php
diff --git a/hphp/test/tcr/new_object_expression/784.php.expect b/hphp/test/slow/new_object_expression/784.php.expect
similarity index 100%
rename from hphp/test/tcr/new_object_expression/784.php.expect
rename to hphp/test/slow/new_object_expression/784.php.expect
diff --git a/hphp/test/tcr/now_doc/1906.php b/hphp/test/slow/now_doc/1906.php
similarity index 100%
rename from hphp/test/tcr/now_doc/1906.php
rename to hphp/test/slow/now_doc/1906.php
diff --git a/hphp/test/tcr/now_doc/1906.php.expect b/hphp/test/slow/now_doc/1906.php.expect
similarity index 100%
rename from hphp/test/tcr/now_doc/1906.php.expect
rename to hphp/test/slow/now_doc/1906.php.expect
diff --git a/hphp/test/tcr/now_doc/1907.php b/hphp/test/slow/now_doc/1907.php
similarity index 100%
rename from hphp/test/tcr/now_doc/1907.php
rename to hphp/test/slow/now_doc/1907.php
diff --git a/hphp/test/tcr/now_doc/1907.php.expect b/hphp/test/slow/now_doc/1907.php.expect
similarity index 100%
rename from hphp/test/tcr/now_doc/1907.php.expect
rename to hphp/test/slow/now_doc/1907.php.expect
diff --git a/hphp/test/tcr/object/640.php b/hphp/test/slow/object/640.php
similarity index 100%
rename from hphp/test/tcr/object/640.php
rename to hphp/test/slow/object/640.php
diff --git a/hphp/test/tcr/object/640.php.expect b/hphp/test/slow/object/640.php.expect
similarity index 100%
rename from hphp/test/tcr/object/640.php.expect
rename to hphp/test/slow/object/640.php.expect
diff --git a/hphp/test/tcr/object/640.php.hphp_opts b/hphp/test/slow/object/640.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/640.php.hphp_opts
rename to hphp/test/slow/object/640.php.hphp_opts
diff --git a/hphp/test/tcr/object/640.php.opts b/hphp/test/slow/object/640.php.opts
similarity index 100%
rename from hphp/test/tcr/object/640.php.opts
rename to hphp/test/slow/object/640.php.opts
diff --git a/hphp/test/tcr/object/641.php b/hphp/test/slow/object/641.php
similarity index 100%
rename from hphp/test/tcr/object/641.php
rename to hphp/test/slow/object/641.php
diff --git a/hphp/test/tcr/object/641.php.expect b/hphp/test/slow/object/641.php.expect
similarity index 100%
rename from hphp/test/tcr/object/641.php.expect
rename to hphp/test/slow/object/641.php.expect
diff --git a/hphp/test/tcr/object/641.php.hphp_opts b/hphp/test/slow/object/641.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/641.php.hphp_opts
rename to hphp/test/slow/object/641.php.hphp_opts
diff --git a/hphp/test/tcr/object/641.php.opts b/hphp/test/slow/object/641.php.opts
similarity index 100%
rename from hphp/test/tcr/object/641.php.opts
rename to hphp/test/slow/object/641.php.opts
diff --git a/hphp/test/tcr/object/642.php b/hphp/test/slow/object/642.php
similarity index 100%
rename from hphp/test/tcr/object/642.php
rename to hphp/test/slow/object/642.php
diff --git a/hphp/test/tcr/object/642.php.expect b/hphp/test/slow/object/642.php.expect
similarity index 100%
rename from hphp/test/tcr/object/642.php.expect
rename to hphp/test/slow/object/642.php.expect
diff --git a/hphp/test/tcr/object/642.php.hphp_opts b/hphp/test/slow/object/642.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/642.php.hphp_opts
rename to hphp/test/slow/object/642.php.hphp_opts
diff --git a/hphp/test/tcr/object/642.php.opts b/hphp/test/slow/object/642.php.opts
similarity index 100%
rename from hphp/test/tcr/object/642.php.opts
rename to hphp/test/slow/object/642.php.opts
diff --git a/hphp/test/tcr/object/643.php b/hphp/test/slow/object/643.php
similarity index 100%
rename from hphp/test/tcr/object/643.php
rename to hphp/test/slow/object/643.php
diff --git a/hphp/test/tcr/object/643.php.expect b/hphp/test/slow/object/643.php.expect
similarity index 100%
rename from hphp/test/tcr/object/643.php.expect
rename to hphp/test/slow/object/643.php.expect
diff --git a/hphp/test/tcr/object/643.php.hphp_opts b/hphp/test/slow/object/643.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/643.php.hphp_opts
rename to hphp/test/slow/object/643.php.hphp_opts
diff --git a/hphp/test/tcr/object/643.php.opts b/hphp/test/slow/object/643.php.opts
similarity index 100%
rename from hphp/test/tcr/object/643.php.opts
rename to hphp/test/slow/object/643.php.opts
diff --git a/hphp/test/tcr/object/644.php b/hphp/test/slow/object/644.php
similarity index 100%
rename from hphp/test/tcr/object/644.php
rename to hphp/test/slow/object/644.php
diff --git a/hphp/test/tcr/object/644.php.expect b/hphp/test/slow/object/644.php.expect
similarity index 100%
rename from hphp/test/tcr/object/644.php.expect
rename to hphp/test/slow/object/644.php.expect
diff --git a/hphp/test/tcr/object/644.php.hphp_opts b/hphp/test/slow/object/644.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/644.php.hphp_opts
rename to hphp/test/slow/object/644.php.hphp_opts
diff --git a/hphp/test/tcr/object/644.php.opts b/hphp/test/slow/object/644.php.opts
similarity index 100%
rename from hphp/test/tcr/object/644.php.opts
rename to hphp/test/slow/object/644.php.opts
diff --git a/hphp/test/tcr/object/645.php b/hphp/test/slow/object/645.php
similarity index 100%
rename from hphp/test/tcr/object/645.php
rename to hphp/test/slow/object/645.php
diff --git a/hphp/test/tcr/object/645.php.expect b/hphp/test/slow/object/645.php.expect
similarity index 100%
rename from hphp/test/tcr/object/645.php.expect
rename to hphp/test/slow/object/645.php.expect
diff --git a/hphp/test/tcr/object/645.php.hphp_opts b/hphp/test/slow/object/645.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/645.php.hphp_opts
rename to hphp/test/slow/object/645.php.hphp_opts
diff --git a/hphp/test/tcr/object/645.php.opts b/hphp/test/slow/object/645.php.opts
similarity index 100%
rename from hphp/test/tcr/object/645.php.opts
rename to hphp/test/slow/object/645.php.opts
diff --git a/hphp/test/tcr/object/646.php b/hphp/test/slow/object/646.php
similarity index 100%
rename from hphp/test/tcr/object/646.php
rename to hphp/test/slow/object/646.php
diff --git a/hphp/test/tcr/object/646.php.expect b/hphp/test/slow/object/646.php.expect
similarity index 100%
rename from hphp/test/tcr/object/646.php.expect
rename to hphp/test/slow/object/646.php.expect
diff --git a/hphp/test/tcr/object/646.php.hphp_opts b/hphp/test/slow/object/646.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/646.php.hphp_opts
rename to hphp/test/slow/object/646.php.hphp_opts
diff --git a/hphp/test/tcr/object/646.php.opts b/hphp/test/slow/object/646.php.opts
similarity index 100%
rename from hphp/test/tcr/object/646.php.opts
rename to hphp/test/slow/object/646.php.opts
diff --git a/hphp/test/tcr/object/647.php b/hphp/test/slow/object/647.php
similarity index 100%
rename from hphp/test/tcr/object/647.php
rename to hphp/test/slow/object/647.php
diff --git a/hphp/test/tcr/object/647.php.expect b/hphp/test/slow/object/647.php.expect
similarity index 100%
rename from hphp/test/tcr/object/647.php.expect
rename to hphp/test/slow/object/647.php.expect
diff --git a/hphp/test/tcr/object/647.php.hphp_opts b/hphp/test/slow/object/647.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/647.php.hphp_opts
rename to hphp/test/slow/object/647.php.hphp_opts
diff --git a/hphp/test/tcr/object/647.php.opts b/hphp/test/slow/object/647.php.opts
similarity index 100%
rename from hphp/test/tcr/object/647.php.opts
rename to hphp/test/slow/object/647.php.opts
diff --git a/hphp/test/tcr/object/648.php b/hphp/test/slow/object/648.php
similarity index 100%
rename from hphp/test/tcr/object/648.php
rename to hphp/test/slow/object/648.php
diff --git a/hphp/test/tcr/object/648.php.expect b/hphp/test/slow/object/648.php.expect
similarity index 100%
rename from hphp/test/tcr/object/648.php.expect
rename to hphp/test/slow/object/648.php.expect
diff --git a/hphp/test/tcr/object/648.php.hphp_opts b/hphp/test/slow/object/648.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/648.php.hphp_opts
rename to hphp/test/slow/object/648.php.hphp_opts
diff --git a/hphp/test/tcr/object/648.php.opts b/hphp/test/slow/object/648.php.opts
similarity index 100%
rename from hphp/test/tcr/object/648.php.opts
rename to hphp/test/slow/object/648.php.opts
diff --git a/hphp/test/tcr/object/649.php b/hphp/test/slow/object/649.php
similarity index 100%
rename from hphp/test/tcr/object/649.php
rename to hphp/test/slow/object/649.php
diff --git a/hphp/test/tcr/object/649.php.expect b/hphp/test/slow/object/649.php.expect
similarity index 100%
rename from hphp/test/tcr/object/649.php.expect
rename to hphp/test/slow/object/649.php.expect
diff --git a/hphp/test/tcr/object/649.php.hphp_opts b/hphp/test/slow/object/649.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/649.php.hphp_opts
rename to hphp/test/slow/object/649.php.hphp_opts
diff --git a/hphp/test/tcr/object/649.php.opts b/hphp/test/slow/object/649.php.opts
similarity index 100%
rename from hphp/test/tcr/object/649.php.opts
rename to hphp/test/slow/object/649.php.opts
diff --git a/hphp/test/tcr/object/650.php b/hphp/test/slow/object/650.php
similarity index 100%
rename from hphp/test/tcr/object/650.php
rename to hphp/test/slow/object/650.php
diff --git a/hphp/test/tcr/object/650.php.expect b/hphp/test/slow/object/650.php.expect
similarity index 100%
rename from hphp/test/tcr/object/650.php.expect
rename to hphp/test/slow/object/650.php.expect
diff --git a/hphp/test/tcr/object/650.php.hphp_opts b/hphp/test/slow/object/650.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/650.php.hphp_opts
rename to hphp/test/slow/object/650.php.hphp_opts
diff --git a/hphp/test/tcr/object/650.php.opts b/hphp/test/slow/object/650.php.opts
similarity index 100%
rename from hphp/test/tcr/object/650.php.opts
rename to hphp/test/slow/object/650.php.opts
diff --git a/hphp/test/tcr/object/651.php b/hphp/test/slow/object/651.php
similarity index 100%
rename from hphp/test/tcr/object/651.php
rename to hphp/test/slow/object/651.php
diff --git a/hphp/test/tcr/object/651.php.expect b/hphp/test/slow/object/651.php.expect
similarity index 100%
rename from hphp/test/tcr/object/651.php.expect
rename to hphp/test/slow/object/651.php.expect
diff --git a/hphp/test/tcr/object/651.php.hphp_opts b/hphp/test/slow/object/651.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/651.php.hphp_opts
rename to hphp/test/slow/object/651.php.hphp_opts
diff --git a/hphp/test/tcr/object/651.php.opts b/hphp/test/slow/object/651.php.opts
similarity index 100%
rename from hphp/test/tcr/object/651.php.opts
rename to hphp/test/slow/object/651.php.opts
diff --git a/hphp/test/tcr/object/652.php b/hphp/test/slow/object/652.php
similarity index 100%
rename from hphp/test/tcr/object/652.php
rename to hphp/test/slow/object/652.php
diff --git a/hphp/test/tcr/object/652.php.expect b/hphp/test/slow/object/652.php.expect
similarity index 100%
rename from hphp/test/tcr/object/652.php.expect
rename to hphp/test/slow/object/652.php.expect
diff --git a/hphp/test/tcr/object/652.php.hphp_opts b/hphp/test/slow/object/652.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/652.php.hphp_opts
rename to hphp/test/slow/object/652.php.hphp_opts
diff --git a/hphp/test/tcr/object/652.php.opts b/hphp/test/slow/object/652.php.opts
similarity index 100%
rename from hphp/test/tcr/object/652.php.opts
rename to hphp/test/slow/object/652.php.opts
diff --git a/hphp/test/tcr/object/653.php b/hphp/test/slow/object/653.php
similarity index 100%
rename from hphp/test/tcr/object/653.php
rename to hphp/test/slow/object/653.php
diff --git a/hphp/test/tcr/object/653.php.expect b/hphp/test/slow/object/653.php.expect
similarity index 100%
rename from hphp/test/tcr/object/653.php.expect
rename to hphp/test/slow/object/653.php.expect
diff --git a/hphp/test/tcr/object/653.php.hphp_opts b/hphp/test/slow/object/653.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/653.php.hphp_opts
rename to hphp/test/slow/object/653.php.hphp_opts
diff --git a/hphp/test/tcr/object/653.php.opts b/hphp/test/slow/object/653.php.opts
similarity index 100%
rename from hphp/test/tcr/object/653.php.opts
rename to hphp/test/slow/object/653.php.opts
diff --git a/hphp/test/tcr/object/654.php b/hphp/test/slow/object/654.php
similarity index 100%
rename from hphp/test/tcr/object/654.php
rename to hphp/test/slow/object/654.php
diff --git a/hphp/test/tcr/object/654.php.expect b/hphp/test/slow/object/654.php.expect
similarity index 100%
rename from hphp/test/tcr/object/654.php.expect
rename to hphp/test/slow/object/654.php.expect
diff --git a/hphp/test/tcr/object/654.php.hphp_opts b/hphp/test/slow/object/654.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/654.php.hphp_opts
rename to hphp/test/slow/object/654.php.hphp_opts
diff --git a/hphp/test/tcr/object/654.php.opts b/hphp/test/slow/object/654.php.opts
similarity index 100%
rename from hphp/test/tcr/object/654.php.opts
rename to hphp/test/slow/object/654.php.opts
diff --git a/hphp/test/tcr/object/655.php b/hphp/test/slow/object/655.php
similarity index 100%
rename from hphp/test/tcr/object/655.php
rename to hphp/test/slow/object/655.php
diff --git a/hphp/test/tcr/object/655.php.expect b/hphp/test/slow/object/655.php.expect
similarity index 100%
rename from hphp/test/tcr/object/655.php.expect
rename to hphp/test/slow/object/655.php.expect
diff --git a/hphp/test/tcr/object/655.php.hphp_opts b/hphp/test/slow/object/655.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/655.php.hphp_opts
rename to hphp/test/slow/object/655.php.hphp_opts
diff --git a/hphp/test/tcr/object/655.php.opts b/hphp/test/slow/object/655.php.opts
similarity index 100%
rename from hphp/test/tcr/object/655.php.opts
rename to hphp/test/slow/object/655.php.opts
diff --git a/hphp/test/tcr/object/656.php b/hphp/test/slow/object/656.php
similarity index 100%
rename from hphp/test/tcr/object/656.php
rename to hphp/test/slow/object/656.php
diff --git a/hphp/test/tcr/object/656.php.expect b/hphp/test/slow/object/656.php.expect
similarity index 100%
rename from hphp/test/tcr/object/656.php.expect
rename to hphp/test/slow/object/656.php.expect
diff --git a/hphp/test/tcr/object/656.php.hphp_opts b/hphp/test/slow/object/656.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/656.php.hphp_opts
rename to hphp/test/slow/object/656.php.hphp_opts
diff --git a/hphp/test/tcr/object/656.php.opts b/hphp/test/slow/object/656.php.opts
similarity index 100%
rename from hphp/test/tcr/object/656.php.opts
rename to hphp/test/slow/object/656.php.opts
diff --git a/hphp/test/tcr/object/657.php b/hphp/test/slow/object/657.php
similarity index 100%
rename from hphp/test/tcr/object/657.php
rename to hphp/test/slow/object/657.php
diff --git a/hphp/test/tcr/object/657.php.expect b/hphp/test/slow/object/657.php.expect
similarity index 100%
rename from hphp/test/tcr/object/657.php.expect
rename to hphp/test/slow/object/657.php.expect
diff --git a/hphp/test/tcr/object/657.php.hphp_opts b/hphp/test/slow/object/657.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/657.php.hphp_opts
rename to hphp/test/slow/object/657.php.hphp_opts
diff --git a/hphp/test/tcr/object/657.php.opts b/hphp/test/slow/object/657.php.opts
similarity index 100%
rename from hphp/test/tcr/object/657.php.opts
rename to hphp/test/slow/object/657.php.opts
diff --git a/hphp/test/tcr/object/658.php b/hphp/test/slow/object/658.php
similarity index 100%
rename from hphp/test/tcr/object/658.php
rename to hphp/test/slow/object/658.php
diff --git a/hphp/test/tcr/object/658.php.expect b/hphp/test/slow/object/658.php.expect
similarity index 100%
rename from hphp/test/tcr/object/658.php.expect
rename to hphp/test/slow/object/658.php.expect
diff --git a/hphp/test/tcr/object/658.php.hphp_opts b/hphp/test/slow/object/658.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/658.php.hphp_opts
rename to hphp/test/slow/object/658.php.hphp_opts
diff --git a/hphp/test/tcr/object/658.php.opts b/hphp/test/slow/object/658.php.opts
similarity index 100%
rename from hphp/test/tcr/object/658.php.opts
rename to hphp/test/slow/object/658.php.opts
diff --git a/hphp/test/tcr/object/659.php b/hphp/test/slow/object/659.php
similarity index 100%
rename from hphp/test/tcr/object/659.php
rename to hphp/test/slow/object/659.php
diff --git a/hphp/test/tcr/object/659.php.expect b/hphp/test/slow/object/659.php.expect
similarity index 100%
rename from hphp/test/tcr/object/659.php.expect
rename to hphp/test/slow/object/659.php.expect
diff --git a/hphp/test/tcr/object/659.php.hphp_opts b/hphp/test/slow/object/659.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/659.php.hphp_opts
rename to hphp/test/slow/object/659.php.hphp_opts
diff --git a/hphp/test/tcr/object/659.php.opts b/hphp/test/slow/object/659.php.opts
similarity index 100%
rename from hphp/test/tcr/object/659.php.opts
rename to hphp/test/slow/object/659.php.opts
diff --git a/hphp/test/tcr/object/660.php b/hphp/test/slow/object/660.php
similarity index 100%
rename from hphp/test/tcr/object/660.php
rename to hphp/test/slow/object/660.php
diff --git a/hphp/test/tcr/object/660.php.expect b/hphp/test/slow/object/660.php.expect
similarity index 100%
rename from hphp/test/tcr/object/660.php.expect
rename to hphp/test/slow/object/660.php.expect
diff --git a/hphp/test/tcr/object/660.php.hphp_opts b/hphp/test/slow/object/660.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/660.php.hphp_opts
rename to hphp/test/slow/object/660.php.hphp_opts
diff --git a/hphp/test/tcr/object/660.php.opts b/hphp/test/slow/object/660.php.opts
similarity index 100%
rename from hphp/test/tcr/object/660.php.opts
rename to hphp/test/slow/object/660.php.opts
diff --git a/hphp/test/tcr/object/661.php b/hphp/test/slow/object/661.php
similarity index 100%
rename from hphp/test/tcr/object/661.php
rename to hphp/test/slow/object/661.php
diff --git a/hphp/test/tcr/object/661.php.expect b/hphp/test/slow/object/661.php.expect
similarity index 100%
rename from hphp/test/tcr/object/661.php.expect
rename to hphp/test/slow/object/661.php.expect
diff --git a/hphp/test/tcr/object/661.php.hphp_opts b/hphp/test/slow/object/661.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/661.php.hphp_opts
rename to hphp/test/slow/object/661.php.hphp_opts
diff --git a/hphp/test/tcr/object/661.php.opts b/hphp/test/slow/object/661.php.opts
similarity index 100%
rename from hphp/test/tcr/object/661.php.opts
rename to hphp/test/slow/object/661.php.opts
diff --git a/hphp/test/tcr/object/662.php b/hphp/test/slow/object/662.php
similarity index 100%
rename from hphp/test/tcr/object/662.php
rename to hphp/test/slow/object/662.php
diff --git a/hphp/test/tcr/object/662.php.expect b/hphp/test/slow/object/662.php.expect
similarity index 100%
rename from hphp/test/tcr/object/662.php.expect
rename to hphp/test/slow/object/662.php.expect
diff --git a/hphp/test/tcr/object/662.php.hphp_opts b/hphp/test/slow/object/662.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/662.php.hphp_opts
rename to hphp/test/slow/object/662.php.hphp_opts
diff --git a/hphp/test/tcr/object/662.php.opts b/hphp/test/slow/object/662.php.opts
similarity index 100%
rename from hphp/test/tcr/object/662.php.opts
rename to hphp/test/slow/object/662.php.opts
diff --git a/hphp/test/tcr/object/663.php b/hphp/test/slow/object/663.php
similarity index 100%
rename from hphp/test/tcr/object/663.php
rename to hphp/test/slow/object/663.php
diff --git a/hphp/test/tcr/object/663.php.expect b/hphp/test/slow/object/663.php.expect
similarity index 100%
rename from hphp/test/tcr/object/663.php.expect
rename to hphp/test/slow/object/663.php.expect
diff --git a/hphp/test/tcr/object/663.php.hphp_opts b/hphp/test/slow/object/663.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/663.php.hphp_opts
rename to hphp/test/slow/object/663.php.hphp_opts
diff --git a/hphp/test/tcr/object/663.php.opts b/hphp/test/slow/object/663.php.opts
similarity index 100%
rename from hphp/test/tcr/object/663.php.opts
rename to hphp/test/slow/object/663.php.opts
diff --git a/hphp/test/tcr/object/664.php b/hphp/test/slow/object/664.php
similarity index 100%
rename from hphp/test/tcr/object/664.php
rename to hphp/test/slow/object/664.php
diff --git a/hphp/test/tcr/object/664.php.expect b/hphp/test/slow/object/664.php.expect
similarity index 100%
rename from hphp/test/tcr/object/664.php.expect
rename to hphp/test/slow/object/664.php.expect
diff --git a/hphp/test/tcr/object/664.php.hphp_opts b/hphp/test/slow/object/664.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/664.php.hphp_opts
rename to hphp/test/slow/object/664.php.hphp_opts
diff --git a/hphp/test/tcr/object/664.php.opts b/hphp/test/slow/object/664.php.opts
similarity index 100%
rename from hphp/test/tcr/object/664.php.opts
rename to hphp/test/slow/object/664.php.opts
diff --git a/hphp/test/tcr/object/665.php b/hphp/test/slow/object/665.php
similarity index 100%
rename from hphp/test/tcr/object/665.php
rename to hphp/test/slow/object/665.php
diff --git a/hphp/test/tcr/object/665.php.expect b/hphp/test/slow/object/665.php.expect
similarity index 100%
rename from hphp/test/tcr/object/665.php.expect
rename to hphp/test/slow/object/665.php.expect
diff --git a/hphp/test/tcr/object/665.php.hphp_opts b/hphp/test/slow/object/665.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/665.php.hphp_opts
rename to hphp/test/slow/object/665.php.hphp_opts
diff --git a/hphp/test/tcr/object/665.php.opts b/hphp/test/slow/object/665.php.opts
similarity index 100%
rename from hphp/test/tcr/object/665.php.opts
rename to hphp/test/slow/object/665.php.opts
diff --git a/hphp/test/tcr/object/666.php b/hphp/test/slow/object/666.php
similarity index 100%
rename from hphp/test/tcr/object/666.php
rename to hphp/test/slow/object/666.php
diff --git a/hphp/test/tcr/object/666.php.expect b/hphp/test/slow/object/666.php.expect
similarity index 100%
rename from hphp/test/tcr/object/666.php.expect
rename to hphp/test/slow/object/666.php.expect
diff --git a/hphp/test/tcr/object/666.php.hphp_opts b/hphp/test/slow/object/666.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/666.php.hphp_opts
rename to hphp/test/slow/object/666.php.hphp_opts
diff --git a/hphp/test/tcr/object/666.php.opts b/hphp/test/slow/object/666.php.opts
similarity index 100%
rename from hphp/test/tcr/object/666.php.opts
rename to hphp/test/slow/object/666.php.opts
diff --git a/hphp/test/tcr/object/667.php b/hphp/test/slow/object/667.php
similarity index 100%
rename from hphp/test/tcr/object/667.php
rename to hphp/test/slow/object/667.php
diff --git a/hphp/test/tcr/object/667.php.expect b/hphp/test/slow/object/667.php.expect
similarity index 100%
rename from hphp/test/tcr/object/667.php.expect
rename to hphp/test/slow/object/667.php.expect
diff --git a/hphp/test/tcr/object/667.php.hphp_opts b/hphp/test/slow/object/667.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/667.php.hphp_opts
rename to hphp/test/slow/object/667.php.hphp_opts
diff --git a/hphp/test/tcr/object/667.php.opts b/hphp/test/slow/object/667.php.opts
similarity index 100%
rename from hphp/test/tcr/object/667.php.opts
rename to hphp/test/slow/object/667.php.opts
diff --git a/hphp/test/tcr/object/668.php b/hphp/test/slow/object/668.php
similarity index 100%
rename from hphp/test/tcr/object/668.php
rename to hphp/test/slow/object/668.php
diff --git a/hphp/test/tcr/object/668.php.expect b/hphp/test/slow/object/668.php.expect
similarity index 100%
rename from hphp/test/tcr/object/668.php.expect
rename to hphp/test/slow/object/668.php.expect
diff --git a/hphp/test/tcr/object/668.php.hphp_opts b/hphp/test/slow/object/668.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/668.php.hphp_opts
rename to hphp/test/slow/object/668.php.hphp_opts
diff --git a/hphp/test/tcr/object/668.php.opts b/hphp/test/slow/object/668.php.opts
similarity index 100%
rename from hphp/test/tcr/object/668.php.opts
rename to hphp/test/slow/object/668.php.opts
diff --git a/hphp/test/tcr/object/669.php b/hphp/test/slow/object/669.php
similarity index 100%
rename from hphp/test/tcr/object/669.php
rename to hphp/test/slow/object/669.php
diff --git a/hphp/test/tcr/object/669.php.expect b/hphp/test/slow/object/669.php.expect
similarity index 100%
rename from hphp/test/tcr/object/669.php.expect
rename to hphp/test/slow/object/669.php.expect
diff --git a/hphp/test/tcr/object/669.php.hphp_opts b/hphp/test/slow/object/669.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/669.php.hphp_opts
rename to hphp/test/slow/object/669.php.hphp_opts
diff --git a/hphp/test/tcr/object/669.php.opts b/hphp/test/slow/object/669.php.opts
similarity index 100%
rename from hphp/test/tcr/object/669.php.opts
rename to hphp/test/slow/object/669.php.opts
diff --git a/hphp/test/tcr/object/670.php b/hphp/test/slow/object/670.php
similarity index 100%
rename from hphp/test/tcr/object/670.php
rename to hphp/test/slow/object/670.php
diff --git a/hphp/test/tcr/object/670.php.expect b/hphp/test/slow/object/670.php.expect
similarity index 100%
rename from hphp/test/tcr/object/670.php.expect
rename to hphp/test/slow/object/670.php.expect
diff --git a/hphp/test/tcr/object/670.php.hphp_opts b/hphp/test/slow/object/670.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/670.php.hphp_opts
rename to hphp/test/slow/object/670.php.hphp_opts
diff --git a/hphp/test/tcr/object/670.php.opts b/hphp/test/slow/object/670.php.opts
similarity index 100%
rename from hphp/test/tcr/object/670.php.opts
rename to hphp/test/slow/object/670.php.opts
diff --git a/hphp/test/tcr/object/671.php b/hphp/test/slow/object/671.php
similarity index 100%
rename from hphp/test/tcr/object/671.php
rename to hphp/test/slow/object/671.php
diff --git a/hphp/test/tcr/object/671.php.expect b/hphp/test/slow/object/671.php.expect
similarity index 100%
rename from hphp/test/tcr/object/671.php.expect
rename to hphp/test/slow/object/671.php.expect
diff --git a/hphp/test/tcr/object/671.php.hphp_opts b/hphp/test/slow/object/671.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/671.php.hphp_opts
rename to hphp/test/slow/object/671.php.hphp_opts
diff --git a/hphp/test/tcr/object/671.php.opts b/hphp/test/slow/object/671.php.opts
similarity index 100%
rename from hphp/test/tcr/object/671.php.opts
rename to hphp/test/slow/object/671.php.opts
diff --git a/hphp/test/tcr/object/672.php b/hphp/test/slow/object/672.php
similarity index 100%
rename from hphp/test/tcr/object/672.php
rename to hphp/test/slow/object/672.php
diff --git a/hphp/test/tcr/object/672.php.expect b/hphp/test/slow/object/672.php.expect
similarity index 100%
rename from hphp/test/tcr/object/672.php.expect
rename to hphp/test/slow/object/672.php.expect
diff --git a/hphp/test/tcr/object/672.php.hphp_opts b/hphp/test/slow/object/672.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/object/672.php.hphp_opts
rename to hphp/test/slow/object/672.php.hphp_opts
diff --git a/hphp/test/tcr/object/672.php.opts b/hphp/test/slow/object/672.php.opts
similarity index 100%
rename from hphp/test/tcr/object/672.php.opts
rename to hphp/test/slow/object/672.php.opts
diff --git a/hphp/test/tcr/object_assignment/774.php b/hphp/test/slow/object_assignment/774.php
similarity index 100%
rename from hphp/test/tcr/object_assignment/774.php
rename to hphp/test/slow/object_assignment/774.php
diff --git a/hphp/test/tcr/object_assignment/774.php.expect b/hphp/test/slow/object_assignment/774.php.expect
similarity index 100%
rename from hphp/test/tcr/object_assignment/774.php.expect
rename to hphp/test/slow/object_assignment/774.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/764.php b/hphp/test/slow/object_invoke_method/764.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/764.php
rename to hphp/test/slow/object_invoke_method/764.php
diff --git a/hphp/test/tcr/object_invoke_method/764.php.expect b/hphp/test/slow/object_invoke_method/764.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/764.php.expect
rename to hphp/test/slow/object_invoke_method/764.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/765.php b/hphp/test/slow/object_invoke_method/765.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/765.php
rename to hphp/test/slow/object_invoke_method/765.php
diff --git a/hphp/test/tcr/object_invoke_method/765.php.expect b/hphp/test/slow/object_invoke_method/765.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/765.php.expect
rename to hphp/test/slow/object_invoke_method/765.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/766.php b/hphp/test/slow/object_invoke_method/766.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/766.php
rename to hphp/test/slow/object_invoke_method/766.php
diff --git a/hphp/test/tcr/object_invoke_method/766.php.expect b/hphp/test/slow/object_invoke_method/766.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/766.php.expect
rename to hphp/test/slow/object_invoke_method/766.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/767.php b/hphp/test/slow/object_invoke_method/767.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/767.php
rename to hphp/test/slow/object_invoke_method/767.php
diff --git a/hphp/test/tcr/object_invoke_method/767.php.expect b/hphp/test/slow/object_invoke_method/767.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/767.php.expect
rename to hphp/test/slow/object_invoke_method/767.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/768.php b/hphp/test/slow/object_invoke_method/768.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/768.php
rename to hphp/test/slow/object_invoke_method/768.php
diff --git a/hphp/test/tcr/object_invoke_method/768.php.expect b/hphp/test/slow/object_invoke_method/768.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/768.php.expect
rename to hphp/test/slow/object_invoke_method/768.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/769.php b/hphp/test/slow/object_invoke_method/769.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/769.php
rename to hphp/test/slow/object_invoke_method/769.php
diff --git a/hphp/test/tcr/object_invoke_method/769.php.expect b/hphp/test/slow/object_invoke_method/769.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/769.php.expect
rename to hphp/test/slow/object_invoke_method/769.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/770.php b/hphp/test/slow/object_invoke_method/770.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/770.php
rename to hphp/test/slow/object_invoke_method/770.php
diff --git a/hphp/test/tcr/object_invoke_method/770.php.expect b/hphp/test/slow/object_invoke_method/770.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/770.php.expect
rename to hphp/test/slow/object_invoke_method/770.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/771.php b/hphp/test/slow/object_invoke_method/771.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/771.php
rename to hphp/test/slow/object_invoke_method/771.php
diff --git a/hphp/test/tcr/object_invoke_method/771.php.expect b/hphp/test/slow/object_invoke_method/771.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/771.php.expect
rename to hphp/test/slow/object_invoke_method/771.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/772.php b/hphp/test/slow/object_invoke_method/772.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/772.php
rename to hphp/test/slow/object_invoke_method/772.php
diff --git a/hphp/test/tcr/object_invoke_method/772.php.expect b/hphp/test/slow/object_invoke_method/772.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/772.php.expect
rename to hphp/test/slow/object_invoke_method/772.php.expect
diff --git a/hphp/test/tcr/object_invoke_method/773.php b/hphp/test/slow/object_invoke_method/773.php
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/773.php
rename to hphp/test/slow/object_invoke_method/773.php
diff --git a/hphp/test/tcr/object_invoke_method/773.php.expect b/hphp/test/slow/object_invoke_method/773.php.expect
similarity index 100%
rename from hphp/test/tcr/object_invoke_method/773.php.expect
rename to hphp/test/slow/object_invoke_method/773.php.expect
diff --git a/hphp/test/tcr/object_magic_method/746.php b/hphp/test/slow/object_magic_method/746.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/746.php
rename to hphp/test/slow/object_magic_method/746.php
diff --git a/hphp/test/tcr/object_magic_method/746.php.expect b/hphp/test/slow/object_magic_method/746.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/746.php.expect
rename to hphp/test/slow/object_magic_method/746.php.expect
diff --git a/hphp/test/tcr/object_magic_method/747.php b/hphp/test/slow/object_magic_method/747.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/747.php
rename to hphp/test/slow/object_magic_method/747.php
diff --git a/hphp/test/tcr/object_magic_method/747.php.expect b/hphp/test/slow/object_magic_method/747.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/747.php.expect
rename to hphp/test/slow/object_magic_method/747.php.expect
diff --git a/hphp/test/tcr/object_magic_method/748.php b/hphp/test/slow/object_magic_method/748.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/748.php
rename to hphp/test/slow/object_magic_method/748.php
diff --git a/hphp/test/tcr/object_magic_method/748.php.expect b/hphp/test/slow/object_magic_method/748.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/748.php.expect
rename to hphp/test/slow/object_magic_method/748.php.expect
diff --git a/hphp/test/tcr/object_magic_method/749.php b/hphp/test/slow/object_magic_method/749.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/749.php
rename to hphp/test/slow/object_magic_method/749.php
diff --git a/hphp/test/tcr/object_magic_method/749.php.expect b/hphp/test/slow/object_magic_method/749.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/749.php.expect
rename to hphp/test/slow/object_magic_method/749.php.expect
diff --git a/hphp/test/tcr/object_magic_method/750.php b/hphp/test/slow/object_magic_method/750.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/750.php
rename to hphp/test/slow/object_magic_method/750.php
diff --git a/hphp/test/tcr/object_magic_method/750.php.expect b/hphp/test/slow/object_magic_method/750.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/750.php.expect
rename to hphp/test/slow/object_magic_method/750.php.expect
diff --git a/hphp/test/tcr/object_magic_method/751.php b/hphp/test/slow/object_magic_method/751.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/751.php
rename to hphp/test/slow/object_magic_method/751.php
diff --git a/hphp/test/tcr/object_magic_method/751.php.expect b/hphp/test/slow/object_magic_method/751.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/751.php.expect
rename to hphp/test/slow/object_magic_method/751.php.expect
diff --git a/hphp/test/tcr/object_magic_method/752.php b/hphp/test/slow/object_magic_method/752.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/752.php
rename to hphp/test/slow/object_magic_method/752.php
diff --git a/hphp/test/tcr/object_magic_method/752.php.expect b/hphp/test/slow/object_magic_method/752.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/752.php.expect
rename to hphp/test/slow/object_magic_method/752.php.expect
diff --git a/hphp/test/tcr/object_magic_method/753.php b/hphp/test/slow/object_magic_method/753.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/753.php
rename to hphp/test/slow/object_magic_method/753.php
diff --git a/hphp/test/tcr/object_magic_method/753.php.expect b/hphp/test/slow/object_magic_method/753.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/753.php.expect
rename to hphp/test/slow/object_magic_method/753.php.expect
diff --git a/hphp/test/tcr/object_magic_method/754.php b/hphp/test/slow/object_magic_method/754.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/754.php
rename to hphp/test/slow/object_magic_method/754.php
diff --git a/hphp/test/tcr/object_magic_method/754.php.expect b/hphp/test/slow/object_magic_method/754.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/754.php.expect
rename to hphp/test/slow/object_magic_method/754.php.expect
diff --git a/hphp/test/tcr/object_magic_method/755.php b/hphp/test/slow/object_magic_method/755.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/755.php
rename to hphp/test/slow/object_magic_method/755.php
diff --git a/hphp/test/tcr/sanity/2.php.expect b/hphp/test/slow/object_magic_method/755.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/2.php.expect
rename to hphp/test/slow/object_magic_method/755.php.expect
diff --git a/hphp/test/tcr/object_magic_method/756.php b/hphp/test/slow/object_magic_method/756.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/756.php
rename to hphp/test/slow/object_magic_method/756.php
diff --git a/hphp/test/tcr/object_magic_method/756.php.expect b/hphp/test/slow/object_magic_method/756.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/756.php.expect
rename to hphp/test/slow/object_magic_method/756.php.expect
diff --git a/hphp/test/tcr/object_magic_method/757.php b/hphp/test/slow/object_magic_method/757.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/757.php
rename to hphp/test/slow/object_magic_method/757.php
diff --git a/hphp/test/tcr/object_magic_method/757.php.expect b/hphp/test/slow/object_magic_method/757.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/757.php.expect
rename to hphp/test/slow/object_magic_method/757.php.expect
diff --git a/hphp/test/tcr/object_magic_method/758.php b/hphp/test/slow/object_magic_method/758.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/758.php
rename to hphp/test/slow/object_magic_method/758.php
diff --git a/hphp/test/tcr/object_magic_method/758.php.expect b/hphp/test/slow/object_magic_method/758.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/758.php.expect
rename to hphp/test/slow/object_magic_method/758.php.expect
diff --git a/hphp/test/tcr/object_magic_method/759.php b/hphp/test/slow/object_magic_method/759.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/759.php
rename to hphp/test/slow/object_magic_method/759.php
diff --git a/hphp/test/tcr/object_magic_method/759.php.expect b/hphp/test/slow/object_magic_method/759.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/759.php.expect
rename to hphp/test/slow/object_magic_method/759.php.expect
diff --git a/hphp/test/tcr/object_magic_method/760.php b/hphp/test/slow/object_magic_method/760.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/760.php
rename to hphp/test/slow/object_magic_method/760.php
diff --git a/hphp/test/tcr/object_magic_method/760.php.expect b/hphp/test/slow/object_magic_method/760.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/760.php.expect
rename to hphp/test/slow/object_magic_method/760.php.expect
diff --git a/hphp/test/tcr/object_magic_method/761.php b/hphp/test/slow/object_magic_method/761.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/761.php
rename to hphp/test/slow/object_magic_method/761.php
diff --git a/hphp/test/tcr/object_magic_method/761.php.expect b/hphp/test/slow/object_magic_method/761.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/761.php.expect
rename to hphp/test/slow/object_magic_method/761.php.expect
diff --git a/hphp/test/tcr/object_magic_method/762.php b/hphp/test/slow/object_magic_method/762.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/762.php
rename to hphp/test/slow/object_magic_method/762.php
diff --git a/hphp/test/tcr/object_magic_method/762.php.expect b/hphp/test/slow/object_magic_method/762.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/762.php.expect
rename to hphp/test/slow/object_magic_method/762.php.expect
diff --git a/hphp/test/tcr/object_magic_method/763.php b/hphp/test/slow/object_magic_method/763.php
similarity index 100%
rename from hphp/test/tcr/object_magic_method/763.php
rename to hphp/test/slow/object_magic_method/763.php
diff --git a/hphp/test/tcr/object_magic_method/763.php.expect b/hphp/test/slow/object_magic_method/763.php.expect
similarity index 100%
rename from hphp/test/tcr/object_magic_method/763.php.expect
rename to hphp/test/slow/object_magic_method/763.php.expect
diff --git a/hphp/test/tcr/object_method/721.php b/hphp/test/slow/object_method/721.php
similarity index 100%
rename from hphp/test/tcr/object_method/721.php
rename to hphp/test/slow/object_method/721.php
diff --git a/hphp/test/tcr/silence_operator/1440.php.expect b/hphp/test/slow/object_method/721.php.expect
similarity index 100%
rename from hphp/test/tcr/silence_operator/1440.php.expect
rename to hphp/test/slow/object_method/721.php.expect
diff --git a/hphp/test/tcr/object_method/722.php b/hphp/test/slow/object_method/722.php
similarity index 100%
rename from hphp/test/tcr/object_method/722.php
rename to hphp/test/slow/object_method/722.php
diff --git a/hphp/test/tcr/object_method/722.php.expect b/hphp/test/slow/object_method/722.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/722.php.expect
rename to hphp/test/slow/object_method/722.php.expect
diff --git a/hphp/test/tcr/object_method/723.php b/hphp/test/slow/object_method/723.php
similarity index 100%
rename from hphp/test/tcr/object_method/723.php
rename to hphp/test/slow/object_method/723.php
diff --git a/hphp/test/tcr/object_method/723.php.expect b/hphp/test/slow/object_method/723.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/723.php.expect
rename to hphp/test/slow/object_method/723.php.expect
diff --git a/hphp/test/tcr/object_method/724.php b/hphp/test/slow/object_method/724.php
similarity index 100%
rename from hphp/test/tcr/object_method/724.php
rename to hphp/test/slow/object_method/724.php
diff --git a/hphp/test/tcr/object_method/724.php.expect b/hphp/test/slow/object_method/724.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/724.php.expect
rename to hphp/test/slow/object_method/724.php.expect
diff --git a/hphp/test/tcr/object_method/725.php b/hphp/test/slow/object_method/725.php
similarity index 100%
rename from hphp/test/tcr/object_method/725.php
rename to hphp/test/slow/object_method/725.php
diff --git a/hphp/test/tcr/object_method/725.php.expect b/hphp/test/slow/object_method/725.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/725.php.expect
rename to hphp/test/slow/object_method/725.php.expect
diff --git a/hphp/test/tcr/object_method/726.php b/hphp/test/slow/object_method/726.php
similarity index 100%
rename from hphp/test/tcr/object_method/726.php
rename to hphp/test/slow/object_method/726.php
diff --git a/hphp/test/tcr/object_method/726.php.expect b/hphp/test/slow/object_method/726.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/726.php.expect
rename to hphp/test/slow/object_method/726.php.expect
diff --git a/hphp/test/tcr/object_method/727.php b/hphp/test/slow/object_method/727.php
similarity index 100%
rename from hphp/test/tcr/object_method/727.php
rename to hphp/test/slow/object_method/727.php
diff --git a/hphp/test/tcr/object_method/727.php.expect b/hphp/test/slow/object_method/727.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/727.php.expect
rename to hphp/test/slow/object_method/727.php.expect
diff --git a/hphp/test/tcr/object_method/728.php b/hphp/test/slow/object_method/728.php
similarity index 100%
rename from hphp/test/tcr/object_method/728.php
rename to hphp/test/slow/object_method/728.php
diff --git a/hphp/test/tcr/object_method/728.php.expect b/hphp/test/slow/object_method/728.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/728.php.expect
rename to hphp/test/slow/object_method/728.php.expect
diff --git a/hphp/test/tcr/object_method/729.php b/hphp/test/slow/object_method/729.php
similarity index 100%
rename from hphp/test/tcr/object_method/729.php
rename to hphp/test/slow/object_method/729.php
diff --git a/hphp/test/tcr/simple_xml/1643.php.expect b/hphp/test/slow/object_method/729.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1643.php.expect
rename to hphp/test/slow/object_method/729.php.expect
diff --git a/hphp/test/tcr/object_method/730.php b/hphp/test/slow/object_method/730.php
similarity index 100%
rename from hphp/test/tcr/object_method/730.php
rename to hphp/test/slow/object_method/730.php
diff --git a/hphp/test/tcr/object_method/730.php.expect b/hphp/test/slow/object_method/730.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/730.php.expect
rename to hphp/test/slow/object_method/730.php.expect
diff --git a/hphp/test/tcr/object_method/731.php b/hphp/test/slow/object_method/731.php
similarity index 100%
rename from hphp/test/tcr/object_method/731.php
rename to hphp/test/slow/object_method/731.php
diff --git a/hphp/test/tcr/object_method/731.php.expect b/hphp/test/slow/object_method/731.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/731.php.expect
rename to hphp/test/slow/object_method/731.php.expect
diff --git a/hphp/test/tcr/object_method/732.php b/hphp/test/slow/object_method/732.php
similarity index 100%
rename from hphp/test/tcr/object_method/732.php
rename to hphp/test/slow/object_method/732.php
diff --git a/hphp/test/tcr/object_method/732.php.expect b/hphp/test/slow/object_method/732.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/732.php.expect
rename to hphp/test/slow/object_method/732.php.expect
diff --git a/hphp/test/tcr/object_method/733.php b/hphp/test/slow/object_method/733.php
similarity index 100%
rename from hphp/test/tcr/object_method/733.php
rename to hphp/test/slow/object_method/733.php
diff --git a/hphp/test/tcr/object_method/733.php.expect b/hphp/test/slow/object_method/733.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/733.php.expect
rename to hphp/test/slow/object_method/733.php.expect
diff --git a/hphp/test/tcr/object_method/734.php b/hphp/test/slow/object_method/734.php
similarity index 100%
rename from hphp/test/tcr/object_method/734.php
rename to hphp/test/slow/object_method/734.php
diff --git a/hphp/test/tcr/object_method/734.php.expect b/hphp/test/slow/object_method/734.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/734.php.expect
rename to hphp/test/slow/object_method/734.php.expect
diff --git a/hphp/test/tcr/object_method/735.php b/hphp/test/slow/object_method/735.php
similarity index 100%
rename from hphp/test/tcr/object_method/735.php
rename to hphp/test/slow/object_method/735.php
diff --git a/hphp/test/tcr/object_method/735.php.expect b/hphp/test/slow/object_method/735.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/735.php.expect
rename to hphp/test/slow/object_method/735.php.expect
diff --git a/hphp/test/tcr/object_method/736.php b/hphp/test/slow/object_method/736.php
similarity index 100%
rename from hphp/test/tcr/object_method/736.php
rename to hphp/test/slow/object_method/736.php
diff --git a/hphp/test/tcr/object_method/736.php.expect b/hphp/test/slow/object_method/736.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/736.php.expect
rename to hphp/test/slow/object_method/736.php.expect
diff --git a/hphp/test/tcr/object_method/737.php b/hphp/test/slow/object_method/737.php
similarity index 100%
rename from hphp/test/tcr/object_method/737.php
rename to hphp/test/slow/object_method/737.php
diff --git a/hphp/test/tcr/object_method/737.php.expect b/hphp/test/slow/object_method/737.php.expect
similarity index 100%
rename from hphp/test/tcr/object_method/737.php.expect
rename to hphp/test/slow/object_method/737.php.expect
diff --git a/hphp/test/tcr/object_property/673.php b/hphp/test/slow/object_property/673.php
similarity index 100%
rename from hphp/test/tcr/object_property/673.php
rename to hphp/test/slow/object_property/673.php
diff --git a/hphp/test/tcr/object_property/673.php.expect b/hphp/test/slow/object_property/673.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/673.php.expect
rename to hphp/test/slow/object_property/673.php.expect
diff --git a/hphp/test/tcr/object_property/674.php b/hphp/test/slow/object_property/674.php
similarity index 100%
rename from hphp/test/tcr/object_property/674.php
rename to hphp/test/slow/object_property/674.php
diff --git a/hphp/test/tcr/object_property/674.php.expect b/hphp/test/slow/object_property/674.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/674.php.expect
rename to hphp/test/slow/object_property/674.php.expect
diff --git a/hphp/test/tcr/object_property/675.php b/hphp/test/slow/object_property/675.php
similarity index 100%
rename from hphp/test/tcr/object_property/675.php
rename to hphp/test/slow/object_property/675.php
diff --git a/hphp/test/tcr/object_property/675.php.expect b/hphp/test/slow/object_property/675.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/675.php.expect
rename to hphp/test/slow/object_property/675.php.expect
diff --git a/hphp/test/tcr/object_property/676.php b/hphp/test/slow/object_property/676.php
similarity index 100%
rename from hphp/test/tcr/object_property/676.php
rename to hphp/test/slow/object_property/676.php
diff --git a/hphp/test/tcr/object_property/676.php.expect b/hphp/test/slow/object_property/676.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/676.php.expect
rename to hphp/test/slow/object_property/676.php.expect
diff --git a/hphp/test/tcr/object_property/677.php b/hphp/test/slow/object_property/677.php
similarity index 100%
rename from hphp/test/tcr/object_property/677.php
rename to hphp/test/slow/object_property/677.php
diff --git a/hphp/test/tcr/object_property/677.php.expect b/hphp/test/slow/object_property/677.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/677.php.expect
rename to hphp/test/slow/object_property/677.php.expect
diff --git a/hphp/test/tcr/object_property/678.php b/hphp/test/slow/object_property/678.php
similarity index 100%
rename from hphp/test/tcr/object_property/678.php
rename to hphp/test/slow/object_property/678.php
diff --git a/hphp/test/tcr/object_property/678.php.expect b/hphp/test/slow/object_property/678.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/678.php.expect
rename to hphp/test/slow/object_property/678.php.expect
diff --git a/hphp/test/tcr/object_property/679.php b/hphp/test/slow/object_property/679.php
similarity index 100%
rename from hphp/test/tcr/object_property/679.php
rename to hphp/test/slow/object_property/679.php
diff --git a/hphp/test/tcr/object_property/679.php.expect b/hphp/test/slow/object_property/679.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/679.php.expect
rename to hphp/test/slow/object_property/679.php.expect
diff --git a/hphp/test/tcr/object_property/680.php b/hphp/test/slow/object_property/680.php
similarity index 100%
rename from hphp/test/tcr/object_property/680.php
rename to hphp/test/slow/object_property/680.php
diff --git a/hphp/test/tcr/object_property/680.php.expect b/hphp/test/slow/object_property/680.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/680.php.expect
rename to hphp/test/slow/object_property/680.php.expect
diff --git a/hphp/test/tcr/object_property/681.php b/hphp/test/slow/object_property/681.php
similarity index 100%
rename from hphp/test/tcr/object_property/681.php
rename to hphp/test/slow/object_property/681.php
diff --git a/hphp/test/tcr/object_property/681.php.expect b/hphp/test/slow/object_property/681.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/681.php.expect
rename to hphp/test/slow/object_property/681.php.expect
diff --git a/hphp/test/tcr/object_property/682.php b/hphp/test/slow/object_property/682.php
similarity index 100%
rename from hphp/test/tcr/object_property/682.php
rename to hphp/test/slow/object_property/682.php
diff --git a/hphp/test/tcr/object_property/682.php.expect b/hphp/test/slow/object_property/682.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/682.php.expect
rename to hphp/test/slow/object_property/682.php.expect
diff --git a/hphp/test/tcr/object_property/683.php b/hphp/test/slow/object_property/683.php
similarity index 100%
rename from hphp/test/tcr/object_property/683.php
rename to hphp/test/slow/object_property/683.php
diff --git a/hphp/test/tcr/object_property/683.php.expect b/hphp/test/slow/object_property/683.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/683.php.expect
rename to hphp/test/slow/object_property/683.php.expect
diff --git a/hphp/test/tcr/object_property/684.php b/hphp/test/slow/object_property/684.php
similarity index 100%
rename from hphp/test/tcr/object_property/684.php
rename to hphp/test/slow/object_property/684.php
diff --git a/hphp/test/tcr/object_property/684.php.expect b/hphp/test/slow/object_property/684.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/684.php.expect
rename to hphp/test/slow/object_property/684.php.expect
diff --git a/hphp/test/tcr/object_property/685.php b/hphp/test/slow/object_property/685.php
similarity index 100%
rename from hphp/test/tcr/object_property/685.php
rename to hphp/test/slow/object_property/685.php
diff --git a/hphp/test/tcr/object_property/685.php.expect b/hphp/test/slow/object_property/685.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/685.php.expect
rename to hphp/test/slow/object_property/685.php.expect
diff --git a/hphp/test/tcr/object_property/686.php b/hphp/test/slow/object_property/686.php
similarity index 100%
rename from hphp/test/tcr/object_property/686.php
rename to hphp/test/slow/object_property/686.php
diff --git a/hphp/test/tcr/object_property/686.php.expect b/hphp/test/slow/object_property/686.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/686.php.expect
rename to hphp/test/slow/object_property/686.php.expect
diff --git a/hphp/test/tcr/object_property/687.php b/hphp/test/slow/object_property/687.php
similarity index 100%
rename from hphp/test/tcr/object_property/687.php
rename to hphp/test/slow/object_property/687.php
diff --git a/hphp/test/tcr/object_property/687.php.expect b/hphp/test/slow/object_property/687.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/687.php.expect
rename to hphp/test/slow/object_property/687.php.expect
diff --git a/hphp/test/tcr/object_property/688.php b/hphp/test/slow/object_property/688.php
similarity index 100%
rename from hphp/test/tcr/object_property/688.php
rename to hphp/test/slow/object_property/688.php
diff --git a/hphp/test/tcr/object_property/688.php.expect b/hphp/test/slow/object_property/688.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/688.php.expect
rename to hphp/test/slow/object_property/688.php.expect
diff --git a/hphp/test/tcr/object_property/689.php b/hphp/test/slow/object_property/689.php
similarity index 100%
rename from hphp/test/tcr/object_property/689.php
rename to hphp/test/slow/object_property/689.php
diff --git a/hphp/test/tcr/object_property/689.php.expect b/hphp/test/slow/object_property/689.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/689.php.expect
rename to hphp/test/slow/object_property/689.php.expect
diff --git a/hphp/test/tcr/object_property/690.php b/hphp/test/slow/object_property/690.php
similarity index 100%
rename from hphp/test/tcr/object_property/690.php
rename to hphp/test/slow/object_property/690.php
diff --git a/hphp/test/tcr/object_property/690.php.expect b/hphp/test/slow/object_property/690.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/690.php.expect
rename to hphp/test/slow/object_property/690.php.expect
diff --git a/hphp/test/tcr/object_property/691.php b/hphp/test/slow/object_property/691.php
similarity index 100%
rename from hphp/test/tcr/object_property/691.php
rename to hphp/test/slow/object_property/691.php
diff --git a/hphp/test/tcr/object_property/691.php.expect b/hphp/test/slow/object_property/691.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/691.php.expect
rename to hphp/test/slow/object_property/691.php.expect
diff --git a/hphp/test/tcr/object_property/692.php b/hphp/test/slow/object_property/692.php
similarity index 100%
rename from hphp/test/tcr/object_property/692.php
rename to hphp/test/slow/object_property/692.php
diff --git a/hphp/test/tcr/object_property/692.php.expect b/hphp/test/slow/object_property/692.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/692.php.expect
rename to hphp/test/slow/object_property/692.php.expect
diff --git a/hphp/test/tcr/object_property/693.php b/hphp/test/slow/object_property/693.php
similarity index 100%
rename from hphp/test/tcr/object_property/693.php
rename to hphp/test/slow/object_property/693.php
diff --git a/hphp/test/tcr/object_property/693.php.expect b/hphp/test/slow/object_property/693.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/693.php.expect
rename to hphp/test/slow/object_property/693.php.expect
diff --git a/hphp/test/tcr/object_property/694.php b/hphp/test/slow/object_property/694.php
similarity index 100%
rename from hphp/test/tcr/object_property/694.php
rename to hphp/test/slow/object_property/694.php
diff --git a/hphp/test/tcr/object_property/694.php.expect b/hphp/test/slow/object_property/694.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/694.php.expect
rename to hphp/test/slow/object_property/694.php.expect
diff --git a/hphp/test/tcr/object_property/695.php b/hphp/test/slow/object_property/695.php
similarity index 100%
rename from hphp/test/tcr/object_property/695.php
rename to hphp/test/slow/object_property/695.php
diff --git a/hphp/test/tcr/object_property/695.php.expect b/hphp/test/slow/object_property/695.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/695.php.expect
rename to hphp/test/slow/object_property/695.php.expect
diff --git a/hphp/test/tcr/object_property/696.php b/hphp/test/slow/object_property/696.php
similarity index 100%
rename from hphp/test/tcr/object_property/696.php
rename to hphp/test/slow/object_property/696.php
diff --git a/hphp/test/tcr/object_property/696.php.expect b/hphp/test/slow/object_property/696.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/696.php.expect
rename to hphp/test/slow/object_property/696.php.expect
diff --git a/hphp/test/tcr/object_property/697.php b/hphp/test/slow/object_property/697.php
similarity index 100%
rename from hphp/test/tcr/object_property/697.php
rename to hphp/test/slow/object_property/697.php
diff --git a/hphp/test/tcr/object_property/697.php.expect b/hphp/test/slow/object_property/697.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/697.php.expect
rename to hphp/test/slow/object_property/697.php.expect
diff --git a/hphp/test/tcr/object_property/698.php b/hphp/test/slow/object_property/698.php
similarity index 100%
rename from hphp/test/tcr/object_property/698.php
rename to hphp/test/slow/object_property/698.php
diff --git a/hphp/test/tcr/object_property/698.php.expect b/hphp/test/slow/object_property/698.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/698.php.expect
rename to hphp/test/slow/object_property/698.php.expect
diff --git a/hphp/test/tcr/object_property/699.php b/hphp/test/slow/object_property/699.php
similarity index 100%
rename from hphp/test/tcr/object_property/699.php
rename to hphp/test/slow/object_property/699.php
diff --git a/hphp/test/tcr/object_property/699.php.expect b/hphp/test/slow/object_property/699.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/699.php.expect
rename to hphp/test/slow/object_property/699.php.expect
diff --git a/hphp/test/tcr/object_property/700.php b/hphp/test/slow/object_property/700.php
similarity index 100%
rename from hphp/test/tcr/object_property/700.php
rename to hphp/test/slow/object_property/700.php
diff --git a/hphp/test/tcr/object_property/700.php.expect b/hphp/test/slow/object_property/700.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/700.php.expect
rename to hphp/test/slow/object_property/700.php.expect
diff --git a/hphp/test/tcr/object_property/701.php b/hphp/test/slow/object_property/701.php
similarity index 100%
rename from hphp/test/tcr/object_property/701.php
rename to hphp/test/slow/object_property/701.php
diff --git a/hphp/test/tcr/object_property/701.php.expect b/hphp/test/slow/object_property/701.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/701.php.expect
rename to hphp/test/slow/object_property/701.php.expect
diff --git a/hphp/test/tcr/object_property/702.php b/hphp/test/slow/object_property/702.php
similarity index 100%
rename from hphp/test/tcr/object_property/702.php
rename to hphp/test/slow/object_property/702.php
diff --git a/hphp/test/tcr/object_property/702.php.expect b/hphp/test/slow/object_property/702.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/702.php.expect
rename to hphp/test/slow/object_property/702.php.expect
diff --git a/hphp/test/tcr/object_property/703.php b/hphp/test/slow/object_property/703.php
similarity index 100%
rename from hphp/test/tcr/object_property/703.php
rename to hphp/test/slow/object_property/703.php
diff --git a/hphp/test/tcr/object_property/703.php.expect b/hphp/test/slow/object_property/703.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/703.php.expect
rename to hphp/test/slow/object_property/703.php.expect
diff --git a/hphp/test/tcr/object_property/704.php b/hphp/test/slow/object_property/704.php
similarity index 100%
rename from hphp/test/tcr/object_property/704.php
rename to hphp/test/slow/object_property/704.php
diff --git a/hphp/test/tcr/object_property/704.php.expect b/hphp/test/slow/object_property/704.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/704.php.expect
rename to hphp/test/slow/object_property/704.php.expect
diff --git a/hphp/test/tcr/object_property/705.php b/hphp/test/slow/object_property/705.php
similarity index 100%
rename from hphp/test/tcr/object_property/705.php
rename to hphp/test/slow/object_property/705.php
diff --git a/hphp/test/tcr/object_property/705.php.expect b/hphp/test/slow/object_property/705.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/705.php.expect
rename to hphp/test/slow/object_property/705.php.expect
diff --git a/hphp/test/tcr/object_property/706.php b/hphp/test/slow/object_property/706.php
similarity index 100%
rename from hphp/test/tcr/object_property/706.php
rename to hphp/test/slow/object_property/706.php
diff --git a/hphp/test/tcr/object_property/706.php.expect b/hphp/test/slow/object_property/706.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/706.php.expect
rename to hphp/test/slow/object_property/706.php.expect
diff --git a/hphp/test/tcr/object_property/707.php b/hphp/test/slow/object_property/707.php
similarity index 100%
rename from hphp/test/tcr/object_property/707.php
rename to hphp/test/slow/object_property/707.php
diff --git a/hphp/test/tcr/object_property/707.php.expect b/hphp/test/slow/object_property/707.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/707.php.expect
rename to hphp/test/slow/object_property/707.php.expect
diff --git a/hphp/test/tcr/object_property/708.php b/hphp/test/slow/object_property/708.php
similarity index 100%
rename from hphp/test/tcr/object_property/708.php
rename to hphp/test/slow/object_property/708.php
diff --git a/hphp/test/tcr/object_property/708.php.expect b/hphp/test/slow/object_property/708.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/708.php.expect
rename to hphp/test/slow/object_property/708.php.expect
diff --git a/hphp/test/tcr/object_property/709.php b/hphp/test/slow/object_property/709.php
similarity index 100%
rename from hphp/test/tcr/object_property/709.php
rename to hphp/test/slow/object_property/709.php
diff --git a/hphp/test/tcr/object_property/709.php.expect b/hphp/test/slow/object_property/709.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/709.php.expect
rename to hphp/test/slow/object_property/709.php.expect
diff --git a/hphp/test/tcr/object_property/710.php b/hphp/test/slow/object_property/710.php
similarity index 100%
rename from hphp/test/tcr/object_property/710.php
rename to hphp/test/slow/object_property/710.php
diff --git a/hphp/test/tcr/object_property/710.php.expect b/hphp/test/slow/object_property/710.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/710.php.expect
rename to hphp/test/slow/object_property/710.php.expect
diff --git a/hphp/test/tcr/object_property/711.php b/hphp/test/slow/object_property/711.php
similarity index 100%
rename from hphp/test/tcr/object_property/711.php
rename to hphp/test/slow/object_property/711.php
diff --git a/hphp/test/tcr/object_property/711.php.expect b/hphp/test/slow/object_property/711.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/711.php.expect
rename to hphp/test/slow/object_property/711.php.expect
diff --git a/hphp/test/tcr/object_property/712.php b/hphp/test/slow/object_property/712.php
similarity index 100%
rename from hphp/test/tcr/object_property/712.php
rename to hphp/test/slow/object_property/712.php
diff --git a/hphp/test/tcr/object_property/712.php.expect b/hphp/test/slow/object_property/712.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/712.php.expect
rename to hphp/test/slow/object_property/712.php.expect
diff --git a/hphp/test/tcr/object_property/713.php b/hphp/test/slow/object_property/713.php
similarity index 100%
rename from hphp/test/tcr/object_property/713.php
rename to hphp/test/slow/object_property/713.php
diff --git a/hphp/test/tcr/object_property/713.php.expect b/hphp/test/slow/object_property/713.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/713.php.expect
rename to hphp/test/slow/object_property/713.php.expect
diff --git a/hphp/test/tcr/object_property/714.php b/hphp/test/slow/object_property/714.php
similarity index 100%
rename from hphp/test/tcr/object_property/714.php
rename to hphp/test/slow/object_property/714.php
diff --git a/hphp/test/tcr/object_property/714.php.expect b/hphp/test/slow/object_property/714.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/714.php.expect
rename to hphp/test/slow/object_property/714.php.expect
diff --git a/hphp/test/tcr/object_property/715.php b/hphp/test/slow/object_property/715.php
similarity index 100%
rename from hphp/test/tcr/object_property/715.php
rename to hphp/test/slow/object_property/715.php
diff --git a/hphp/test/tcr/object_property/715.php.expect b/hphp/test/slow/object_property/715.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/715.php.expect
rename to hphp/test/slow/object_property/715.php.expect
diff --git a/hphp/test/tcr/object_property/716.php b/hphp/test/slow/object_property/716.php
similarity index 100%
rename from hphp/test/tcr/object_property/716.php
rename to hphp/test/slow/object_property/716.php
diff --git a/hphp/test/tcr/object_property/716.php.expect b/hphp/test/slow/object_property/716.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/716.php.expect
rename to hphp/test/slow/object_property/716.php.expect
diff --git a/hphp/test/tcr/object_property/717.php b/hphp/test/slow/object_property/717.php
similarity index 100%
rename from hphp/test/tcr/object_property/717.php
rename to hphp/test/slow/object_property/717.php
diff --git a/hphp/test/tcr/object_property/717.php.expect b/hphp/test/slow/object_property/717.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/717.php.expect
rename to hphp/test/slow/object_property/717.php.expect
diff --git a/hphp/test/tcr/object_property/718.php b/hphp/test/slow/object_property/718.php
similarity index 100%
rename from hphp/test/tcr/object_property/718.php
rename to hphp/test/slow/object_property/718.php
diff --git a/hphp/test/tcr/object_property/718.php.expect b/hphp/test/slow/object_property/718.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/718.php.expect
rename to hphp/test/slow/object_property/718.php.expect
diff --git a/hphp/test/tcr/object_property/719.php b/hphp/test/slow/object_property/719.php
similarity index 100%
rename from hphp/test/tcr/object_property/719.php
rename to hphp/test/slow/object_property/719.php
diff --git a/hphp/test/tcr/object_property/719.php.expect b/hphp/test/slow/object_property/719.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/719.php.expect
rename to hphp/test/slow/object_property/719.php.expect
diff --git a/hphp/test/tcr/object_property/720.php b/hphp/test/slow/object_property/720.php
similarity index 100%
rename from hphp/test/tcr/object_property/720.php
rename to hphp/test/slow/object_property/720.php
diff --git a/hphp/test/tcr/object_property/720.php.expect b/hphp/test/slow/object_property/720.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property/720.php.expect
rename to hphp/test/slow/object_property/720.php.expect
diff --git a/hphp/test/tcr/object_property_expression/785.php b/hphp/test/slow/object_property_expression/785.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/785.php
rename to hphp/test/slow/object_property_expression/785.php
diff --git a/hphp/test/tcr/object_property_expression/785.php.expect b/hphp/test/slow/object_property_expression/785.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/785.php.expect
rename to hphp/test/slow/object_property_expression/785.php.expect
diff --git a/hphp/test/tcr/object_property_expression/786.php b/hphp/test/slow/object_property_expression/786.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/786.php
rename to hphp/test/slow/object_property_expression/786.php
diff --git a/hphp/test/tcr/object_property_expression/786.php.expect b/hphp/test/slow/object_property_expression/786.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/786.php.expect
rename to hphp/test/slow/object_property_expression/786.php.expect
diff --git a/hphp/test/tcr/object_property_expression/787.php b/hphp/test/slow/object_property_expression/787.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/787.php
rename to hphp/test/slow/object_property_expression/787.php
diff --git a/hphp/test/tcr/object_property_expression/787.php.expect b/hphp/test/slow/object_property_expression/787.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/787.php.expect
rename to hphp/test/slow/object_property_expression/787.php.expect
diff --git a/hphp/test/tcr/object_property_expression/788.php b/hphp/test/slow/object_property_expression/788.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/788.php
rename to hphp/test/slow/object_property_expression/788.php
diff --git a/hphp/test/tcr/object_property_expression/788.php.expect b/hphp/test/slow/object_property_expression/788.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/788.php.expect
rename to hphp/test/slow/object_property_expression/788.php.expect
diff --git a/hphp/test/tcr/object_property_expression/789.php b/hphp/test/slow/object_property_expression/789.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/789.php
rename to hphp/test/slow/object_property_expression/789.php
diff --git a/hphp/test/tcr/object_property_expression/789.php.expect b/hphp/test/slow/object_property_expression/789.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/789.php.expect
rename to hphp/test/slow/object_property_expression/789.php.expect
diff --git a/hphp/test/tcr/object_property_expression/790.php b/hphp/test/slow/object_property_expression/790.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/790.php
rename to hphp/test/slow/object_property_expression/790.php
diff --git a/hphp/test/tcr/object_property_expression/790.php.expect b/hphp/test/slow/object_property_expression/790.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/790.php.expect
rename to hphp/test/slow/object_property_expression/790.php.expect
diff --git a/hphp/test/tcr/object_property_expression/791.php b/hphp/test/slow/object_property_expression/791.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/791.php
rename to hphp/test/slow/object_property_expression/791.php
diff --git a/hphp/test/tcr/object_property_expression/791.php.expect b/hphp/test/slow/object_property_expression/791.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/791.php.expect
rename to hphp/test/slow/object_property_expression/791.php.expect
diff --git a/hphp/test/tcr/object_property_expression/792.php b/hphp/test/slow/object_property_expression/792.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/792.php
rename to hphp/test/slow/object_property_expression/792.php
diff --git a/hphp/test/tcr/object_property_expression/792.php.expect b/hphp/test/slow/object_property_expression/792.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/792.php.expect
rename to hphp/test/slow/object_property_expression/792.php.expect
diff --git a/hphp/test/tcr/object_property_expression/793.php b/hphp/test/slow/object_property_expression/793.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/793.php
rename to hphp/test/slow/object_property_expression/793.php
diff --git a/hphp/test/tcr/object_property_expression/793.php.expect b/hphp/test/slow/object_property_expression/793.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/793.php.expect
rename to hphp/test/slow/object_property_expression/793.php.expect
diff --git a/hphp/test/tcr/object_property_expression/794.php b/hphp/test/slow/object_property_expression/794.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/794.php
rename to hphp/test/slow/object_property_expression/794.php
diff --git a/hphp/test/tcr/object_property_expression/794.php.expect b/hphp/test/slow/object_property_expression/794.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/794.php.expect
rename to hphp/test/slow/object_property_expression/794.php.expect
diff --git a/hphp/test/tcr/object_property_expression/795.php b/hphp/test/slow/object_property_expression/795.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/795.php
rename to hphp/test/slow/object_property_expression/795.php
diff --git a/hphp/test/tcr/object_property_expression/795.php.expect b/hphp/test/slow/object_property_expression/795.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/795.php.expect
rename to hphp/test/slow/object_property_expression/795.php.expect
diff --git a/hphp/test/tcr/object_property_expression/796.php b/hphp/test/slow/object_property_expression/796.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/796.php
rename to hphp/test/slow/object_property_expression/796.php
diff --git a/hphp/test/tcr/object_property_expression/796.php.expect b/hphp/test/slow/object_property_expression/796.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/796.php.expect
rename to hphp/test/slow/object_property_expression/796.php.expect
diff --git a/hphp/test/tcr/object_property_expression/797.php b/hphp/test/slow/object_property_expression/797.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/797.php
rename to hphp/test/slow/object_property_expression/797.php
diff --git a/hphp/test/tcr/object_property_expression/797.php.expect b/hphp/test/slow/object_property_expression/797.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/797.php.expect
rename to hphp/test/slow/object_property_expression/797.php.expect
diff --git a/hphp/test/tcr/object_property_expression/798.php b/hphp/test/slow/object_property_expression/798.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/798.php
rename to hphp/test/slow/object_property_expression/798.php
diff --git a/hphp/test/tcr/object_property_expression/798.php.expect b/hphp/test/slow/object_property_expression/798.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/798.php.expect
rename to hphp/test/slow/object_property_expression/798.php.expect
diff --git a/hphp/test/tcr/object_property_expression/799.php b/hphp/test/slow/object_property_expression/799.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/799.php
rename to hphp/test/slow/object_property_expression/799.php
diff --git a/hphp/test/tcr/object_property_expression/799.php.expect b/hphp/test/slow/object_property_expression/799.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/799.php.expect
rename to hphp/test/slow/object_property_expression/799.php.expect
diff --git a/hphp/test/tcr/object_property_expression/800.php b/hphp/test/slow/object_property_expression/800.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/800.php
rename to hphp/test/slow/object_property_expression/800.php
diff --git a/hphp/test/tcr/object_property_expression/800.php.expect b/hphp/test/slow/object_property_expression/800.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/800.php.expect
rename to hphp/test/slow/object_property_expression/800.php.expect
diff --git a/hphp/test/tcr/object_property_expression/801.php b/hphp/test/slow/object_property_expression/801.php
similarity index 100%
rename from hphp/test/tcr/object_property_expression/801.php
rename to hphp/test/slow/object_property_expression/801.php
diff --git a/hphp/test/tcr/object_property_expression/801.php.expect b/hphp/test/slow/object_property_expression/801.php.expect
similarity index 100%
rename from hphp/test/tcr/object_property_expression/801.php.expect
rename to hphp/test/slow/object_property_expression/801.php.expect
diff --git a/hphp/test/tcr/operation_types/1432.php b/hphp/test/slow/operation_types/1432.php
similarity index 100%
rename from hphp/test/tcr/operation_types/1432.php
rename to hphp/test/slow/operation_types/1432.php
diff --git a/hphp/test/tcr/operation_types/1432.php.expect b/hphp/test/slow/operation_types/1432.php.expect
similarity index 100%
rename from hphp/test/tcr/operation_types/1432.php.expect
rename to hphp/test/slow/operation_types/1432.php.expect
diff --git a/hphp/test/tcr/operation_types/1433.php b/hphp/test/slow/operation_types/1433.php
similarity index 100%
rename from hphp/test/tcr/operation_types/1433.php
rename to hphp/test/slow/operation_types/1433.php
diff --git a/hphp/test/tcr/operation_types/1433.php.expect b/hphp/test/slow/operation_types/1433.php.expect
similarity index 100%
rename from hphp/test/tcr/operation_types/1433.php.expect
rename to hphp/test/slow/operation_types/1433.php.expect
diff --git a/hphp/test/tcr/operation_types/1434.php b/hphp/test/slow/operation_types/1434.php
similarity index 100%
rename from hphp/test/tcr/operation_types/1434.php
rename to hphp/test/slow/operation_types/1434.php
diff --git a/hphp/test/tcr/operation_types/1434.php.expect b/hphp/test/slow/operation_types/1434.php.expect
similarity index 100%
rename from hphp/test/tcr/operation_types/1434.php.expect
rename to hphp/test/slow/operation_types/1434.php.expect
diff --git a/hphp/test/tcr/operation_types/1435.php b/hphp/test/slow/operation_types/1435.php
similarity index 100%
rename from hphp/test/tcr/operation_types/1435.php
rename to hphp/test/slow/operation_types/1435.php
diff --git a/hphp/test/tcr/operation_types/1435.php.expect b/hphp/test/slow/operation_types/1435.php.expect
similarity index 100%
rename from hphp/test/tcr/operation_types/1435.php.expect
rename to hphp/test/slow/operation_types/1435.php.expect
diff --git a/hphp/test/tcr/parser/1849.php b/hphp/test/slow/parser/1849.php
similarity index 100%
rename from hphp/test/tcr/parser/1849.php
rename to hphp/test/slow/parser/1849.php
diff --git a/hphp/test/tcr/parser/1849.php.expect b/hphp/test/slow/parser/1849.php.expect
similarity index 100%
rename from hphp/test/tcr/parser/1849.php.expect
rename to hphp/test/slow/parser/1849.php.expect
diff --git a/hphp/test/tcr/parser/1850.php b/hphp/test/slow/parser/1850.php
similarity index 100%
rename from hphp/test/tcr/parser/1850.php
rename to hphp/test/slow/parser/1850.php
diff --git a/hphp/test/tcr/parser/1850.php.expect b/hphp/test/slow/parser/1850.php.expect
similarity index 100%
rename from hphp/test/tcr/parser/1850.php.expect
rename to hphp/test/slow/parser/1850.php.expect
diff --git a/hphp/test/tcr/parser/1851.php b/hphp/test/slow/parser/1851.php
similarity index 100%
rename from hphp/test/tcr/parser/1851.php
rename to hphp/test/slow/parser/1851.php
diff --git a/hphp/test/tcr/parser/1851.php.expect b/hphp/test/slow/parser/1851.php.expect
similarity index 100%
rename from hphp/test/tcr/parser/1851.php.expect
rename to hphp/test/slow/parser/1851.php.expect
diff --git a/hphp/test/tcr/parser/1852.php b/hphp/test/slow/parser/1852.php
similarity index 100%
rename from hphp/test/tcr/parser/1852.php
rename to hphp/test/slow/parser/1852.php
diff --git a/hphp/test/tcr/parser/1852.php.expect b/hphp/test/slow/parser/1852.php.expect
similarity index 100%
rename from hphp/test/tcr/parser/1852.php.expect
rename to hphp/test/slow/parser/1852.php.expect
diff --git a/hphp/test/tcr/perfect_virtual/76.php b/hphp/test/slow/perfect_virtual/76.php
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/76.php
rename to hphp/test/slow/perfect_virtual/76.php
diff --git a/hphp/test/tcr/perfect_virtual/76.php.expect b/hphp/test/slow/perfect_virtual/76.php.expect
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/76.php.expect
rename to hphp/test/slow/perfect_virtual/76.php.expect
diff --git a/hphp/test/tcr/perfect_virtual/77.php b/hphp/test/slow/perfect_virtual/77.php
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/77.php
rename to hphp/test/slow/perfect_virtual/77.php
diff --git a/hphp/test/tcr/perfect_virtual/77.php.expect b/hphp/test/slow/perfect_virtual/77.php.expect
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/77.php.expect
rename to hphp/test/slow/perfect_virtual/77.php.expect
diff --git a/hphp/test/tcr/perfect_virtual/78.php b/hphp/test/slow/perfect_virtual/78.php
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/78.php
rename to hphp/test/slow/perfect_virtual/78.php
diff --git a/hphp/test/tcr/perfect_virtual/78.php.expect b/hphp/test/slow/perfect_virtual/78.php.expect
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/78.php.expect
rename to hphp/test/slow/perfect_virtual/78.php.expect
diff --git a/hphp/test/tcr/perfect_virtual/79.php b/hphp/test/slow/perfect_virtual/79.php
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/79.php
rename to hphp/test/slow/perfect_virtual/79.php
diff --git a/hphp/test/tcr/perfect_virtual/79.php.expect b/hphp/test/slow/perfect_virtual/79.php.expect
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/79.php.expect
rename to hphp/test/slow/perfect_virtual/79.php.expect
diff --git a/hphp/test/tcr/perfect_virtual/80.php b/hphp/test/slow/perfect_virtual/80.php
similarity index 100%
rename from hphp/test/tcr/perfect_virtual/80.php
rename to hphp/test/slow/perfect_virtual/80.php
diff --git a/hphp/test/tcr/strict_mode/2208.php.expect b/hphp/test/slow/perfect_virtual/80.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2208.php.expect
rename to hphp/test/slow/perfect_virtual/80.php.expect
diff --git a/hphp/test/tcr/predefined/68.php b/hphp/test/slow/predefined/68.php
similarity index 100%
rename from hphp/test/tcr/predefined/68.php
rename to hphp/test/slow/predefined/68.php
diff --git a/hphp/test/tcr/predefined/68.php.expect b/hphp/test/slow/predefined/68.php.expect
similarity index 100%
rename from hphp/test/tcr/predefined/68.php.expect
rename to hphp/test/slow/predefined/68.php.expect
diff --git a/hphp/test/tcr/predefined/69.php b/hphp/test/slow/predefined/69.php
similarity index 100%
rename from hphp/test/tcr/predefined/69.php
rename to hphp/test/slow/predefined/69.php
diff --git a/hphp/test/tcr/predefined/69.php.expect b/hphp/test/slow/predefined/69.php.expect
similarity index 100%
rename from hphp/test/tcr/predefined/69.php.expect
rename to hphp/test/slow/predefined/69.php.expect
diff --git a/hphp/test/tcr/predefined/70.php b/hphp/test/slow/predefined/70.php
similarity index 100%
rename from hphp/test/tcr/predefined/70.php
rename to hphp/test/slow/predefined/70.php
diff --git a/hphp/test/tcr/predefined/70.php.expect b/hphp/test/slow/predefined/70.php.expect
similarity index 100%
rename from hphp/test/tcr/predefined/70.php.expect
rename to hphp/test/slow/predefined/70.php.expect
diff --git a/hphp/test/tcr/predefined/71.php b/hphp/test/slow/predefined/71.php
similarity index 100%
rename from hphp/test/tcr/predefined/71.php
rename to hphp/test/slow/predefined/71.php
diff --git a/hphp/test/tcr/predefined/71.php.expect b/hphp/test/slow/predefined/71.php.expect
similarity index 100%
rename from hphp/test/tcr/predefined/71.php.expect
rename to hphp/test/slow/predefined/71.php.expect
diff --git a/hphp/test/tcr/print/1441.php b/hphp/test/slow/print/1441.php
similarity index 100%
rename from hphp/test/tcr/print/1441.php
rename to hphp/test/slow/print/1441.php
diff --git a/hphp/test/tcr/print/1441.php.expect b/hphp/test/slow/print/1441.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1441.php.expect
rename to hphp/test/slow/print/1441.php.expect
diff --git a/hphp/test/tcr/print/1442.php b/hphp/test/slow/print/1442.php
similarity index 100%
rename from hphp/test/tcr/print/1442.php
rename to hphp/test/slow/print/1442.php
diff --git a/hphp/test/tcr/print/1442.php.expect b/hphp/test/slow/print/1442.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1442.php.expect
rename to hphp/test/slow/print/1442.php.expect
diff --git a/hphp/test/tcr/print/1443.php b/hphp/test/slow/print/1443.php
similarity index 100%
rename from hphp/test/tcr/print/1443.php
rename to hphp/test/slow/print/1443.php
diff --git a/hphp/test/tcr/print/1443.php.expect b/hphp/test/slow/print/1443.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1443.php.expect
rename to hphp/test/slow/print/1443.php.expect
diff --git a/hphp/test/tcr/print/1444.php b/hphp/test/slow/print/1444.php
similarity index 100%
rename from hphp/test/tcr/print/1444.php
rename to hphp/test/slow/print/1444.php
diff --git a/hphp/test/tcr/print/1444.php.expect b/hphp/test/slow/print/1444.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1444.php.expect
rename to hphp/test/slow/print/1444.php.expect
diff --git a/hphp/test/tcr/print/1445.php b/hphp/test/slow/print/1445.php
similarity index 100%
rename from hphp/test/tcr/print/1445.php
rename to hphp/test/slow/print/1445.php
diff --git a/hphp/test/tcr/print/1445.php.expect b/hphp/test/slow/print/1445.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1445.php.expect
rename to hphp/test/slow/print/1445.php.expect
diff --git a/hphp/test/tcr/print/1446.php b/hphp/test/slow/print/1446.php
similarity index 100%
rename from hphp/test/tcr/print/1446.php
rename to hphp/test/slow/print/1446.php
diff --git a/hphp/test/tcr/print/1446.php.expect b/hphp/test/slow/print/1446.php.expect
similarity index 100%
rename from hphp/test/tcr/print/1446.php.expect
rename to hphp/test/slow/print/1446.php.expect
diff --git a/hphp/test/tcr/print/1447.php b/hphp/test/slow/print/1447.php
similarity index 100%
rename from hphp/test/tcr/print/1447.php
rename to hphp/test/slow/print/1447.php
diff --git a/hphp/test/tcr/strict_mode/2210.php.expect b/hphp/test/slow/print/1447.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2210.php.expect
rename to hphp/test/slow/print/1447.php.expect
diff --git a/hphp/test/tcr/print/1448.php b/hphp/test/slow/print/1448.php
similarity index 100%
rename from hphp/test/tcr/print/1448.php
rename to hphp/test/slow/print/1448.php
diff --git a/hphp/test/tcr/strict_mode/2211.php.expect b/hphp/test/slow/print/1448.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2211.php.expect
rename to hphp/test/slow/print/1448.php.expect
diff --git a/hphp/test/tcr/program_functions/1235.php b/hphp/test/slow/program_functions/1235.php
similarity index 100%
rename from hphp/test/tcr/program_functions/1235.php
rename to hphp/test/slow/program_functions/1235.php
diff --git a/hphp/test/tcr/program_functions/1235.php.expect b/hphp/test/slow/program_functions/1235.php.expect
similarity index 100%
rename from hphp/test/tcr/program_functions/1235.php.expect
rename to hphp/test/slow/program_functions/1235.php.expect
diff --git a/hphp/test/tcr/program_functions/1236.php b/hphp/test/slow/program_functions/1236.php
similarity index 100%
rename from hphp/test/tcr/program_functions/1236.php
rename to hphp/test/slow/program_functions/1236.php
diff --git a/hphp/test/tcr/program_functions/1236.php.expect b/hphp/test/slow/program_functions/1236.php.expect
similarity index 100%
rename from hphp/test/tcr/program_functions/1236.php.expect
rename to hphp/test/slow/program_functions/1236.php.expect
diff --git a/hphp/test/tcr/range/548.php b/hphp/test/slow/range/548.php
similarity index 100%
rename from hphp/test/tcr/range/548.php
rename to hphp/test/slow/range/548.php
diff --git a/hphp/test/tcr/range/548.php.expect b/hphp/test/slow/range/548.php.expect
similarity index 100%
rename from hphp/test/tcr/range/548.php.expect
rename to hphp/test/slow/range/548.php.expect
diff --git a/hphp/test/tcr/reassign_this/1490.php b/hphp/test/slow/reassign_this/1490.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1490.php
rename to hphp/test/slow/reassign_this/1490.php
diff --git a/hphp/test/tcr/reassign_this/1490.php.expect b/hphp/test/slow/reassign_this/1490.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1490.php.expect
rename to hphp/test/slow/reassign_this/1490.php.expect
diff --git a/hphp/test/tcr/reassign_this/1491.php b/hphp/test/slow/reassign_this/1491.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1491.php
rename to hphp/test/slow/reassign_this/1491.php
diff --git a/hphp/test/tcr/reassign_this/1491.php.expect b/hphp/test/slow/reassign_this/1491.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1491.php.expect
rename to hphp/test/slow/reassign_this/1491.php.expect
diff --git a/hphp/test/tcr/reassign_this/1492.php b/hphp/test/slow/reassign_this/1492.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1492.php
rename to hphp/test/slow/reassign_this/1492.php
diff --git a/hphp/test/tcr/reassign_this/1492.php.expect b/hphp/test/slow/reassign_this/1492.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1492.php.expect
rename to hphp/test/slow/reassign_this/1492.php.expect
diff --git a/hphp/test/tcr/reassign_this/1493.php b/hphp/test/slow/reassign_this/1493.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1493.php
rename to hphp/test/slow/reassign_this/1493.php
diff --git a/hphp/test/tcr/reassign_this/1493.php.expect b/hphp/test/slow/reassign_this/1493.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1493.php.expect
rename to hphp/test/slow/reassign_this/1493.php.expect
diff --git a/hphp/test/tcr/reassign_this/1494.php b/hphp/test/slow/reassign_this/1494.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1494.php
rename to hphp/test/slow/reassign_this/1494.php
diff --git a/hphp/test/tcr/reassign_this/1494.php.expect b/hphp/test/slow/reassign_this/1494.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1494.php.expect
rename to hphp/test/slow/reassign_this/1494.php.expect
diff --git a/hphp/test/tcr/reassign_this/1495.php b/hphp/test/slow/reassign_this/1495.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1495.php
rename to hphp/test/slow/reassign_this/1495.php
diff --git a/hphp/test/tcr/reassign_this/1495.php.expect b/hphp/test/slow/reassign_this/1495.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1495.php.expect
rename to hphp/test/slow/reassign_this/1495.php.expect
diff --git a/hphp/test/tcr/reassign_this/1496.php b/hphp/test/slow/reassign_this/1496.php
similarity index 100%
rename from hphp/test/tcr/reassign_this/1496.php
rename to hphp/test/slow/reassign_this/1496.php
diff --git a/hphp/test/tcr/reassign_this/1496.php.expect b/hphp/test/slow/reassign_this/1496.php.expect
similarity index 100%
rename from hphp/test/tcr/reassign_this/1496.php.expect
rename to hphp/test/slow/reassign_this/1496.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1461.php b/hphp/test/slow/redeclared_classes/1461.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1461.php
rename to hphp/test/slow/redeclared_classes/1461.php
diff --git a/hphp/test/tcr/redeclared_classes/1461.php.expect b/hphp/test/slow/redeclared_classes/1461.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1461.php.expect
rename to hphp/test/slow/redeclared_classes/1461.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1462.php b/hphp/test/slow/redeclared_classes/1462.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1462.php
rename to hphp/test/slow/redeclared_classes/1462.php
diff --git a/hphp/test/tcr/redeclared_classes/1462.php.expect b/hphp/test/slow/redeclared_classes/1462.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1462.php.expect
rename to hphp/test/slow/redeclared_classes/1462.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1463.php b/hphp/test/slow/redeclared_classes/1463.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1463.php
rename to hphp/test/slow/redeclared_classes/1463.php
diff --git a/hphp/test/tcr/redeclared_classes/1463.php.expect b/hphp/test/slow/redeclared_classes/1463.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1463.php.expect
rename to hphp/test/slow/redeclared_classes/1463.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1464.php b/hphp/test/slow/redeclared_classes/1464.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1464.php
rename to hphp/test/slow/redeclared_classes/1464.php
diff --git a/hphp/test/tcr/redeclared_classes/1464.php.expect b/hphp/test/slow/redeclared_classes/1464.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1464.php.expect
rename to hphp/test/slow/redeclared_classes/1464.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1465.php b/hphp/test/slow/redeclared_classes/1465.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1465.php
rename to hphp/test/slow/redeclared_classes/1465.php
diff --git a/hphp/test/tcr/redeclared_classes/1465.php.expect b/hphp/test/slow/redeclared_classes/1465.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1465.php.expect
rename to hphp/test/slow/redeclared_classes/1465.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1466.php b/hphp/test/slow/redeclared_classes/1466.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1466.php
rename to hphp/test/slow/redeclared_classes/1466.php
diff --git a/hphp/test/tcr/redeclared_classes/1466.php.expect b/hphp/test/slow/redeclared_classes/1466.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1466.php.expect
rename to hphp/test/slow/redeclared_classes/1466.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1467.php b/hphp/test/slow/redeclared_classes/1467.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1467.php
rename to hphp/test/slow/redeclared_classes/1467.php
diff --git a/hphp/test/tcr/redeclared_classes/1467.php.expect b/hphp/test/slow/redeclared_classes/1467.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1467.php.expect
rename to hphp/test/slow/redeclared_classes/1467.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1468.php b/hphp/test/slow/redeclared_classes/1468.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1468.php
rename to hphp/test/slow/redeclared_classes/1468.php
diff --git a/hphp/test/tcr/strict_mode/2212.php.expect b/hphp/test/slow/redeclared_classes/1468.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2212.php.expect
rename to hphp/test/slow/redeclared_classes/1468.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1469.php b/hphp/test/slow/redeclared_classes/1469.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1469.php
rename to hphp/test/slow/redeclared_classes/1469.php
diff --git a/hphp/test/tcr/redeclared_classes/1469.php.expect b/hphp/test/slow/redeclared_classes/1469.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1469.php.expect
rename to hphp/test/slow/redeclared_classes/1469.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1470.php b/hphp/test/slow/redeclared_classes/1470.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1470.php
rename to hphp/test/slow/redeclared_classes/1470.php
diff --git a/hphp/test/tcr/switch_statement/1751.php.expect b/hphp/test/slow/redeclared_classes/1470.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1751.php.expect
rename to hphp/test/slow/redeclared_classes/1470.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1471.php b/hphp/test/slow/redeclared_classes/1471.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1471.php
rename to hphp/test/slow/redeclared_classes/1471.php
diff --git a/hphp/test/tcr/switch_statement/1752.php.expect b/hphp/test/slow/redeclared_classes/1471.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1752.php.expect
rename to hphp/test/slow/redeclared_classes/1471.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1472.php b/hphp/test/slow/redeclared_classes/1472.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1472.php
rename to hphp/test/slow/redeclared_classes/1472.php
diff --git a/hphp/test/tcr/redeclared_classes/1472.php.expect b/hphp/test/slow/redeclared_classes/1472.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1472.php.expect
rename to hphp/test/slow/redeclared_classes/1472.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1473.php b/hphp/test/slow/redeclared_classes/1473.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1473.php
rename to hphp/test/slow/redeclared_classes/1473.php
diff --git a/hphp/test/tcr/redeclared_classes/1473.php.expect b/hphp/test/slow/redeclared_classes/1473.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1473.php.expect
rename to hphp/test/slow/redeclared_classes/1473.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1474.php b/hphp/test/slow/redeclared_classes/1474.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1474.php
rename to hphp/test/slow/redeclared_classes/1474.php
diff --git a/hphp/test/tcr/redeclared_classes/1474.php.expect b/hphp/test/slow/redeclared_classes/1474.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1474.php.expect
rename to hphp/test/slow/redeclared_classes/1474.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1475.php b/hphp/test/slow/redeclared_classes/1475.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1475.php
rename to hphp/test/slow/redeclared_classes/1475.php
diff --git a/hphp/test/tcr/redeclared_classes/1475.php.expect b/hphp/test/slow/redeclared_classes/1475.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1475.php.expect
rename to hphp/test/slow/redeclared_classes/1475.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1476.php b/hphp/test/slow/redeclared_classes/1476.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1476.php
rename to hphp/test/slow/redeclared_classes/1476.php
diff --git a/hphp/test/tcr/redeclared_classes/1476.php.expect b/hphp/test/slow/redeclared_classes/1476.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1476.php.expect
rename to hphp/test/slow/redeclared_classes/1476.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1477.php b/hphp/test/slow/redeclared_classes/1477.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1477.php
rename to hphp/test/slow/redeclared_classes/1477.php
diff --git a/hphp/test/tcr/redeclared_classes/1477.php.expect b/hphp/test/slow/redeclared_classes/1477.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1477.php.expect
rename to hphp/test/slow/redeclared_classes/1477.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1478.php b/hphp/test/slow/redeclared_classes/1478.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1478.php
rename to hphp/test/slow/redeclared_classes/1478.php
diff --git a/hphp/test/tcr/redeclared_classes/1478.php.expect b/hphp/test/slow/redeclared_classes/1478.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1478.php.expect
rename to hphp/test/slow/redeclared_classes/1478.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1479.php b/hphp/test/slow/redeclared_classes/1479.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1479.php
rename to hphp/test/slow/redeclared_classes/1479.php
diff --git a/hphp/test/tcr/redeclared_classes/1479.php.expect b/hphp/test/slow/redeclared_classes/1479.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1479.php.expect
rename to hphp/test/slow/redeclared_classes/1479.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1480.php b/hphp/test/slow/redeclared_classes/1480.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1480.php
rename to hphp/test/slow/redeclared_classes/1480.php
diff --git a/hphp/test/tcr/redeclared_classes/1480.php.expect b/hphp/test/slow/redeclared_classes/1480.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1480.php.expect
rename to hphp/test/slow/redeclared_classes/1480.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1481.php b/hphp/test/slow/redeclared_classes/1481.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1481.php
rename to hphp/test/slow/redeclared_classes/1481.php
diff --git a/hphp/test/tcr/redeclared_classes/1481.php.expect b/hphp/test/slow/redeclared_classes/1481.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1481.php.expect
rename to hphp/test/slow/redeclared_classes/1481.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1482.php b/hphp/test/slow/redeclared_classes/1482.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1482.php
rename to hphp/test/slow/redeclared_classes/1482.php
diff --git a/hphp/test/tcr/redeclared_classes/1482.php.expect b/hphp/test/slow/redeclared_classes/1482.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1482.php.expect
rename to hphp/test/slow/redeclared_classes/1482.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1483.php b/hphp/test/slow/redeclared_classes/1483.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1483.php
rename to hphp/test/slow/redeclared_classes/1483.php
diff --git a/hphp/test/tcr/ternary/1728.php.expect b/hphp/test/slow/redeclared_classes/1483.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1728.php.expect
rename to hphp/test/slow/redeclared_classes/1483.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1484.php b/hphp/test/slow/redeclared_classes/1484.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1484.php
rename to hphp/test/slow/redeclared_classes/1484.php
diff --git a/hphp/test/tcr/redeclared_classes/1484.php.expect b/hphp/test/slow/redeclared_classes/1484.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1484.php.expect
rename to hphp/test/slow/redeclared_classes/1484.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1485.php b/hphp/test/slow/redeclared_classes/1485.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1485.php
rename to hphp/test/slow/redeclared_classes/1485.php
diff --git a/hphp/test/tcr/redeclared_classes/1485.php.expect b/hphp/test/slow/redeclared_classes/1485.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1485.php.expect
rename to hphp/test/slow/redeclared_classes/1485.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1486.php b/hphp/test/slow/redeclared_classes/1486.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1486.php
rename to hphp/test/slow/redeclared_classes/1486.php
diff --git a/hphp/test/tcr/redeclared_classes/1486.php.expect b/hphp/test/slow/redeclared_classes/1486.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1486.php.expect
rename to hphp/test/slow/redeclared_classes/1486.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1487.php b/hphp/test/slow/redeclared_classes/1487.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1487.php
rename to hphp/test/slow/redeclared_classes/1487.php
diff --git a/hphp/test/tcr/redeclared_classes/1487.php.expect b/hphp/test/slow/redeclared_classes/1487.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1487.php.expect
rename to hphp/test/slow/redeclared_classes/1487.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1488.php b/hphp/test/slow/redeclared_classes/1488.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1488.php
rename to hphp/test/slow/redeclared_classes/1488.php
diff --git a/hphp/test/tcr/redeclared_classes/1488.php.expect b/hphp/test/slow/redeclared_classes/1488.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1488.php.expect
rename to hphp/test/slow/redeclared_classes/1488.php.expect
diff --git a/hphp/test/tcr/redeclared_classes/1489.php b/hphp/test/slow/redeclared_classes/1489.php
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1489.php
rename to hphp/test/slow/redeclared_classes/1489.php
diff --git a/hphp/test/tcr/redeclared_classes/1489.php.expect b/hphp/test/slow/redeclared_classes/1489.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_classes/1489.php.expect
rename to hphp/test/slow/redeclared_classes/1489.php.expect
diff --git a/hphp/test/tcr/redeclared_functions/1459.php b/hphp/test/slow/redeclared_functions/1459.php
similarity index 100%
rename from hphp/test/tcr/redeclared_functions/1459.php
rename to hphp/test/slow/redeclared_functions/1459.php
diff --git a/hphp/test/tcr/redeclared_functions/1459.php.expect b/hphp/test/slow/redeclared_functions/1459.php.expect
similarity index 100%
rename from hphp/test/tcr/redeclared_functions/1459.php.expect
rename to hphp/test/slow/redeclared_functions/1459.php.expect
diff --git a/hphp/test/tcr/redeclared_functions/1460.php b/hphp/test/slow/redeclared_functions/1460.php
similarity index 100%
rename from hphp/test/tcr/redeclared_functions/1460.php
rename to hphp/test/slow/redeclared_functions/1460.php
diff --git a/hphp/test/tcr/ternary/1730.php.expect b/hphp/test/slow/redeclared_functions/1460.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1730.php.expect
rename to hphp/test/slow/redeclared_functions/1460.php.expect
diff --git a/hphp/test/tcr/reference/1056.php b/hphp/test/slow/reference/1056.php
similarity index 100%
rename from hphp/test/tcr/reference/1056.php
rename to hphp/test/slow/reference/1056.php
diff --git a/hphp/test/tcr/ternary/1731.php.expect b/hphp/test/slow/reference/1056.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1731.php.expect
rename to hphp/test/slow/reference/1056.php.expect
diff --git a/hphp/test/tcr/reference/1057.php b/hphp/test/slow/reference/1057.php
similarity index 100%
rename from hphp/test/tcr/reference/1057.php
rename to hphp/test/slow/reference/1057.php
diff --git a/hphp/test/tcr/reference/1057.php.expect b/hphp/test/slow/reference/1057.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1057.php.expect
rename to hphp/test/slow/reference/1057.php.expect
diff --git a/hphp/test/tcr/reference/1058.php b/hphp/test/slow/reference/1058.php
similarity index 100%
rename from hphp/test/tcr/reference/1058.php
rename to hphp/test/slow/reference/1058.php
diff --git a/hphp/test/tcr/reference/1058.php.expect b/hphp/test/slow/reference/1058.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1058.php.expect
rename to hphp/test/slow/reference/1058.php.expect
diff --git a/hphp/test/tcr/reference/1059.php b/hphp/test/slow/reference/1059.php
similarity index 100%
rename from hphp/test/tcr/reference/1059.php
rename to hphp/test/slow/reference/1059.php
diff --git a/hphp/test/tcr/reference/1059.php.expect b/hphp/test/slow/reference/1059.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1059.php.expect
rename to hphp/test/slow/reference/1059.php.expect
diff --git a/hphp/test/tcr/reference/1060.php b/hphp/test/slow/reference/1060.php
similarity index 100%
rename from hphp/test/tcr/reference/1060.php
rename to hphp/test/slow/reference/1060.php
diff --git a/hphp/test/tcr/reference/1060.php.expect b/hphp/test/slow/reference/1060.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1060.php.expect
rename to hphp/test/slow/reference/1060.php.expect
diff --git a/hphp/test/tcr/reference/1061.php b/hphp/test/slow/reference/1061.php
similarity index 100%
rename from hphp/test/tcr/reference/1061.php
rename to hphp/test/slow/reference/1061.php
diff --git a/hphp/test/tcr/reference/1061.php.expect b/hphp/test/slow/reference/1061.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1061.php.expect
rename to hphp/test/slow/reference/1061.php.expect
diff --git a/hphp/test/tcr/reference/1062.php b/hphp/test/slow/reference/1062.php
similarity index 100%
rename from hphp/test/tcr/reference/1062.php
rename to hphp/test/slow/reference/1062.php
diff --git a/hphp/test/tcr/reference/1062.php.expect b/hphp/test/slow/reference/1062.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1062.php.expect
rename to hphp/test/slow/reference/1062.php.expect
diff --git a/hphp/test/tcr/reference/1063.php b/hphp/test/slow/reference/1063.php
similarity index 100%
rename from hphp/test/tcr/reference/1063.php
rename to hphp/test/slow/reference/1063.php
diff --git a/hphp/test/tcr/reference/1063.php.expect b/hphp/test/slow/reference/1063.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1063.php.expect
rename to hphp/test/slow/reference/1063.php.expect
diff --git a/hphp/test/tcr/reference/1064.php b/hphp/test/slow/reference/1064.php
similarity index 100%
rename from hphp/test/tcr/reference/1064.php
rename to hphp/test/slow/reference/1064.php
diff --git a/hphp/test/tcr/reference/1064.php.expect b/hphp/test/slow/reference/1064.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1064.php.expect
rename to hphp/test/slow/reference/1064.php.expect
diff --git a/hphp/test/tcr/reference/1065.php b/hphp/test/slow/reference/1065.php
similarity index 100%
rename from hphp/test/tcr/reference/1065.php
rename to hphp/test/slow/reference/1065.php
diff --git a/hphp/test/tcr/reference/1065.php.expect b/hphp/test/slow/reference/1065.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1065.php.expect
rename to hphp/test/slow/reference/1065.php.expect
diff --git a/hphp/test/tcr/reference/1066.php b/hphp/test/slow/reference/1066.php
similarity index 100%
rename from hphp/test/tcr/reference/1066.php
rename to hphp/test/slow/reference/1066.php
diff --git a/hphp/test/tcr/reference/1066.php.expect b/hphp/test/slow/reference/1066.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1066.php.expect
rename to hphp/test/slow/reference/1066.php.expect
diff --git a/hphp/test/tcr/reference/1067.php b/hphp/test/slow/reference/1067.php
similarity index 100%
rename from hphp/test/tcr/reference/1067.php
rename to hphp/test/slow/reference/1067.php
diff --git a/hphp/test/tcr/reference/1067.php.expect b/hphp/test/slow/reference/1067.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1067.php.expect
rename to hphp/test/slow/reference/1067.php.expect
diff --git a/hphp/test/tcr/reference/1068.php b/hphp/test/slow/reference/1068.php
similarity index 100%
rename from hphp/test/tcr/reference/1068.php
rename to hphp/test/slow/reference/1068.php
diff --git a/hphp/test/tcr/reference/1068.php.expect b/hphp/test/slow/reference/1068.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1068.php.expect
rename to hphp/test/slow/reference/1068.php.expect
diff --git a/hphp/test/tcr/reference/1069.php b/hphp/test/slow/reference/1069.php
similarity index 100%
rename from hphp/test/tcr/reference/1069.php
rename to hphp/test/slow/reference/1069.php
diff --git a/hphp/test/tcr/reference/1069.php.expect b/hphp/test/slow/reference/1069.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1069.php.expect
rename to hphp/test/slow/reference/1069.php.expect
diff --git a/hphp/test/tcr/reference/1070.php b/hphp/test/slow/reference/1070.php
similarity index 100%
rename from hphp/test/tcr/reference/1070.php
rename to hphp/test/slow/reference/1070.php
diff --git a/hphp/test/tcr/reference/1070.php.expect b/hphp/test/slow/reference/1070.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1070.php.expect
rename to hphp/test/slow/reference/1070.php.expect
diff --git a/hphp/test/tcr/reference/1071.php b/hphp/test/slow/reference/1071.php
similarity index 100%
rename from hphp/test/tcr/reference/1071.php
rename to hphp/test/slow/reference/1071.php
diff --git a/hphp/test/tcr/reference/1071.php.expect b/hphp/test/slow/reference/1071.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1071.php.expect
rename to hphp/test/slow/reference/1071.php.expect
diff --git a/hphp/test/tcr/reference/1072.php b/hphp/test/slow/reference/1072.php
similarity index 100%
rename from hphp/test/tcr/reference/1072.php
rename to hphp/test/slow/reference/1072.php
diff --git a/hphp/test/tcr/reference/1072.php.expect b/hphp/test/slow/reference/1072.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1072.php.expect
rename to hphp/test/slow/reference/1072.php.expect
diff --git a/hphp/test/tcr/reference/1073.php b/hphp/test/slow/reference/1073.php
similarity index 100%
rename from hphp/test/tcr/reference/1073.php
rename to hphp/test/slow/reference/1073.php
diff --git a/hphp/test/tcr/reference/1073.php.expect b/hphp/test/slow/reference/1073.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1073.php.expect
rename to hphp/test/slow/reference/1073.php.expect
diff --git a/hphp/test/tcr/reference/1074.php b/hphp/test/slow/reference/1074.php
similarity index 100%
rename from hphp/test/tcr/reference/1074.php
rename to hphp/test/slow/reference/1074.php
diff --git a/hphp/test/tcr/reference/1074.php.expect b/hphp/test/slow/reference/1074.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1074.php.expect
rename to hphp/test/slow/reference/1074.php.expect
diff --git a/hphp/test/tcr/reference/1075.php b/hphp/test/slow/reference/1075.php
similarity index 100%
rename from hphp/test/tcr/reference/1075.php
rename to hphp/test/slow/reference/1075.php
diff --git a/hphp/test/tcr/reference/1075.php.expect b/hphp/test/slow/reference/1075.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1075.php.expect
rename to hphp/test/slow/reference/1075.php.expect
diff --git a/hphp/test/tcr/reference/1076.php b/hphp/test/slow/reference/1076.php
similarity index 100%
rename from hphp/test/tcr/reference/1076.php
rename to hphp/test/slow/reference/1076.php
diff --git a/hphp/test/tcr/reference/1076.php.expect b/hphp/test/slow/reference/1076.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1076.php.expect
rename to hphp/test/slow/reference/1076.php.expect
diff --git a/hphp/test/tcr/reference/1077.php b/hphp/test/slow/reference/1077.php
similarity index 100%
rename from hphp/test/tcr/reference/1077.php
rename to hphp/test/slow/reference/1077.php
diff --git a/hphp/test/tcr/reference/1077.php.expect b/hphp/test/slow/reference/1077.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1077.php.expect
rename to hphp/test/slow/reference/1077.php.expect
diff --git a/hphp/test/tcr/reference/1078.php b/hphp/test/slow/reference/1078.php
similarity index 100%
rename from hphp/test/tcr/reference/1078.php
rename to hphp/test/slow/reference/1078.php
diff --git a/hphp/test/tcr/reference/1078.php.expect b/hphp/test/slow/reference/1078.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1078.php.expect
rename to hphp/test/slow/reference/1078.php.expect
diff --git a/hphp/test/tcr/reference/1079.php b/hphp/test/slow/reference/1079.php
similarity index 100%
rename from hphp/test/tcr/reference/1079.php
rename to hphp/test/slow/reference/1079.php
diff --git a/hphp/test/tcr/reference/1079.php.expect b/hphp/test/slow/reference/1079.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1079.php.expect
rename to hphp/test/slow/reference/1079.php.expect
diff --git a/hphp/test/tcr/reference/1080.php b/hphp/test/slow/reference/1080.php
similarity index 100%
rename from hphp/test/tcr/reference/1080.php
rename to hphp/test/slow/reference/1080.php
diff --git a/hphp/test/tcr/reference/1080.php.expect b/hphp/test/slow/reference/1080.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1080.php.expect
rename to hphp/test/slow/reference/1080.php.expect
diff --git a/hphp/test/tcr/reference/1081.php b/hphp/test/slow/reference/1081.php
similarity index 100%
rename from hphp/test/tcr/reference/1081.php
rename to hphp/test/slow/reference/1081.php
diff --git a/hphp/test/tcr/reference/1081.php.expect b/hphp/test/slow/reference/1081.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1081.php.expect
rename to hphp/test/slow/reference/1081.php.expect
diff --git a/hphp/test/tcr/reference/1082.php b/hphp/test/slow/reference/1082.php
similarity index 100%
rename from hphp/test/tcr/reference/1082.php
rename to hphp/test/slow/reference/1082.php
diff --git a/hphp/test/tcr/reference/1082.php.expect b/hphp/test/slow/reference/1082.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1082.php.expect
rename to hphp/test/slow/reference/1082.php.expect
diff --git a/hphp/test/tcr/reference/1083.php b/hphp/test/slow/reference/1083.php
similarity index 100%
rename from hphp/test/tcr/reference/1083.php
rename to hphp/test/slow/reference/1083.php
diff --git a/hphp/test/tcr/reference/1083.php.expect b/hphp/test/slow/reference/1083.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1083.php.expect
rename to hphp/test/slow/reference/1083.php.expect
diff --git a/hphp/test/tcr/reference/1084.php b/hphp/test/slow/reference/1084.php
similarity index 100%
rename from hphp/test/tcr/reference/1084.php
rename to hphp/test/slow/reference/1084.php
diff --git a/hphp/test/tcr/reference/1084.php.expect b/hphp/test/slow/reference/1084.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1084.php.expect
rename to hphp/test/slow/reference/1084.php.expect
diff --git a/hphp/test/tcr/reference/1085.php b/hphp/test/slow/reference/1085.php
similarity index 100%
rename from hphp/test/tcr/reference/1085.php
rename to hphp/test/slow/reference/1085.php
diff --git a/hphp/test/tcr/reference/1085.php.expect b/hphp/test/slow/reference/1085.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1085.php.expect
rename to hphp/test/slow/reference/1085.php.expect
diff --git a/hphp/test/tcr/reference/1086.php b/hphp/test/slow/reference/1086.php
similarity index 100%
rename from hphp/test/tcr/reference/1086.php
rename to hphp/test/slow/reference/1086.php
diff --git a/hphp/test/tcr/reference/1086.php.expect b/hphp/test/slow/reference/1086.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1086.php.expect
rename to hphp/test/slow/reference/1086.php.expect
diff --git a/hphp/test/tcr/reference/1087.php b/hphp/test/slow/reference/1087.php
similarity index 100%
rename from hphp/test/tcr/reference/1087.php
rename to hphp/test/slow/reference/1087.php
diff --git a/hphp/test/tcr/reference/1087.php.expect b/hphp/test/slow/reference/1087.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1087.php.expect
rename to hphp/test/slow/reference/1087.php.expect
diff --git a/hphp/test/tcr/reference/1088.php b/hphp/test/slow/reference/1088.php
similarity index 100%
rename from hphp/test/tcr/reference/1088.php
rename to hphp/test/slow/reference/1088.php
diff --git a/hphp/test/tcr/reference/1088.php.expect b/hphp/test/slow/reference/1088.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1088.php.expect
rename to hphp/test/slow/reference/1088.php.expect
diff --git a/hphp/test/tcr/reference/1089.php b/hphp/test/slow/reference/1089.php
similarity index 100%
rename from hphp/test/tcr/reference/1089.php
rename to hphp/test/slow/reference/1089.php
diff --git a/hphp/test/tcr/reference/1089.php.expect b/hphp/test/slow/reference/1089.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1089.php.expect
rename to hphp/test/slow/reference/1089.php.expect
diff --git a/hphp/test/tcr/reference/1090.php b/hphp/test/slow/reference/1090.php
similarity index 100%
rename from hphp/test/tcr/reference/1090.php
rename to hphp/test/slow/reference/1090.php
diff --git a/hphp/test/tcr/reference/1090.php.expect b/hphp/test/slow/reference/1090.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1090.php.expect
rename to hphp/test/slow/reference/1090.php.expect
diff --git a/hphp/test/tcr/reference/1091.php b/hphp/test/slow/reference/1091.php
similarity index 100%
rename from hphp/test/tcr/reference/1091.php
rename to hphp/test/slow/reference/1091.php
diff --git a/hphp/test/tcr/reference/1091.php.expect b/hphp/test/slow/reference/1091.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1091.php.expect
rename to hphp/test/slow/reference/1091.php.expect
diff --git a/hphp/test/tcr/reference/1092.php b/hphp/test/slow/reference/1092.php
similarity index 100%
rename from hphp/test/tcr/reference/1092.php
rename to hphp/test/slow/reference/1092.php
diff --git a/hphp/test/tcr/reference/1092.php.expect b/hphp/test/slow/reference/1092.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1092.php.expect
rename to hphp/test/slow/reference/1092.php.expect
diff --git a/hphp/test/tcr/reference/1093.php b/hphp/test/slow/reference/1093.php
similarity index 100%
rename from hphp/test/tcr/reference/1093.php
rename to hphp/test/slow/reference/1093.php
diff --git a/hphp/test/tcr/reference/1093.php.expect b/hphp/test/slow/reference/1093.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1093.php.expect
rename to hphp/test/slow/reference/1093.php.expect
diff --git a/hphp/test/tcr/reference/1094.php b/hphp/test/slow/reference/1094.php
similarity index 100%
rename from hphp/test/tcr/reference/1094.php
rename to hphp/test/slow/reference/1094.php
diff --git a/hphp/test/tcr/reference/1094.php.expect b/hphp/test/slow/reference/1094.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1094.php.expect
rename to hphp/test/slow/reference/1094.php.expect
diff --git a/hphp/test/tcr/reference/1095.php b/hphp/test/slow/reference/1095.php
similarity index 100%
rename from hphp/test/tcr/reference/1095.php
rename to hphp/test/slow/reference/1095.php
diff --git a/hphp/test/tcr/reference/1095.php.expect b/hphp/test/slow/reference/1095.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1095.php.expect
rename to hphp/test/slow/reference/1095.php.expect
diff --git a/hphp/test/tcr/reference/1096.php b/hphp/test/slow/reference/1096.php
similarity index 100%
rename from hphp/test/tcr/reference/1096.php
rename to hphp/test/slow/reference/1096.php
diff --git a/hphp/test/tcr/reference/1096.php.expect b/hphp/test/slow/reference/1096.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1096.php.expect
rename to hphp/test/slow/reference/1096.php.expect
diff --git a/hphp/test/tcr/reference/1097.php b/hphp/test/slow/reference/1097.php
similarity index 100%
rename from hphp/test/tcr/reference/1097.php
rename to hphp/test/slow/reference/1097.php
diff --git a/hphp/test/tcr/reference/1097.php.expect b/hphp/test/slow/reference/1097.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1097.php.expect
rename to hphp/test/slow/reference/1097.php.expect
diff --git a/hphp/test/tcr/reference/1098.php b/hphp/test/slow/reference/1098.php
similarity index 100%
rename from hphp/test/tcr/reference/1098.php
rename to hphp/test/slow/reference/1098.php
diff --git a/hphp/test/tcr/reference/1098.php.expect b/hphp/test/slow/reference/1098.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1098.php.expect
rename to hphp/test/slow/reference/1098.php.expect
diff --git a/hphp/test/tcr/reference/1099.php b/hphp/test/slow/reference/1099.php
similarity index 100%
rename from hphp/test/tcr/reference/1099.php
rename to hphp/test/slow/reference/1099.php
diff --git a/hphp/test/tcr/reference/1099.php.expect b/hphp/test/slow/reference/1099.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1099.php.expect
rename to hphp/test/slow/reference/1099.php.expect
diff --git a/hphp/test/tcr/reference/1100.php b/hphp/test/slow/reference/1100.php
similarity index 100%
rename from hphp/test/tcr/reference/1100.php
rename to hphp/test/slow/reference/1100.php
diff --git a/hphp/test/tcr/reference/1100.php.expect b/hphp/test/slow/reference/1100.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1100.php.expect
rename to hphp/test/slow/reference/1100.php.expect
diff --git a/hphp/test/tcr/reference/1101.php b/hphp/test/slow/reference/1101.php
similarity index 100%
rename from hphp/test/tcr/reference/1101.php
rename to hphp/test/slow/reference/1101.php
diff --git a/hphp/test/tcr/reference/1101.php.expect b/hphp/test/slow/reference/1101.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1101.php.expect
rename to hphp/test/slow/reference/1101.php.expect
diff --git a/hphp/test/tcr/reference/1102.php b/hphp/test/slow/reference/1102.php
similarity index 100%
rename from hphp/test/tcr/reference/1102.php
rename to hphp/test/slow/reference/1102.php
diff --git a/hphp/test/tcr/reference/1102.php.expect b/hphp/test/slow/reference/1102.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1102.php.expect
rename to hphp/test/slow/reference/1102.php.expect
diff --git a/hphp/test/tcr/reference/1103.php b/hphp/test/slow/reference/1103.php
similarity index 100%
rename from hphp/test/tcr/reference/1103.php
rename to hphp/test/slow/reference/1103.php
diff --git a/hphp/test/tcr/reference/1103.php.expect b/hphp/test/slow/reference/1103.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1103.php.expect
rename to hphp/test/slow/reference/1103.php.expect
diff --git a/hphp/test/tcr/reference/1104.php b/hphp/test/slow/reference/1104.php
similarity index 100%
rename from hphp/test/tcr/reference/1104.php
rename to hphp/test/slow/reference/1104.php
diff --git a/hphp/test/tcr/reference/1104.php.expect b/hphp/test/slow/reference/1104.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1104.php.expect
rename to hphp/test/slow/reference/1104.php.expect
diff --git a/hphp/test/tcr/reference/1105.php b/hphp/test/slow/reference/1105.php
similarity index 100%
rename from hphp/test/tcr/reference/1105.php
rename to hphp/test/slow/reference/1105.php
diff --git a/hphp/test/tcr/reference/1105.php.expect b/hphp/test/slow/reference/1105.php.expect
similarity index 100%
rename from hphp/test/tcr/reference/1105.php.expect
rename to hphp/test/slow/reference/1105.php.expect
diff --git a/hphp/test/tcr/reflection/1328.php b/hphp/test/slow/reflection/1328.php
similarity index 100%
rename from hphp/test/tcr/reflection/1328.php
rename to hphp/test/slow/reflection/1328.php
diff --git a/hphp/test/tcr/reflection/1328.php.expect b/hphp/test/slow/reflection/1328.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1328.php.expect
rename to hphp/test/slow/reflection/1328.php.expect
diff --git a/hphp/test/tcr/reflection/1329.php b/hphp/test/slow/reflection/1329.php
similarity index 100%
rename from hphp/test/tcr/reflection/1329.php
rename to hphp/test/slow/reflection/1329.php
diff --git a/hphp/test/tcr/reflection/1329.php.expect b/hphp/test/slow/reflection/1329.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1329.php.expect
rename to hphp/test/slow/reflection/1329.php.expect
diff --git a/hphp/test/tcr/reflection/1330.php b/hphp/test/slow/reflection/1330.php
similarity index 100%
rename from hphp/test/tcr/reflection/1330.php
rename to hphp/test/slow/reflection/1330.php
diff --git a/hphp/test/tcr/reflection/1330.php.expect b/hphp/test/slow/reflection/1330.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1330.php.expect
rename to hphp/test/slow/reflection/1330.php.expect
diff --git a/hphp/test/tcr/reflection/1331.php b/hphp/test/slow/reflection/1331.php
similarity index 100%
rename from hphp/test/tcr/reflection/1331.php
rename to hphp/test/slow/reflection/1331.php
diff --git a/hphp/test/tcr/reflection/1331.php.expect b/hphp/test/slow/reflection/1331.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1331.php.expect
rename to hphp/test/slow/reflection/1331.php.expect
diff --git a/hphp/test/tcr/reflection/1332.php b/hphp/test/slow/reflection/1332.php
similarity index 100%
rename from hphp/test/tcr/reflection/1332.php
rename to hphp/test/slow/reflection/1332.php
diff --git a/hphp/test/tcr/reflection/1332.php.expect b/hphp/test/slow/reflection/1332.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1332.php.expect
rename to hphp/test/slow/reflection/1332.php.expect
diff --git a/hphp/test/tcr/reflection/1333.php b/hphp/test/slow/reflection/1333.php
similarity index 100%
rename from hphp/test/tcr/reflection/1333.php
rename to hphp/test/slow/reflection/1333.php
diff --git a/hphp/test/tcr/reflection/1333.php.expect b/hphp/test/slow/reflection/1333.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1333.php.expect
rename to hphp/test/slow/reflection/1333.php.expect
diff --git a/hphp/test/tcr/reflection/1334.php b/hphp/test/slow/reflection/1334.php
similarity index 100%
rename from hphp/test/tcr/reflection/1334.php
rename to hphp/test/slow/reflection/1334.php
diff --git a/hphp/test/tcr/reflection/1334.php.expect b/hphp/test/slow/reflection/1334.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1334.php.expect
rename to hphp/test/slow/reflection/1334.php.expect
diff --git a/hphp/test/tcr/reflection/1335.php b/hphp/test/slow/reflection/1335.php
similarity index 100%
rename from hphp/test/tcr/reflection/1335.php
rename to hphp/test/slow/reflection/1335.php
diff --git a/hphp/test/tcr/reflection/1335.php.expect b/hphp/test/slow/reflection/1335.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1335.php.expect
rename to hphp/test/slow/reflection/1335.php.expect
diff --git a/hphp/test/tcr/reflection/1336.php b/hphp/test/slow/reflection/1336.php
similarity index 100%
rename from hphp/test/tcr/reflection/1336.php
rename to hphp/test/slow/reflection/1336.php
diff --git a/hphp/test/tcr/reflection/1336.php.expect b/hphp/test/slow/reflection/1336.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1336.php.expect
rename to hphp/test/slow/reflection/1336.php.expect
diff --git a/hphp/test/tcr/reflection/1337.php b/hphp/test/slow/reflection/1337.php
similarity index 100%
rename from hphp/test/tcr/reflection/1337.php
rename to hphp/test/slow/reflection/1337.php
diff --git a/hphp/test/tcr/reflection/1337.php.expect b/hphp/test/slow/reflection/1337.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1337.php.expect
rename to hphp/test/slow/reflection/1337.php.expect
diff --git a/hphp/test/tcr/reflection/1338.php b/hphp/test/slow/reflection/1338.php
similarity index 100%
rename from hphp/test/tcr/reflection/1338.php
rename to hphp/test/slow/reflection/1338.php
diff --git a/hphp/test/tcr/reflection/1338.php.expect b/hphp/test/slow/reflection/1338.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1338.php.expect
rename to hphp/test/slow/reflection/1338.php.expect
diff --git a/hphp/test/tcr/reflection/1339.php b/hphp/test/slow/reflection/1339.php
similarity index 100%
rename from hphp/test/tcr/reflection/1339.php
rename to hphp/test/slow/reflection/1339.php
diff --git a/hphp/test/tcr/reflection/1339.php.expect b/hphp/test/slow/reflection/1339.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1339.php.expect
rename to hphp/test/slow/reflection/1339.php.expect
diff --git a/hphp/test/tcr/reflection/1340.php b/hphp/test/slow/reflection/1340.php
similarity index 100%
rename from hphp/test/tcr/reflection/1340.php
rename to hphp/test/slow/reflection/1340.php
diff --git a/hphp/test/tcr/reflection/1340.php.expect b/hphp/test/slow/reflection/1340.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1340.php.expect
rename to hphp/test/slow/reflection/1340.php.expect
diff --git a/hphp/test/tcr/reflection/1341.php b/hphp/test/slow/reflection/1341.php
similarity index 100%
rename from hphp/test/tcr/reflection/1341.php
rename to hphp/test/slow/reflection/1341.php
diff --git a/hphp/test/tcr/reflection/1341.php.expect b/hphp/test/slow/reflection/1341.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1341.php.expect
rename to hphp/test/slow/reflection/1341.php.expect
diff --git a/hphp/test/tcr/reflection/1341.php.hphp_opts b/hphp/test/slow/reflection/1341.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/reflection/1341.php.hphp_opts
rename to hphp/test/slow/reflection/1341.php.hphp_opts
diff --git a/hphp/test/tcr/reflection/1341.php.opts b/hphp/test/slow/reflection/1341.php.opts
similarity index 100%
rename from hphp/test/tcr/reflection/1341.php.opts
rename to hphp/test/slow/reflection/1341.php.opts
diff --git a/hphp/test/tcr/reflection/1342.php b/hphp/test/slow/reflection/1342.php
similarity index 100%
rename from hphp/test/tcr/reflection/1342.php
rename to hphp/test/slow/reflection/1342.php
diff --git a/hphp/test/tcr/reflection/1342.php.expect b/hphp/test/slow/reflection/1342.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1342.php.expect
rename to hphp/test/slow/reflection/1342.php.expect
diff --git a/hphp/test/tcr/reflection/1342.php.hphp_opts b/hphp/test/slow/reflection/1342.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/reflection/1342.php.hphp_opts
rename to hphp/test/slow/reflection/1342.php.hphp_opts
diff --git a/hphp/test/tcr/reflection/1342.php.opts b/hphp/test/slow/reflection/1342.php.opts
similarity index 100%
rename from hphp/test/tcr/reflection/1342.php.opts
rename to hphp/test/slow/reflection/1342.php.opts
diff --git a/hphp/test/tcr/reflection/1343.php b/hphp/test/slow/reflection/1343.php
similarity index 100%
rename from hphp/test/tcr/reflection/1343.php
rename to hphp/test/slow/reflection/1343.php
diff --git a/hphp/test/tcr/reflection/1343.php.expect b/hphp/test/slow/reflection/1343.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1343.php.expect
rename to hphp/test/slow/reflection/1343.php.expect
diff --git a/hphp/test/tcr/reflection/1343.php.hphp_opts b/hphp/test/slow/reflection/1343.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/reflection/1343.php.hphp_opts
rename to hphp/test/slow/reflection/1343.php.hphp_opts
diff --git a/hphp/test/tcr/reflection/1343.php.opts b/hphp/test/slow/reflection/1343.php.opts
similarity index 100%
rename from hphp/test/tcr/reflection/1343.php.opts
rename to hphp/test/slow/reflection/1343.php.opts
diff --git a/hphp/test/tcr/reflection/1344.php b/hphp/test/slow/reflection/1344.php
similarity index 100%
rename from hphp/test/tcr/reflection/1344.php
rename to hphp/test/slow/reflection/1344.php
diff --git a/hphp/test/tcr/reflection/1344.php.expect b/hphp/test/slow/reflection/1344.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1344.php.expect
rename to hphp/test/slow/reflection/1344.php.expect
diff --git a/hphp/test/tcr/reflection/1345.php b/hphp/test/slow/reflection/1345.php
similarity index 100%
rename from hphp/test/tcr/reflection/1345.php
rename to hphp/test/slow/reflection/1345.php
diff --git a/hphp/test/tcr/reflection/1345.php.expect b/hphp/test/slow/reflection/1345.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1345.php.expect
rename to hphp/test/slow/reflection/1345.php.expect
diff --git a/hphp/test/tcr/reflection/1346.php b/hphp/test/slow/reflection/1346.php
similarity index 100%
rename from hphp/test/tcr/reflection/1346.php
rename to hphp/test/slow/reflection/1346.php
diff --git a/hphp/test/tcr/reflection/1346.php.expect b/hphp/test/slow/reflection/1346.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1346.php.expect
rename to hphp/test/slow/reflection/1346.php.expect
diff --git a/hphp/test/tcr/reflection/1347.php b/hphp/test/slow/reflection/1347.php
similarity index 100%
rename from hphp/test/tcr/reflection/1347.php
rename to hphp/test/slow/reflection/1347.php
diff --git a/hphp/test/tcr/reflection/1347.php.expect b/hphp/test/slow/reflection/1347.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1347.php.expect
rename to hphp/test/slow/reflection/1347.php.expect
diff --git a/hphp/test/tcr/reflection/1348.php b/hphp/test/slow/reflection/1348.php
similarity index 100%
rename from hphp/test/tcr/reflection/1348.php
rename to hphp/test/slow/reflection/1348.php
diff --git a/hphp/test/tcr/reflection/1348.php.expect b/hphp/test/slow/reflection/1348.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1348.php.expect
rename to hphp/test/slow/reflection/1348.php.expect
diff --git a/hphp/test/tcr/reflection/1349.php b/hphp/test/slow/reflection/1349.php
similarity index 100%
rename from hphp/test/tcr/reflection/1349.php
rename to hphp/test/slow/reflection/1349.php
diff --git a/hphp/test/tcr/reflection/1349.php.expect b/hphp/test/slow/reflection/1349.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1349.php.expect
rename to hphp/test/slow/reflection/1349.php.expect
diff --git a/hphp/test/tcr/reflection/1350.php b/hphp/test/slow/reflection/1350.php
similarity index 100%
rename from hphp/test/tcr/reflection/1350.php
rename to hphp/test/slow/reflection/1350.php
diff --git a/hphp/test/tcr/reflection/1350.php.expect b/hphp/test/slow/reflection/1350.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1350.php.expect
rename to hphp/test/slow/reflection/1350.php.expect
diff --git a/hphp/test/tcr/reflection/1351.php b/hphp/test/slow/reflection/1351.php
similarity index 100%
rename from hphp/test/tcr/reflection/1351.php
rename to hphp/test/slow/reflection/1351.php
diff --git a/hphp/test/tcr/reflection/1351.php.expect b/hphp/test/slow/reflection/1351.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1351.php.expect
rename to hphp/test/slow/reflection/1351.php.expect
diff --git a/hphp/test/tcr/reflection/1352.php b/hphp/test/slow/reflection/1352.php
similarity index 100%
rename from hphp/test/tcr/reflection/1352.php
rename to hphp/test/slow/reflection/1352.php
diff --git a/hphp/test/tcr/reflection/1352.php.expect b/hphp/test/slow/reflection/1352.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1352.php.expect
rename to hphp/test/slow/reflection/1352.php.expect
diff --git a/hphp/test/tcr/reflection/1353.php b/hphp/test/slow/reflection/1353.php
similarity index 100%
rename from hphp/test/tcr/reflection/1353.php
rename to hphp/test/slow/reflection/1353.php
diff --git a/hphp/test/tcr/reflection/1353.php.expect b/hphp/test/slow/reflection/1353.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection/1353.php.expect
rename to hphp/test/slow/reflection/1353.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1354.php b/hphp/test/slow/reflection_classes/1354.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1354.php
rename to hphp/test/slow/reflection_classes/1354.php
diff --git a/hphp/test/tcr/reflection_classes/1354.php.expect b/hphp/test/slow/reflection_classes/1354.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1354.php.expect
rename to hphp/test/slow/reflection_classes/1354.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1355.php b/hphp/test/slow/reflection_classes/1355.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1355.php
rename to hphp/test/slow/reflection_classes/1355.php
diff --git a/hphp/test/tcr/reflection_classes/1355.php.expect b/hphp/test/slow/reflection_classes/1355.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1355.php.expect
rename to hphp/test/slow/reflection_classes/1355.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1356.php b/hphp/test/slow/reflection_classes/1356.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1356.php
rename to hphp/test/slow/reflection_classes/1356.php
diff --git a/hphp/test/tcr/reflection_classes/1356.php.expect b/hphp/test/slow/reflection_classes/1356.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1356.php.expect
rename to hphp/test/slow/reflection_classes/1356.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1357.php b/hphp/test/slow/reflection_classes/1357.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1357.php
rename to hphp/test/slow/reflection_classes/1357.php
diff --git a/hphp/test/tcr/reflection_classes/1357.php.expect b/hphp/test/slow/reflection_classes/1357.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1357.php.expect
rename to hphp/test/slow/reflection_classes/1357.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1358.php b/hphp/test/slow/reflection_classes/1358.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1358.php
rename to hphp/test/slow/reflection_classes/1358.php
diff --git a/hphp/test/tcr/reflection_classes/1358.php.expect b/hphp/test/slow/reflection_classes/1358.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1358.php.expect
rename to hphp/test/slow/reflection_classes/1358.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1359.php b/hphp/test/slow/reflection_classes/1359.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1359.php
rename to hphp/test/slow/reflection_classes/1359.php
diff --git a/hphp/test/tcr/reflection_classes/1359.php.expect b/hphp/test/slow/reflection_classes/1359.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1359.php.expect
rename to hphp/test/slow/reflection_classes/1359.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1360.php b/hphp/test/slow/reflection_classes/1360.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1360.php
rename to hphp/test/slow/reflection_classes/1360.php
diff --git a/hphp/test/tcr/reflection_classes/1360.php.expect b/hphp/test/slow/reflection_classes/1360.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1360.php.expect
rename to hphp/test/slow/reflection_classes/1360.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1361.php b/hphp/test/slow/reflection_classes/1361.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1361.php
rename to hphp/test/slow/reflection_classes/1361.php
diff --git a/hphp/test/tcr/reflection_classes/1361.php.expect b/hphp/test/slow/reflection_classes/1361.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1361.php.expect
rename to hphp/test/slow/reflection_classes/1361.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1362.php b/hphp/test/slow/reflection_classes/1362.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1362.php
rename to hphp/test/slow/reflection_classes/1362.php
diff --git a/hphp/test/tcr/reflection_classes/1362.php.expect b/hphp/test/slow/reflection_classes/1362.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1362.php.expect
rename to hphp/test/slow/reflection_classes/1362.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1363.php b/hphp/test/slow/reflection_classes/1363.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1363.php
rename to hphp/test/slow/reflection_classes/1363.php
diff --git a/hphp/test/tcr/reflection_classes/1363.php.expect b/hphp/test/slow/reflection_classes/1363.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1363.php.expect
rename to hphp/test/slow/reflection_classes/1363.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1364.php b/hphp/test/slow/reflection_classes/1364.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1364.php
rename to hphp/test/slow/reflection_classes/1364.php
diff --git a/hphp/test/tcr/reflection_classes/1364.php.expect b/hphp/test/slow/reflection_classes/1364.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1364.php.expect
rename to hphp/test/slow/reflection_classes/1364.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1365.php b/hphp/test/slow/reflection_classes/1365.php
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1365.php
rename to hphp/test/slow/reflection_classes/1365.php
diff --git a/hphp/test/tcr/reflection_classes/1365.php.expect b/hphp/test/slow/reflection_classes/1365.php.expect
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1365.php.expect
rename to hphp/test/slow/reflection_classes/1365.php.expect
diff --git a/hphp/test/tcr/reflection_classes/1365.php.hphp_opts b/hphp/test/slow/reflection_classes/1365.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1365.php.hphp_opts
rename to hphp/test/slow/reflection_classes/1365.php.hphp_opts
diff --git a/hphp/test/tcr/reflection_classes/1365.php.opts b/hphp/test/slow/reflection_classes/1365.php.opts
similarity index 100%
rename from hphp/test/tcr/reflection_classes/1365.php.opts
rename to hphp/test/slow/reflection_classes/1365.php.opts
diff --git a/hphp/test/tcr/rename_function/1190.php b/hphp/test/slow/rename_function/1190.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1190.php
rename to hphp/test/slow/rename_function/1190.php
diff --git a/hphp/test/tcr/rename_function/1190.php.expect b/hphp/test/slow/rename_function/1190.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1190.php.expect
rename to hphp/test/slow/rename_function/1190.php.expect
diff --git a/hphp/test/tcr/rename_function/1190.php.hphp_opts b/hphp/test/slow/rename_function/1190.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1190.php.hphp_opts
rename to hphp/test/slow/rename_function/1190.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1190.php.opts b/hphp/test/slow/rename_function/1190.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1190.php.opts
rename to hphp/test/slow/rename_function/1190.php.opts
diff --git a/hphp/test/tcr/rename_function/1191.php b/hphp/test/slow/rename_function/1191.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1191.php
rename to hphp/test/slow/rename_function/1191.php
diff --git a/hphp/test/tcr/rename_function/1191.php.expect b/hphp/test/slow/rename_function/1191.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1191.php.expect
rename to hphp/test/slow/rename_function/1191.php.expect
diff --git a/hphp/test/tcr/rename_function/1191.php.hphp_opts b/hphp/test/slow/rename_function/1191.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1191.php.hphp_opts
rename to hphp/test/slow/rename_function/1191.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1191.php.opts b/hphp/test/slow/rename_function/1191.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1191.php.opts
rename to hphp/test/slow/rename_function/1191.php.opts
diff --git a/hphp/test/tcr/rename_function/1192.php b/hphp/test/slow/rename_function/1192.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1192.php
rename to hphp/test/slow/rename_function/1192.php
diff --git a/hphp/test/tcr/rename_function/1192.php.expect b/hphp/test/slow/rename_function/1192.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1192.php.expect
rename to hphp/test/slow/rename_function/1192.php.expect
diff --git a/hphp/test/tcr/rename_function/1192.php.hphp_opts b/hphp/test/slow/rename_function/1192.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1192.php.hphp_opts
rename to hphp/test/slow/rename_function/1192.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1192.php.opts b/hphp/test/slow/rename_function/1192.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1192.php.opts
rename to hphp/test/slow/rename_function/1192.php.opts
diff --git a/hphp/test/tcr/rename_function/1193.php b/hphp/test/slow/rename_function/1193.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1193.php
rename to hphp/test/slow/rename_function/1193.php
diff --git a/hphp/test/tcr/rename_function/1193.php.expect b/hphp/test/slow/rename_function/1193.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1193.php.expect
rename to hphp/test/slow/rename_function/1193.php.expect
diff --git a/hphp/test/tcr/rename_function/1193.php.hphp_opts b/hphp/test/slow/rename_function/1193.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1193.php.hphp_opts
rename to hphp/test/slow/rename_function/1193.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1193.php.opts b/hphp/test/slow/rename_function/1193.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1193.php.opts
rename to hphp/test/slow/rename_function/1193.php.opts
diff --git a/hphp/test/tcr/rename_function/1194.php b/hphp/test/slow/rename_function/1194.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1194.php
rename to hphp/test/slow/rename_function/1194.php
diff --git a/hphp/test/tcr/ternary/1732.php.expect b/hphp/test/slow/rename_function/1194.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1732.php.expect
rename to hphp/test/slow/rename_function/1194.php.expect
diff --git a/hphp/test/tcr/rename_function/1194.php.hphp_opts b/hphp/test/slow/rename_function/1194.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1194.php.hphp_opts
rename to hphp/test/slow/rename_function/1194.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1194.php.opts b/hphp/test/slow/rename_function/1194.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1194.php.opts
rename to hphp/test/slow/rename_function/1194.php.opts
diff --git a/hphp/test/tcr/rename_function/1195.php b/hphp/test/slow/rename_function/1195.php
similarity index 100%
rename from hphp/test/tcr/rename_function/1195.php
rename to hphp/test/slow/rename_function/1195.php
diff --git a/hphp/test/tcr/rename_function/1195.php.expect b/hphp/test/slow/rename_function/1195.php.expect
similarity index 100%
rename from hphp/test/tcr/rename_function/1195.php.expect
rename to hphp/test/slow/rename_function/1195.php.expect
diff --git a/hphp/test/tcr/rename_function/1195.php.hphp_opts b/hphp/test/slow/rename_function/1195.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1195.php.hphp_opts
rename to hphp/test/slow/rename_function/1195.php.hphp_opts
diff --git a/hphp/test/tcr/rename_function/1195.php.opts b/hphp/test/slow/rename_function/1195.php.opts
similarity index 100%
rename from hphp/test/tcr/rename_function/1195.php.opts
rename to hphp/test/slow/rename_function/1195.php.opts
diff --git a/hphp/test/tcr/rename_functions.opts b/hphp/test/slow/rename_functions.opts
similarity index 100%
rename from hphp/test/tcr/rename_functions.opts
rename to hphp/test/slow/rename_functions.opts
diff --git a/hphp/test/tcr/return_statement/1418.php b/hphp/test/slow/return_statement/1418.php
similarity index 100%
rename from hphp/test/tcr/return_statement/1418.php
rename to hphp/test/slow/return_statement/1418.php
diff --git a/hphp/test/tcr/return_statement/1418.php.expect b/hphp/test/slow/return_statement/1418.php.expect
similarity index 100%
rename from hphp/test/tcr/return_statement/1418.php.expect
rename to hphp/test/slow/return_statement/1418.php.expect
diff --git a/hphp/test/tcr/return_statement/1419.php b/hphp/test/slow/return_statement/1419.php
similarity index 100%
rename from hphp/test/tcr/return_statement/1419.php
rename to hphp/test/slow/return_statement/1419.php
diff --git a/hphp/test/tcr/return_statement/1419.php.expect b/hphp/test/slow/return_statement/1419.php.expect
similarity index 100%
rename from hphp/test/tcr/return_statement/1419.php.expect
rename to hphp/test/slow/return_statement/1419.php.expect
diff --git a/hphp/test/tcr/sanity/0.php b/hphp/test/slow/sanity/0.php
similarity index 100%
rename from hphp/test/tcr/sanity/0.php
rename to hphp/test/slow/sanity/0.php
diff --git a/hphp/test/tcr/sanity/0.php.expect b/hphp/test/slow/sanity/0.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/0.php.expect
rename to hphp/test/slow/sanity/0.php.expect
diff --git a/hphp/test/tcr/sanity/1.php b/hphp/test/slow/sanity/1.php
similarity index 100%
rename from hphp/test/tcr/sanity/1.php
rename to hphp/test/slow/sanity/1.php
diff --git a/hphp/test/tcr/sanity/1.php.expect b/hphp/test/slow/sanity/1.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/1.php.expect
rename to hphp/test/slow/sanity/1.php.expect
diff --git a/hphp/test/tcr/sanity/2.php b/hphp/test/slow/sanity/2.php
similarity index 100%
rename from hphp/test/tcr/sanity/2.php
rename to hphp/test/slow/sanity/2.php
diff --git a/hphp/test/tcr/ternary/1733.php.expect b/hphp/test/slow/sanity/2.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1733.php.expect
rename to hphp/test/slow/sanity/2.php.expect
diff --git a/hphp/test/tcr/sanity/3.php b/hphp/test/slow/sanity/3.php
similarity index 100%
rename from hphp/test/tcr/sanity/3.php
rename to hphp/test/slow/sanity/3.php
diff --git a/hphp/test/tcr/sanity/3.php.expect b/hphp/test/slow/sanity/3.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/3.php.expect
rename to hphp/test/slow/sanity/3.php.expect
diff --git a/hphp/test/tcr/sanity/4.php b/hphp/test/slow/sanity/4.php
similarity index 100%
rename from hphp/test/tcr/sanity/4.php
rename to hphp/test/slow/sanity/4.php
diff --git a/hphp/test/tcr/sanity/4.php.expect b/hphp/test/slow/sanity/4.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/4.php.expect
rename to hphp/test/slow/sanity/4.php.expect
diff --git a/hphp/test/tcr/sanity/5.php b/hphp/test/slow/sanity/5.php
similarity index 100%
rename from hphp/test/tcr/sanity/5.php
rename to hphp/test/slow/sanity/5.php
diff --git a/hphp/test/tcr/sanity/5.php.expect b/hphp/test/slow/sanity/5.php.expect
similarity index 100%
rename from hphp/test/tcr/sanity/5.php.expect
rename to hphp/test/slow/sanity/5.php.expect
diff --git a/hphp/test/tcr/scalar_array/545.php b/hphp/test/slow/scalar_array/545.php
similarity index 100%
rename from hphp/test/tcr/scalar_array/545.php
rename to hphp/test/slow/scalar_array/545.php
diff --git a/hphp/test/tcr/scalar_array/545.php.expect b/hphp/test/slow/scalar_array/545.php.expect
similarity index 100%
rename from hphp/test/tcr/scalar_array/545.php.expect
rename to hphp/test/slow/scalar_array/545.php.expect
diff --git a/hphp/test/tcr/scalar_array/546.php b/hphp/test/slow/scalar_array/546.php
similarity index 100%
rename from hphp/test/tcr/scalar_array/546.php
rename to hphp/test/slow/scalar_array/546.php
diff --git a/hphp/test/tcr/scalar_array/546.php.expect b/hphp/test/slow/scalar_array/546.php.expect
similarity index 100%
rename from hphp/test/tcr/scalar_array/546.php.expect
rename to hphp/test/slow/scalar_array/546.php.expect
diff --git a/hphp/test/tcr/scalar_array/547.php b/hphp/test/slow/scalar_array/547.php
similarity index 100%
rename from hphp/test/tcr/scalar_array/547.php
rename to hphp/test/slow/scalar_array/547.php
diff --git a/hphp/test/tcr/scalar_array/547.php.expect b/hphp/test/slow/scalar_array/547.php.expect
similarity index 100%
rename from hphp/test/tcr/scalar_array/547.php.expect
rename to hphp/test/slow/scalar_array/547.php.expect
diff --git a/hphp/test/tcr/serialization/1539.php b/hphp/test/slow/serialization/1539.php
similarity index 100%
rename from hphp/test/tcr/serialization/1539.php
rename to hphp/test/slow/serialization/1539.php
diff --git a/hphp/test/tcr/serialization/1539.php.expect b/hphp/test/slow/serialization/1539.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1539.php.expect
rename to hphp/test/slow/serialization/1539.php.expect
diff --git a/hphp/test/tcr/serialization/1540.php b/hphp/test/slow/serialization/1540.php
similarity index 100%
rename from hphp/test/tcr/serialization/1540.php
rename to hphp/test/slow/serialization/1540.php
diff --git a/hphp/test/tcr/serialization/1540.php.expect b/hphp/test/slow/serialization/1540.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1540.php.expect
rename to hphp/test/slow/serialization/1540.php.expect
diff --git a/hphp/test/tcr/serialization/1541.php b/hphp/test/slow/serialization/1541.php
similarity index 100%
rename from hphp/test/tcr/serialization/1541.php
rename to hphp/test/slow/serialization/1541.php
diff --git a/hphp/test/tcr/serialization/1541.php.expect b/hphp/test/slow/serialization/1541.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1541.php.expect
rename to hphp/test/slow/serialization/1541.php.expect
diff --git a/hphp/test/tcr/serialization/1542.php b/hphp/test/slow/serialization/1542.php
similarity index 100%
rename from hphp/test/tcr/serialization/1542.php
rename to hphp/test/slow/serialization/1542.php
diff --git a/hphp/test/tcr/serialization/1542.php.expect b/hphp/test/slow/serialization/1542.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1542.php.expect
rename to hphp/test/slow/serialization/1542.php.expect
diff --git a/hphp/test/tcr/serialization/1543.php b/hphp/test/slow/serialization/1543.php
similarity index 100%
rename from hphp/test/tcr/serialization/1543.php
rename to hphp/test/slow/serialization/1543.php
diff --git a/hphp/test/tcr/serialization/1543.php.expect b/hphp/test/slow/serialization/1543.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1543.php.expect
rename to hphp/test/slow/serialization/1543.php.expect
diff --git a/hphp/test/tcr/serialization/1544.php b/hphp/test/slow/serialization/1544.php
similarity index 100%
rename from hphp/test/tcr/serialization/1544.php
rename to hphp/test/slow/serialization/1544.php
diff --git a/hphp/test/tcr/serialization/1544.php.expect b/hphp/test/slow/serialization/1544.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1544.php.expect
rename to hphp/test/slow/serialization/1544.php.expect
diff --git a/hphp/test/tcr/serialization/1545.php b/hphp/test/slow/serialization/1545.php
similarity index 100%
rename from hphp/test/tcr/serialization/1545.php
rename to hphp/test/slow/serialization/1545.php
diff --git a/hphp/test/tcr/serialization/1545.php.expect b/hphp/test/slow/serialization/1545.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1545.php.expect
rename to hphp/test/slow/serialization/1545.php.expect
diff --git a/hphp/test/tcr/serialization/1546.php b/hphp/test/slow/serialization/1546.php
similarity index 100%
rename from hphp/test/tcr/serialization/1546.php
rename to hphp/test/slow/serialization/1546.php
diff --git a/hphp/test/tcr/serialization/1546.php.expect b/hphp/test/slow/serialization/1546.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1546.php.expect
rename to hphp/test/slow/serialization/1546.php.expect
diff --git a/hphp/test/tcr/serialization/1547.php b/hphp/test/slow/serialization/1547.php
similarity index 100%
rename from hphp/test/tcr/serialization/1547.php
rename to hphp/test/slow/serialization/1547.php
diff --git a/hphp/test/tcr/serialization/1547.php.expect b/hphp/test/slow/serialization/1547.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1547.php.expect
rename to hphp/test/slow/serialization/1547.php.expect
diff --git a/hphp/test/tcr/serialization/1548.php b/hphp/test/slow/serialization/1548.php
similarity index 100%
rename from hphp/test/tcr/serialization/1548.php
rename to hphp/test/slow/serialization/1548.php
diff --git a/hphp/test/tcr/serialization/1548.php.expect b/hphp/test/slow/serialization/1548.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1548.php.expect
rename to hphp/test/slow/serialization/1548.php.expect
diff --git a/hphp/test/tcr/serialization/1549.php b/hphp/test/slow/serialization/1549.php
similarity index 100%
rename from hphp/test/tcr/serialization/1549.php
rename to hphp/test/slow/serialization/1549.php
diff --git a/hphp/test/tcr/serialization/1549.php.expect b/hphp/test/slow/serialization/1549.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1549.php.expect
rename to hphp/test/slow/serialization/1549.php.expect
diff --git a/hphp/test/tcr/serialization/1550.php b/hphp/test/slow/serialization/1550.php
similarity index 100%
rename from hphp/test/tcr/serialization/1550.php
rename to hphp/test/slow/serialization/1550.php
diff --git a/hphp/test/tcr/serialization/1550.php.expect b/hphp/test/slow/serialization/1550.php.expect
similarity index 100%
rename from hphp/test/tcr/serialization/1550.php.expect
rename to hphp/test/slow/serialization/1550.php.expect
diff --git a/hphp/test/tcr/serialize/1864.php b/hphp/test/slow/serialize/1864.php
similarity index 100%
rename from hphp/test/tcr/serialize/1864.php
rename to hphp/test/slow/serialize/1864.php
diff --git a/hphp/test/tcr/serialize/1864.php.expect b/hphp/test/slow/serialize/1864.php.expect
similarity index 100%
rename from hphp/test/tcr/serialize/1864.php.expect
rename to hphp/test/slow/serialize/1864.php.expect
diff --git a/hphp/test/tcr/serialize/1865.php b/hphp/test/slow/serialize/1865.php
similarity index 100%
rename from hphp/test/tcr/serialize/1865.php
rename to hphp/test/slow/serialize/1865.php
diff --git a/hphp/test/tcr/serialize/1865.php.expect b/hphp/test/slow/serialize/1865.php.expect
similarity index 100%
rename from hphp/test/tcr/serialize/1865.php.expect
rename to hphp/test/slow/serialize/1865.php.expect
diff --git a/hphp/test/tcr/silence_operator/1440.php b/hphp/test/slow/silence_operator/1440.php
similarity index 100%
rename from hphp/test/tcr/silence_operator/1440.php
rename to hphp/test/slow/silence_operator/1440.php
diff --git a/hphp/test/tcr/ternary/1734.php.expect b/hphp/test/slow/silence_operator/1440.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1734.php.expect
rename to hphp/test/slow/silence_operator/1440.php.expect
diff --git a/hphp/test/tcr/simple_xml/1629.php b/hphp/test/slow/simple_xml/1629.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1629.php
rename to hphp/test/slow/simple_xml/1629.php
diff --git a/hphp/test/tcr/simple_xml/1629.php.expect b/hphp/test/slow/simple_xml/1629.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1629.php.expect
rename to hphp/test/slow/simple_xml/1629.php.expect
diff --git a/hphp/test/tcr/simple_xml/1630.php b/hphp/test/slow/simple_xml/1630.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1630.php
rename to hphp/test/slow/simple_xml/1630.php
diff --git a/hphp/test/tcr/simple_xml/1630.php.expect b/hphp/test/slow/simple_xml/1630.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1630.php.expect
rename to hphp/test/slow/simple_xml/1630.php.expect
diff --git a/hphp/test/tcr/simple_xml/1631.php b/hphp/test/slow/simple_xml/1631.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1631.php
rename to hphp/test/slow/simple_xml/1631.php
diff --git a/hphp/test/tcr/simple_xml/1631.php.expect b/hphp/test/slow/simple_xml/1631.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1631.php.expect
rename to hphp/test/slow/simple_xml/1631.php.expect
diff --git a/hphp/test/tcr/simple_xml/1632.php b/hphp/test/slow/simple_xml/1632.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1632.php
rename to hphp/test/slow/simple_xml/1632.php
diff --git a/hphp/test/tcr/simple_xml/1632.php.expect b/hphp/test/slow/simple_xml/1632.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1632.php.expect
rename to hphp/test/slow/simple_xml/1632.php.expect
diff --git a/hphp/test/tcr/simple_xml/1633.php b/hphp/test/slow/simple_xml/1633.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1633.php
rename to hphp/test/slow/simple_xml/1633.php
diff --git a/hphp/test/tcr/simple_xml/1633.php.expect b/hphp/test/slow/simple_xml/1633.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1633.php.expect
rename to hphp/test/slow/simple_xml/1633.php.expect
diff --git a/hphp/test/tcr/simple_xml/1634.php b/hphp/test/slow/simple_xml/1634.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1634.php
rename to hphp/test/slow/simple_xml/1634.php
diff --git a/hphp/test/tcr/simple_xml/1634.php.expect b/hphp/test/slow/simple_xml/1634.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1634.php.expect
rename to hphp/test/slow/simple_xml/1634.php.expect
diff --git a/hphp/test/tcr/simple_xml/1635.php b/hphp/test/slow/simple_xml/1635.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1635.php
rename to hphp/test/slow/simple_xml/1635.php
diff --git a/hphp/test/tcr/simple_xml/1635.php.expect b/hphp/test/slow/simple_xml/1635.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1635.php.expect
rename to hphp/test/slow/simple_xml/1635.php.expect
diff --git a/hphp/test/tcr/simple_xml/1636.php b/hphp/test/slow/simple_xml/1636.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1636.php
rename to hphp/test/slow/simple_xml/1636.php
diff --git a/hphp/test/tcr/simple_xml/1636.php.expect b/hphp/test/slow/simple_xml/1636.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1636.php.expect
rename to hphp/test/slow/simple_xml/1636.php.expect
diff --git a/hphp/test/tcr/simple_xml/1637.php b/hphp/test/slow/simple_xml/1637.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1637.php
rename to hphp/test/slow/simple_xml/1637.php
diff --git a/hphp/test/tcr/simple_xml/1637.php.expect b/hphp/test/slow/simple_xml/1637.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1637.php.expect
rename to hphp/test/slow/simple_xml/1637.php.expect
diff --git a/hphp/test/tcr/simple_xml/1638.php b/hphp/test/slow/simple_xml/1638.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1638.php
rename to hphp/test/slow/simple_xml/1638.php
diff --git a/hphp/test/tcr/simple_xml/1638.php.expect b/hphp/test/slow/simple_xml/1638.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1638.php.expect
rename to hphp/test/slow/simple_xml/1638.php.expect
diff --git a/hphp/test/tcr/simple_xml/1639.php b/hphp/test/slow/simple_xml/1639.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1639.php
rename to hphp/test/slow/simple_xml/1639.php
diff --git a/hphp/test/tcr/simple_xml/1639.php.expect b/hphp/test/slow/simple_xml/1639.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1639.php.expect
rename to hphp/test/slow/simple_xml/1639.php.expect
diff --git a/hphp/test/tcr/simple_xml/1640.php b/hphp/test/slow/simple_xml/1640.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1640.php
rename to hphp/test/slow/simple_xml/1640.php
diff --git a/hphp/test/tcr/simple_xml/1640.php.expect b/hphp/test/slow/simple_xml/1640.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1640.php.expect
rename to hphp/test/slow/simple_xml/1640.php.expect
diff --git a/hphp/test/tcr/simple_xml/1641.php b/hphp/test/slow/simple_xml/1641.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1641.php
rename to hphp/test/slow/simple_xml/1641.php
diff --git a/hphp/test/tcr/simple_xml/1641.php.expect b/hphp/test/slow/simple_xml/1641.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1641.php.expect
rename to hphp/test/slow/simple_xml/1641.php.expect
diff --git a/hphp/test/tcr/simple_xml/1642.php b/hphp/test/slow/simple_xml/1642.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1642.php
rename to hphp/test/slow/simple_xml/1642.php
diff --git a/hphp/test/tcr/simple_xml/1642.php.expect b/hphp/test/slow/simple_xml/1642.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1642.php.expect
rename to hphp/test/slow/simple_xml/1642.php.expect
diff --git a/hphp/test/tcr/simple_xml/1643.php b/hphp/test/slow/simple_xml/1643.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1643.php
rename to hphp/test/slow/simple_xml/1643.php
diff --git a/hphp/test/tcr/traits/1942.php.expect b/hphp/test/slow/simple_xml/1643.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1942.php.expect
rename to hphp/test/slow/simple_xml/1643.php.expect
diff --git a/hphp/test/tcr/simple_xml/1644.php b/hphp/test/slow/simple_xml/1644.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1644.php
rename to hphp/test/slow/simple_xml/1644.php
diff --git a/hphp/test/tcr/simple_xml/1644.php.expect b/hphp/test/slow/simple_xml/1644.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1644.php.expect
rename to hphp/test/slow/simple_xml/1644.php.expect
diff --git a/hphp/test/tcr/simple_xml/1645.php b/hphp/test/slow/simple_xml/1645.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1645.php
rename to hphp/test/slow/simple_xml/1645.php
diff --git a/hphp/test/tcr/simple_xml/1645.php.expect b/hphp/test/slow/simple_xml/1645.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1645.php.expect
rename to hphp/test/slow/simple_xml/1645.php.expect
diff --git a/hphp/test/tcr/simple_xml/1646.php b/hphp/test/slow/simple_xml/1646.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1646.php
rename to hphp/test/slow/simple_xml/1646.php
diff --git a/hphp/test/tcr/simple_xml/1646.php.expect b/hphp/test/slow/simple_xml/1646.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1646.php.expect
rename to hphp/test/slow/simple_xml/1646.php.expect
diff --git a/hphp/test/tcr/simple_xml/1647.php b/hphp/test/slow/simple_xml/1647.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1647.php
rename to hphp/test/slow/simple_xml/1647.php
diff --git a/hphp/test/tcr/simple_xml/1647.php.expect b/hphp/test/slow/simple_xml/1647.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1647.php.expect
rename to hphp/test/slow/simple_xml/1647.php.expect
diff --git a/hphp/test/tcr/simple_xml/1648.php b/hphp/test/slow/simple_xml/1648.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1648.php
rename to hphp/test/slow/simple_xml/1648.php
diff --git a/hphp/test/tcr/simple_xml/1648.php.expect b/hphp/test/slow/simple_xml/1648.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1648.php.expect
rename to hphp/test/slow/simple_xml/1648.php.expect
diff --git a/hphp/test/tcr/simple_xml/1649.php b/hphp/test/slow/simple_xml/1649.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1649.php
rename to hphp/test/slow/simple_xml/1649.php
diff --git a/hphp/test/tcr/simple_xml/1649.php.expect b/hphp/test/slow/simple_xml/1649.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1649.php.expect
rename to hphp/test/slow/simple_xml/1649.php.expect
diff --git a/hphp/test/tcr/simple_xml/1650.php b/hphp/test/slow/simple_xml/1650.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1650.php
rename to hphp/test/slow/simple_xml/1650.php
diff --git a/hphp/test/tcr/simple_xml/1650.php.expect b/hphp/test/slow/simple_xml/1650.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1650.php.expect
rename to hphp/test/slow/simple_xml/1650.php.expect
diff --git a/hphp/test/tcr/simple_xml/1651.php b/hphp/test/slow/simple_xml/1651.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1651.php
rename to hphp/test/slow/simple_xml/1651.php
diff --git a/hphp/test/tcr/simple_xml/1651.php.expect b/hphp/test/slow/simple_xml/1651.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1651.php.expect
rename to hphp/test/slow/simple_xml/1651.php.expect
diff --git a/hphp/test/tcr/simple_xml/1652.php b/hphp/test/slow/simple_xml/1652.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1652.php
rename to hphp/test/slow/simple_xml/1652.php
diff --git a/hphp/test/tcr/simple_xml/1652.php.expect b/hphp/test/slow/simple_xml/1652.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1652.php.expect
rename to hphp/test/slow/simple_xml/1652.php.expect
diff --git a/hphp/test/tcr/simple_xml/1653.php b/hphp/test/slow/simple_xml/1653.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1653.php
rename to hphp/test/slow/simple_xml/1653.php
diff --git a/hphp/test/tcr/simple_xml/1653.php.expect b/hphp/test/slow/simple_xml/1653.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1653.php.expect
rename to hphp/test/slow/simple_xml/1653.php.expect
diff --git a/hphp/test/tcr/simple_xml/1654.php b/hphp/test/slow/simple_xml/1654.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1654.php
rename to hphp/test/slow/simple_xml/1654.php
diff --git a/hphp/test/tcr/simple_xml/1654.php.expect b/hphp/test/slow/simple_xml/1654.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1654.php.expect
rename to hphp/test/slow/simple_xml/1654.php.expect
diff --git a/hphp/test/tcr/simple_xml/1655.php b/hphp/test/slow/simple_xml/1655.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1655.php
rename to hphp/test/slow/simple_xml/1655.php
diff --git a/hphp/test/tcr/simple_xml/1655.php.expect b/hphp/test/slow/simple_xml/1655.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1655.php.expect
rename to hphp/test/slow/simple_xml/1655.php.expect
diff --git a/hphp/test/tcr/simple_xml/1656.php b/hphp/test/slow/simple_xml/1656.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1656.php
rename to hphp/test/slow/simple_xml/1656.php
diff --git a/hphp/test/tcr/simple_xml/1656.php.expect b/hphp/test/slow/simple_xml/1656.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1656.php.expect
rename to hphp/test/slow/simple_xml/1656.php.expect
diff --git a/hphp/test/tcr/simple_xml/1657.php b/hphp/test/slow/simple_xml/1657.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1657.php
rename to hphp/test/slow/simple_xml/1657.php
diff --git a/hphp/test/tcr/simple_xml/1657.php.expect b/hphp/test/slow/simple_xml/1657.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1657.php.expect
rename to hphp/test/slow/simple_xml/1657.php.expect
diff --git a/hphp/test/tcr/simple_xml/1658.php b/hphp/test/slow/simple_xml/1658.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1658.php
rename to hphp/test/slow/simple_xml/1658.php
diff --git a/hphp/test/tcr/simple_xml/1658.php.expect b/hphp/test/slow/simple_xml/1658.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1658.php.expect
rename to hphp/test/slow/simple_xml/1658.php.expect
diff --git a/hphp/test/tcr/simple_xml/1659.php b/hphp/test/slow/simple_xml/1659.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1659.php
rename to hphp/test/slow/simple_xml/1659.php
diff --git a/hphp/test/tcr/simple_xml/1659.php.expect b/hphp/test/slow/simple_xml/1659.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1659.php.expect
rename to hphp/test/slow/simple_xml/1659.php.expect
diff --git a/hphp/test/tcr/simple_xml/1660.php b/hphp/test/slow/simple_xml/1660.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1660.php
rename to hphp/test/slow/simple_xml/1660.php
diff --git a/hphp/test/tcr/simple_xml/1660.php.expect b/hphp/test/slow/simple_xml/1660.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1660.php.expect
rename to hphp/test/slow/simple_xml/1660.php.expect
diff --git a/hphp/test/tcr/simple_xml/1661.php b/hphp/test/slow/simple_xml/1661.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1661.php
rename to hphp/test/slow/simple_xml/1661.php
diff --git a/hphp/test/tcr/simple_xml/1661.php.expect b/hphp/test/slow/simple_xml/1661.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1661.php.expect
rename to hphp/test/slow/simple_xml/1661.php.expect
diff --git a/hphp/test/tcr/simple_xml/1662.php b/hphp/test/slow/simple_xml/1662.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1662.php
rename to hphp/test/slow/simple_xml/1662.php
diff --git a/hphp/test/tcr/simple_xml/1662.php.expect b/hphp/test/slow/simple_xml/1662.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1662.php.expect
rename to hphp/test/slow/simple_xml/1662.php.expect
diff --git a/hphp/test/tcr/simple_xml/1663.php b/hphp/test/slow/simple_xml/1663.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1663.php
rename to hphp/test/slow/simple_xml/1663.php
diff --git a/hphp/test/tcr/simple_xml/1663.php.expect b/hphp/test/slow/simple_xml/1663.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1663.php.expect
rename to hphp/test/slow/simple_xml/1663.php.expect
diff --git a/hphp/test/tcr/simple_xml/1664.php b/hphp/test/slow/simple_xml/1664.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1664.php
rename to hphp/test/slow/simple_xml/1664.php
diff --git a/hphp/test/tcr/simple_xml/1664.php.expect b/hphp/test/slow/simple_xml/1664.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1664.php.expect
rename to hphp/test/slow/simple_xml/1664.php.expect
diff --git a/hphp/test/tcr/simple_xml/1665.php b/hphp/test/slow/simple_xml/1665.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1665.php
rename to hphp/test/slow/simple_xml/1665.php
diff --git a/hphp/test/tcr/simple_xml/1665.php.expect b/hphp/test/slow/simple_xml/1665.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1665.php.expect
rename to hphp/test/slow/simple_xml/1665.php.expect
diff --git a/hphp/test/tcr/simple_xml/1666.php b/hphp/test/slow/simple_xml/1666.php
similarity index 100%
rename from hphp/test/tcr/simple_xml/1666.php
rename to hphp/test/slow/simple_xml/1666.php
diff --git a/hphp/test/tcr/simple_xml/1666.php.expect b/hphp/test/slow/simple_xml/1666.php.expect
similarity index 100%
rename from hphp/test/tcr/simple_xml/1666.php.expect
rename to hphp/test/slow/simple_xml/1666.php.expect
diff --git a/hphp/test/tcr/static_statement/1394.php b/hphp/test/slow/static_statement/1394.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1394.php
rename to hphp/test/slow/static_statement/1394.php
diff --git a/hphp/test/tcr/static_statement/1394.php.expect b/hphp/test/slow/static_statement/1394.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1394.php.expect
rename to hphp/test/slow/static_statement/1394.php.expect
diff --git a/hphp/test/tcr/static_statement/1395.php b/hphp/test/slow/static_statement/1395.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1395.php
rename to hphp/test/slow/static_statement/1395.php
diff --git a/hphp/test/tcr/static_statement/1395.php.expect b/hphp/test/slow/static_statement/1395.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1395.php.expect
rename to hphp/test/slow/static_statement/1395.php.expect
diff --git a/hphp/test/tcr/static_statement/1396.php b/hphp/test/slow/static_statement/1396.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1396.php
rename to hphp/test/slow/static_statement/1396.php
diff --git a/hphp/test/tcr/static_statement/1396.php.expect b/hphp/test/slow/static_statement/1396.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1396.php.expect
rename to hphp/test/slow/static_statement/1396.php.expect
diff --git a/hphp/test/tcr/static_statement/1397.php b/hphp/test/slow/static_statement/1397.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1397.php
rename to hphp/test/slow/static_statement/1397.php
diff --git a/hphp/test/tcr/static_statement/1397.php.expect b/hphp/test/slow/static_statement/1397.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1397.php.expect
rename to hphp/test/slow/static_statement/1397.php.expect
diff --git a/hphp/test/tcr/static_statement/1398.php b/hphp/test/slow/static_statement/1398.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1398.php
rename to hphp/test/slow/static_statement/1398.php
diff --git a/hphp/test/tcr/static_statement/1398.php.expect b/hphp/test/slow/static_statement/1398.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1398.php.expect
rename to hphp/test/slow/static_statement/1398.php.expect
diff --git a/hphp/test/tcr/static_statement/1399.php b/hphp/test/slow/static_statement/1399.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1399.php
rename to hphp/test/slow/static_statement/1399.php
diff --git a/hphp/test/tcr/static_statement/1399.php.expect b/hphp/test/slow/static_statement/1399.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1399.php.expect
rename to hphp/test/slow/static_statement/1399.php.expect
diff --git a/hphp/test/tcr/static_statement/1400.php b/hphp/test/slow/static_statement/1400.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1400.php
rename to hphp/test/slow/static_statement/1400.php
diff --git a/hphp/test/tcr/static_statement/1400.php.expect b/hphp/test/slow/static_statement/1400.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1400.php.expect
rename to hphp/test/slow/static_statement/1400.php.expect
diff --git a/hphp/test/tcr/static_statement/1401.php b/hphp/test/slow/static_statement/1401.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1401.php
rename to hphp/test/slow/static_statement/1401.php
diff --git a/hphp/test/tcr/static_statement/1401.php.expect b/hphp/test/slow/static_statement/1401.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1401.php.expect
rename to hphp/test/slow/static_statement/1401.php.expect
diff --git a/hphp/test/tcr/static_statement/1402.php b/hphp/test/slow/static_statement/1402.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1402.php
rename to hphp/test/slow/static_statement/1402.php
diff --git a/hphp/test/tcr/static_statement/1402.php.expect b/hphp/test/slow/static_statement/1402.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1402.php.expect
rename to hphp/test/slow/static_statement/1402.php.expect
diff --git a/hphp/test/tcr/static_statement/1403.php b/hphp/test/slow/static_statement/1403.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1403.php
rename to hphp/test/slow/static_statement/1403.php
diff --git a/hphp/test/tcr/static_statement/1403.php.expect b/hphp/test/slow/static_statement/1403.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1403.php.expect
rename to hphp/test/slow/static_statement/1403.php.expect
diff --git a/hphp/test/tcr/static_statement/1404.php b/hphp/test/slow/static_statement/1404.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1404.php
rename to hphp/test/slow/static_statement/1404.php
diff --git a/hphp/test/tcr/static_statement/1404.php.expect b/hphp/test/slow/static_statement/1404.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1404.php.expect
rename to hphp/test/slow/static_statement/1404.php.expect
diff --git a/hphp/test/tcr/static_statement/1405.php b/hphp/test/slow/static_statement/1405.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1405.php
rename to hphp/test/slow/static_statement/1405.php
diff --git a/hphp/test/tcr/static_statement/1405.php.expect b/hphp/test/slow/static_statement/1405.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1405.php.expect
rename to hphp/test/slow/static_statement/1405.php.expect
diff --git a/hphp/test/tcr/static_statement/1406.php b/hphp/test/slow/static_statement/1406.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1406.php
rename to hphp/test/slow/static_statement/1406.php
diff --git a/hphp/test/tcr/static_statement/1406.php.expect b/hphp/test/slow/static_statement/1406.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1406.php.expect
rename to hphp/test/slow/static_statement/1406.php.expect
diff --git a/hphp/test/tcr/static_statement/1407.php b/hphp/test/slow/static_statement/1407.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1407.php
rename to hphp/test/slow/static_statement/1407.php
diff --git a/hphp/test/tcr/static_statement/1407.php.expect b/hphp/test/slow/static_statement/1407.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1407.php.expect
rename to hphp/test/slow/static_statement/1407.php.expect
diff --git a/hphp/test/tcr/static_statement/1408.php b/hphp/test/slow/static_statement/1408.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1408.php
rename to hphp/test/slow/static_statement/1408.php
diff --git a/hphp/test/tcr/static_statement/1408.php.expect b/hphp/test/slow/static_statement/1408.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1408.php.expect
rename to hphp/test/slow/static_statement/1408.php.expect
diff --git a/hphp/test/tcr/static_statement/1409.php b/hphp/test/slow/static_statement/1409.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1409.php
rename to hphp/test/slow/static_statement/1409.php
diff --git a/hphp/test/tcr/static_statement/1409.php.expect b/hphp/test/slow/static_statement/1409.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1409.php.expect
rename to hphp/test/slow/static_statement/1409.php.expect
diff --git a/hphp/test/tcr/static_statement/1410.php b/hphp/test/slow/static_statement/1410.php
similarity index 100%
rename from hphp/test/tcr/static_statement/1410.php
rename to hphp/test/slow/static_statement/1410.php
diff --git a/hphp/test/tcr/static_statement/1410.php.expect b/hphp/test/slow/static_statement/1410.php.expect
similarity index 100%
rename from hphp/test/tcr/static_statement/1410.php.expect
rename to hphp/test/slow/static_statement/1410.php.expect
diff --git a/hphp/test/tcr/strict_mode/2202.php b/hphp/test/slow/strict_mode/2202.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2202.php
rename to hphp/test/slow/strict_mode/2202.php
diff --git a/hphp/test/tcr/strict_mode/2202.php.expect b/hphp/test/slow/strict_mode/2202.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2202.php.expect
rename to hphp/test/slow/strict_mode/2202.php.expect
diff --git a/hphp/test/tcr/strict_mode/2202.php.hphp_opts b/hphp/test/slow/strict_mode/2202.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2202.php.hphp_opts
rename to hphp/test/slow/strict_mode/2202.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2202.php.opts b/hphp/test/slow/strict_mode/2202.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2202.php.opts
rename to hphp/test/slow/strict_mode/2202.php.opts
diff --git a/hphp/test/tcr/strict_mode/2203.php b/hphp/test/slow/strict_mode/2203.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2203.php
rename to hphp/test/slow/strict_mode/2203.php
diff --git a/hphp/test/tcr/strict_mode/2203.php.expect b/hphp/test/slow/strict_mode/2203.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2203.php.expect
rename to hphp/test/slow/strict_mode/2203.php.expect
diff --git a/hphp/test/tcr/strict_mode/2203.php.hphp_opts b/hphp/test/slow/strict_mode/2203.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2203.php.hphp_opts
rename to hphp/test/slow/strict_mode/2203.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2203.php.opts b/hphp/test/slow/strict_mode/2203.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2203.php.opts
rename to hphp/test/slow/strict_mode/2203.php.opts
diff --git a/hphp/test/tcr/strict_mode/2204.php b/hphp/test/slow/strict_mode/2204.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2204.php
rename to hphp/test/slow/strict_mode/2204.php
diff --git a/hphp/test/tcr/strict_mode/2204.php.expect b/hphp/test/slow/strict_mode/2204.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2204.php.expect
rename to hphp/test/slow/strict_mode/2204.php.expect
diff --git a/hphp/test/tcr/strict_mode/2204.php.hphp_opts b/hphp/test/slow/strict_mode/2204.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2204.php.hphp_opts
rename to hphp/test/slow/strict_mode/2204.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2204.php.opts b/hphp/test/slow/strict_mode/2204.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2204.php.opts
rename to hphp/test/slow/strict_mode/2204.php.opts
diff --git a/hphp/test/tcr/strict_mode/2205.php b/hphp/test/slow/strict_mode/2205.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2205.php
rename to hphp/test/slow/strict_mode/2205.php
diff --git a/hphp/test/tcr/strict_mode/2205.php.expect b/hphp/test/slow/strict_mode/2205.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2205.php.expect
rename to hphp/test/slow/strict_mode/2205.php.expect
diff --git a/hphp/test/tcr/strict_mode/2205.php.hphp_opts b/hphp/test/slow/strict_mode/2205.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2205.php.hphp_opts
rename to hphp/test/slow/strict_mode/2205.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2205.php.opts b/hphp/test/slow/strict_mode/2205.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2205.php.opts
rename to hphp/test/slow/strict_mode/2205.php.opts
diff --git a/hphp/test/tcr/strict_mode/2206.php b/hphp/test/slow/strict_mode/2206.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2206.php
rename to hphp/test/slow/strict_mode/2206.php
diff --git a/hphp/test/tcr/strict_mode/2206.php.expect b/hphp/test/slow/strict_mode/2206.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2206.php.expect
rename to hphp/test/slow/strict_mode/2206.php.expect
diff --git a/hphp/test/tcr/strict_mode/2206.php.hphp_opts b/hphp/test/slow/strict_mode/2206.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2206.php.hphp_opts
rename to hphp/test/slow/strict_mode/2206.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2206.php.opts b/hphp/test/slow/strict_mode/2206.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2206.php.opts
rename to hphp/test/slow/strict_mode/2206.php.opts
diff --git a/hphp/test/tcr/strict_mode/2207.php b/hphp/test/slow/strict_mode/2207.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2207.php
rename to hphp/test/slow/strict_mode/2207.php
diff --git a/hphp/test/tcr/strict_mode/2207.php.expect b/hphp/test/slow/strict_mode/2207.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2207.php.expect
rename to hphp/test/slow/strict_mode/2207.php.expect
diff --git a/hphp/test/tcr/strict_mode/2207.php.hphp_opts b/hphp/test/slow/strict_mode/2207.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2207.php.hphp_opts
rename to hphp/test/slow/strict_mode/2207.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2207.php.opts b/hphp/test/slow/strict_mode/2207.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2207.php.opts
rename to hphp/test/slow/strict_mode/2207.php.opts
diff --git a/hphp/test/tcr/strict_mode/2208.php b/hphp/test/slow/strict_mode/2208.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2208.php
rename to hphp/test/slow/strict_mode/2208.php
diff --git a/hphp/test/tcr/traits/2077.php.expect b/hphp/test/slow/strict_mode/2208.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2077.php.expect
rename to hphp/test/slow/strict_mode/2208.php.expect
diff --git a/hphp/test/tcr/strict_mode/2208.php.hphp_opts b/hphp/test/slow/strict_mode/2208.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2208.php.hphp_opts
rename to hphp/test/slow/strict_mode/2208.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2208.php.opts b/hphp/test/slow/strict_mode/2208.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2208.php.opts
rename to hphp/test/slow/strict_mode/2208.php.opts
diff --git a/hphp/test/tcr/strict_mode/2209.php b/hphp/test/slow/strict_mode/2209.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2209.php
rename to hphp/test/slow/strict_mode/2209.php
diff --git a/hphp/test/tcr/strict_mode/2209.php.expect b/hphp/test/slow/strict_mode/2209.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2209.php.expect
rename to hphp/test/slow/strict_mode/2209.php.expect
diff --git a/hphp/test/tcr/strict_mode/2209.php.hphp_opts b/hphp/test/slow/strict_mode/2209.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2209.php.hphp_opts
rename to hphp/test/slow/strict_mode/2209.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2209.php.opts b/hphp/test/slow/strict_mode/2209.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2209.php.opts
rename to hphp/test/slow/strict_mode/2209.php.opts
diff --git a/hphp/test/tcr/strict_mode/2210.php b/hphp/test/slow/strict_mode/2210.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2210.php
rename to hphp/test/slow/strict_mode/2210.php
diff --git a/hphp/test/tcr/unset/1106.php.expect b/hphp/test/slow/strict_mode/2210.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1106.php.expect
rename to hphp/test/slow/strict_mode/2210.php.expect
diff --git a/hphp/test/tcr/strict_mode/2210.php.hphp_opts b/hphp/test/slow/strict_mode/2210.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2210.php.hphp_opts
rename to hphp/test/slow/strict_mode/2210.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2210.php.opts b/hphp/test/slow/strict_mode/2210.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2210.php.opts
rename to hphp/test/slow/strict_mode/2210.php.opts
diff --git a/hphp/test/tcr/strict_mode/2211.php b/hphp/test/slow/strict_mode/2211.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2211.php
rename to hphp/test/slow/strict_mode/2211.php
diff --git a/hphp/test/tcr/unset/1112.php.expect b/hphp/test/slow/strict_mode/2211.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1112.php.expect
rename to hphp/test/slow/strict_mode/2211.php.expect
diff --git a/hphp/test/tcr/strict_mode/2211.php.hphp_opts b/hphp/test/slow/strict_mode/2211.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2211.php.hphp_opts
rename to hphp/test/slow/strict_mode/2211.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2211.php.opts b/hphp/test/slow/strict_mode/2211.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2211.php.opts
rename to hphp/test/slow/strict_mode/2211.php.opts
diff --git a/hphp/test/tcr/strict_mode/2212.php b/hphp/test/slow/strict_mode/2212.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2212.php
rename to hphp/test/slow/strict_mode/2212.php
diff --git a/hphp/test/tcr/useless_assignment/1744.php.expect b/hphp/test/slow/strict_mode/2212.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1744.php.expect
rename to hphp/test/slow/strict_mode/2212.php.expect
diff --git a/hphp/test/tcr/strict_mode/2212.php.hphp_opts b/hphp/test/slow/strict_mode/2212.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2212.php.hphp_opts
rename to hphp/test/slow/strict_mode/2212.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2212.php.opts b/hphp/test/slow/strict_mode/2212.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2212.php.opts
rename to hphp/test/slow/strict_mode/2212.php.opts
diff --git a/hphp/test/tcr/strict_mode/2213.php b/hphp/test/slow/strict_mode/2213.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2213.php
rename to hphp/test/slow/strict_mode/2213.php
diff --git a/hphp/test/tcr/strict_mode/2213.php.expect b/hphp/test/slow/strict_mode/2213.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2213.php.expect
rename to hphp/test/slow/strict_mode/2213.php.expect
diff --git a/hphp/test/tcr/strict_mode/2213.php.hphp_opts b/hphp/test/slow/strict_mode/2213.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2213.php.hphp_opts
rename to hphp/test/slow/strict_mode/2213.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2213.php.opts b/hphp/test/slow/strict_mode/2213.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2213.php.opts
rename to hphp/test/slow/strict_mode/2213.php.opts
diff --git a/hphp/test/tcr/strict_mode/2214.php b/hphp/test/slow/strict_mode/2214.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2214.php
rename to hphp/test/slow/strict_mode/2214.php
diff --git a/hphp/test/tcr/strict_mode/2214.php.expect b/hphp/test/slow/strict_mode/2214.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2214.php.expect
rename to hphp/test/slow/strict_mode/2214.php.expect
diff --git a/hphp/test/tcr/strict_mode/2214.php.hphp_opts b/hphp/test/slow/strict_mode/2214.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2214.php.hphp_opts
rename to hphp/test/slow/strict_mode/2214.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2214.php.opts b/hphp/test/slow/strict_mode/2214.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2214.php.opts
rename to hphp/test/slow/strict_mode/2214.php.opts
diff --git a/hphp/test/tcr/strict_mode/2215.php b/hphp/test/slow/strict_mode/2215.php
similarity index 100%
rename from hphp/test/tcr/strict_mode/2215.php
rename to hphp/test/slow/strict_mode/2215.php
diff --git a/hphp/test/tcr/strict_mode/2215.php.expect b/hphp/test/slow/strict_mode/2215.php.expect
similarity index 100%
rename from hphp/test/tcr/strict_mode/2215.php.expect
rename to hphp/test/slow/strict_mode/2215.php.expect
diff --git a/hphp/test/tcr/strict_mode/2215.php.hphp_opts b/hphp/test/slow/strict_mode/2215.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2215.php.hphp_opts
rename to hphp/test/slow/strict_mode/2215.php.hphp_opts
diff --git a/hphp/test/tcr/strict_mode/2215.php.opts b/hphp/test/slow/strict_mode/2215.php.opts
similarity index 100%
rename from hphp/test/tcr/strict_mode/2215.php.opts
rename to hphp/test/slow/strict_mode/2215.php.opts
diff --git a/hphp/test/tcr/string/117.php b/hphp/test/slow/string/117.php
similarity index 100%
rename from hphp/test/tcr/string/117.php
rename to hphp/test/slow/string/117.php
diff --git a/hphp/test/tcr/string/117.php.expect b/hphp/test/slow/string/117.php.expect
similarity index 100%
rename from hphp/test/tcr/string/117.php.expect
rename to hphp/test/slow/string/117.php.expect
diff --git a/hphp/test/tcr/string/118.php b/hphp/test/slow/string/118.php
similarity index 100%
rename from hphp/test/tcr/string/118.php
rename to hphp/test/slow/string/118.php
diff --git a/hphp/test/tcr/string/118.php.expect b/hphp/test/slow/string/118.php.expect
similarity index 100%
rename from hphp/test/tcr/string/118.php.expect
rename to hphp/test/slow/string/118.php.expect
diff --git a/hphp/test/tcr/string/119.php b/hphp/test/slow/string/119.php
similarity index 100%
rename from hphp/test/tcr/string/119.php
rename to hphp/test/slow/string/119.php
diff --git a/hphp/test/tcr/string/119.php.expect b/hphp/test/slow/string/119.php.expect
similarity index 100%
rename from hphp/test/tcr/string/119.php.expect
rename to hphp/test/slow/string/119.php.expect
diff --git a/hphp/test/tcr/string/120.php b/hphp/test/slow/string/120.php
similarity index 100%
rename from hphp/test/tcr/string/120.php
rename to hphp/test/slow/string/120.php
diff --git a/hphp/test/tcr/string/120.php.expect b/hphp/test/slow/string/120.php.expect
similarity index 100%
rename from hphp/test/tcr/string/120.php.expect
rename to hphp/test/slow/string/120.php.expect
diff --git a/hphp/test/tcr/string/121.php b/hphp/test/slow/string/121.php
similarity index 100%
rename from hphp/test/tcr/string/121.php
rename to hphp/test/slow/string/121.php
diff --git a/hphp/test/tcr/string/121.php.expect b/hphp/test/slow/string/121.php.expect
similarity index 100%
rename from hphp/test/tcr/string/121.php.expect
rename to hphp/test/slow/string/121.php.expect
diff --git a/hphp/test/tcr/string/122.php b/hphp/test/slow/string/122.php
similarity index 100%
rename from hphp/test/tcr/string/122.php
rename to hphp/test/slow/string/122.php
diff --git a/hphp/test/tcr/string/122.php.expect b/hphp/test/slow/string/122.php.expect
similarity index 100%
rename from hphp/test/tcr/string/122.php.expect
rename to hphp/test/slow/string/122.php.expect
diff --git a/hphp/test/tcr/string/123.php b/hphp/test/slow/string/123.php
similarity index 100%
rename from hphp/test/tcr/string/123.php
rename to hphp/test/slow/string/123.php
diff --git a/hphp/test/tcr/string/123.php.expect b/hphp/test/slow/string/123.php.expect
similarity index 100%
rename from hphp/test/tcr/string/123.php.expect
rename to hphp/test/slow/string/123.php.expect
diff --git a/hphp/test/tcr/string/124.php b/hphp/test/slow/string/124.php
similarity index 100%
rename from hphp/test/tcr/string/124.php
rename to hphp/test/slow/string/124.php
diff --git a/hphp/test/tcr/string/124.php.expect b/hphp/test/slow/string/124.php.expect
similarity index 100%
rename from hphp/test/tcr/string/124.php.expect
rename to hphp/test/slow/string/124.php.expect
diff --git a/hphp/test/tcr/string/125.php b/hphp/test/slow/string/125.php
similarity index 100%
rename from hphp/test/tcr/string/125.php
rename to hphp/test/slow/string/125.php
diff --git a/hphp/test/tcr/string/125.php.expect b/hphp/test/slow/string/125.php.expect
similarity index 100%
rename from hphp/test/tcr/string/125.php.expect
rename to hphp/test/slow/string/125.php.expect
diff --git a/hphp/test/tcr/string/126.php b/hphp/test/slow/string/126.php
similarity index 100%
rename from hphp/test/tcr/string/126.php
rename to hphp/test/slow/string/126.php
diff --git a/hphp/test/tcr/string/126.php.expect b/hphp/test/slow/string/126.php.expect
similarity index 100%
rename from hphp/test/tcr/string/126.php.expect
rename to hphp/test/slow/string/126.php.expect
diff --git a/hphp/test/tcr/string/127.php b/hphp/test/slow/string/127.php
similarity index 100%
rename from hphp/test/tcr/string/127.php
rename to hphp/test/slow/string/127.php
diff --git a/hphp/test/tcr/string/127.php.expect b/hphp/test/slow/string/127.php.expect
similarity index 100%
rename from hphp/test/tcr/string/127.php.expect
rename to hphp/test/slow/string/127.php.expect
diff --git a/hphp/test/tcr/string/128.php b/hphp/test/slow/string/128.php
similarity index 100%
rename from hphp/test/tcr/string/128.php
rename to hphp/test/slow/string/128.php
diff --git a/hphp/test/tcr/string/128.php.expect b/hphp/test/slow/string/128.php.expect
similarity index 100%
rename from hphp/test/tcr/string/128.php.expect
rename to hphp/test/slow/string/128.php.expect
diff --git a/hphp/test/tcr/string/129.php b/hphp/test/slow/string/129.php
similarity index 100%
rename from hphp/test/tcr/string/129.php
rename to hphp/test/slow/string/129.php
diff --git a/hphp/test/tcr/string/129.php.expect b/hphp/test/slow/string/129.php.expect
similarity index 100%
rename from hphp/test/tcr/string/129.php.expect
rename to hphp/test/slow/string/129.php.expect
diff --git a/hphp/test/tcr/string/130.php b/hphp/test/slow/string/130.php
similarity index 100%
rename from hphp/test/tcr/string/130.php
rename to hphp/test/slow/string/130.php
diff --git a/hphp/test/tcr/string/130.php.expect b/hphp/test/slow/string/130.php.expect
similarity index 100%
rename from hphp/test/tcr/string/130.php.expect
rename to hphp/test/slow/string/130.php.expect
diff --git a/hphp/test/tcr/string/131.php b/hphp/test/slow/string/131.php
similarity index 100%
rename from hphp/test/tcr/string/131.php
rename to hphp/test/slow/string/131.php
diff --git a/hphp/test/tcr/string/131.php.expect b/hphp/test/slow/string/131.php.expect
similarity index 100%
rename from hphp/test/tcr/string/131.php.expect
rename to hphp/test/slow/string/131.php.expect
diff --git a/hphp/test/tcr/string/132.php b/hphp/test/slow/string/132.php
similarity index 100%
rename from hphp/test/tcr/string/132.php
rename to hphp/test/slow/string/132.php
diff --git a/hphp/test/tcr/string/132.php.expect b/hphp/test/slow/string/132.php.expect
similarity index 100%
rename from hphp/test/tcr/string/132.php.expect
rename to hphp/test/slow/string/132.php.expect
diff --git a/hphp/test/tcr/string/133.php b/hphp/test/slow/string/133.php
similarity index 100%
rename from hphp/test/tcr/string/133.php
rename to hphp/test/slow/string/133.php
diff --git a/hphp/test/tcr/string/133.php.expect b/hphp/test/slow/string/133.php.expect
similarity index 100%
rename from hphp/test/tcr/string/133.php.expect
rename to hphp/test/slow/string/133.php.expect
diff --git a/hphp/test/tcr/string/134.php b/hphp/test/slow/string/134.php
similarity index 100%
rename from hphp/test/tcr/string/134.php
rename to hphp/test/slow/string/134.php
diff --git a/hphp/test/tcr/string/134.php.expect b/hphp/test/slow/string/134.php.expect
similarity index 100%
rename from hphp/test/tcr/string/134.php.expect
rename to hphp/test/slow/string/134.php.expect
diff --git a/hphp/test/tcr/string/135.php b/hphp/test/slow/string/135.php
similarity index 100%
rename from hphp/test/tcr/string/135.php
rename to hphp/test/slow/string/135.php
diff --git a/hphp/test/tcr/string/135.php.expect b/hphp/test/slow/string/135.php.expect
similarity index 100%
rename from hphp/test/tcr/string/135.php.expect
rename to hphp/test/slow/string/135.php.expect
diff --git a/hphp/test/tcr/string/136.php b/hphp/test/slow/string/136.php
similarity index 100%
rename from hphp/test/tcr/string/136.php
rename to hphp/test/slow/string/136.php
diff --git a/hphp/test/tcr/string/136.php.expect b/hphp/test/slow/string/136.php.expect
similarity index 100%
rename from hphp/test/tcr/string/136.php.expect
rename to hphp/test/slow/string/136.php.expect
diff --git a/hphp/test/tcr/string/137.php b/hphp/test/slow/string/137.php
similarity index 100%
rename from hphp/test/tcr/string/137.php
rename to hphp/test/slow/string/137.php
diff --git a/hphp/test/tcr/string/137.php.expect b/hphp/test/slow/string/137.php.expect
similarity index 100%
rename from hphp/test/tcr/string/137.php.expect
rename to hphp/test/slow/string/137.php.expect
diff --git a/hphp/test/tcr/string/138.php b/hphp/test/slow/string/138.php
similarity index 100%
rename from hphp/test/tcr/string/138.php
rename to hphp/test/slow/string/138.php
diff --git a/hphp/test/tcr/string/138.php.expect b/hphp/test/slow/string/138.php.expect
similarity index 100%
rename from hphp/test/tcr/string/138.php.expect
rename to hphp/test/slow/string/138.php.expect
diff --git a/hphp/test/tcr/string/139.php b/hphp/test/slow/string/139.php
similarity index 100%
rename from hphp/test/tcr/string/139.php
rename to hphp/test/slow/string/139.php
diff --git a/hphp/test/tcr/string/139.php.expect b/hphp/test/slow/string/139.php.expect
similarity index 100%
rename from hphp/test/tcr/string/139.php.expect
rename to hphp/test/slow/string/139.php.expect
diff --git a/hphp/test/tcr/string/140.php b/hphp/test/slow/string/140.php
similarity index 100%
rename from hphp/test/tcr/string/140.php
rename to hphp/test/slow/string/140.php
diff --git a/hphp/test/tcr/string/140.php.expect b/hphp/test/slow/string/140.php.expect
similarity index 100%
rename from hphp/test/tcr/string/140.php.expect
rename to hphp/test/slow/string/140.php.expect
diff --git a/hphp/test/tcr/string/141.php b/hphp/test/slow/string/141.php
similarity index 100%
rename from hphp/test/tcr/string/141.php
rename to hphp/test/slow/string/141.php
diff --git a/hphp/test/tcr/string/141.php.expect b/hphp/test/slow/string/141.php.expect
similarity index 100%
rename from hphp/test/tcr/string/141.php.expect
rename to hphp/test/slow/string/141.php.expect
diff --git a/hphp/test/tcr/string/142.php b/hphp/test/slow/string/142.php
similarity index 100%
rename from hphp/test/tcr/string/142.php
rename to hphp/test/slow/string/142.php
diff --git a/hphp/test/tcr/string/142.php.expect b/hphp/test/slow/string/142.php.expect
similarity index 100%
rename from hphp/test/tcr/string/142.php.expect
rename to hphp/test/slow/string/142.php.expect
diff --git a/hphp/test/tcr/string/143.php b/hphp/test/slow/string/143.php
similarity index 100%
rename from hphp/test/tcr/string/143.php
rename to hphp/test/slow/string/143.php
diff --git a/hphp/test/tcr/string/143.php.expect b/hphp/test/slow/string/143.php.expect
similarity index 100%
rename from hphp/test/tcr/string/143.php.expect
rename to hphp/test/slow/string/143.php.expect
diff --git a/hphp/test/tcr/string/144.php b/hphp/test/slow/string/144.php
similarity index 100%
rename from hphp/test/tcr/string/144.php
rename to hphp/test/slow/string/144.php
diff --git a/hphp/test/tcr/string/144.php.expect b/hphp/test/slow/string/144.php.expect
similarity index 100%
rename from hphp/test/tcr/string/144.php.expect
rename to hphp/test/slow/string/144.php.expect
diff --git a/hphp/test/tcr/string/145.php b/hphp/test/slow/string/145.php
similarity index 100%
rename from hphp/test/tcr/string/145.php
rename to hphp/test/slow/string/145.php
diff --git a/hphp/test/tcr/string/145.php.expect b/hphp/test/slow/string/145.php.expect
similarity index 100%
rename from hphp/test/tcr/string/145.php.expect
rename to hphp/test/slow/string/145.php.expect
diff --git a/hphp/test/tcr/string/146.php b/hphp/test/slow/string/146.php
similarity index 100%
rename from hphp/test/tcr/string/146.php
rename to hphp/test/slow/string/146.php
diff --git a/hphp/test/tcr/string/146.php.expect b/hphp/test/slow/string/146.php.expect
similarity index 100%
rename from hphp/test/tcr/string/146.php.expect
rename to hphp/test/slow/string/146.php.expect
diff --git a/hphp/test/tcr/string/147.php b/hphp/test/slow/string/147.php
similarity index 100%
rename from hphp/test/tcr/string/147.php
rename to hphp/test/slow/string/147.php
diff --git a/hphp/test/tcr/string/147.php.expect b/hphp/test/slow/string/147.php.expect
similarity index 100%
rename from hphp/test/tcr/string/147.php.expect
rename to hphp/test/slow/string/147.php.expect
diff --git a/hphp/test/tcr/string/148.php b/hphp/test/slow/string/148.php
similarity index 100%
rename from hphp/test/tcr/string/148.php
rename to hphp/test/slow/string/148.php
diff --git a/hphp/test/tcr/string/148.php.expect b/hphp/test/slow/string/148.php.expect
similarity index 100%
rename from hphp/test/tcr/string/148.php.expect
rename to hphp/test/slow/string/148.php.expect
diff --git a/hphp/test/tcr/string/149.php b/hphp/test/slow/string/149.php
similarity index 100%
rename from hphp/test/tcr/string/149.php
rename to hphp/test/slow/string/149.php
diff --git a/hphp/test/tcr/string/149.php.expect b/hphp/test/slow/string/149.php.expect
similarity index 100%
rename from hphp/test/tcr/string/149.php.expect
rename to hphp/test/slow/string/149.php.expect
diff --git a/hphp/test/tcr/string/150.php b/hphp/test/slow/string/150.php
similarity index 100%
rename from hphp/test/tcr/string/150.php
rename to hphp/test/slow/string/150.php
diff --git a/hphp/test/tcr/string/150.php.expect b/hphp/test/slow/string/150.php.expect
similarity index 100%
rename from hphp/test/tcr/string/150.php.expect
rename to hphp/test/slow/string/150.php.expect
diff --git a/hphp/test/tcr/string/151.php b/hphp/test/slow/string/151.php
similarity index 100%
rename from hphp/test/tcr/string/151.php
rename to hphp/test/slow/string/151.php
diff --git a/hphp/test/tcr/string/151.php.expect b/hphp/test/slow/string/151.php.expect
similarity index 100%
rename from hphp/test/tcr/string/151.php.expect
rename to hphp/test/slow/string/151.php.expect
diff --git a/hphp/test/tcr/string/152.php b/hphp/test/slow/string/152.php
similarity index 100%
rename from hphp/test/tcr/string/152.php
rename to hphp/test/slow/string/152.php
diff --git a/hphp/test/tcr/string/152.php.expect b/hphp/test/slow/string/152.php.expect
similarity index 100%
rename from hphp/test/tcr/string/152.php.expect
rename to hphp/test/slow/string/152.php.expect
diff --git a/hphp/test/tcr/string/153.php b/hphp/test/slow/string/153.php
similarity index 100%
rename from hphp/test/tcr/string/153.php
rename to hphp/test/slow/string/153.php
diff --git a/hphp/test/tcr/string/153.php.expect b/hphp/test/slow/string/153.php.expect
similarity index 100%
rename from hphp/test/tcr/string/153.php.expect
rename to hphp/test/slow/string/153.php.expect
diff --git a/hphp/test/tcr/string/154.php b/hphp/test/slow/string/154.php
similarity index 100%
rename from hphp/test/tcr/string/154.php
rename to hphp/test/slow/string/154.php
diff --git a/hphp/test/tcr/string/154.php.expect b/hphp/test/slow/string/154.php.expect
similarity index 100%
rename from hphp/test/tcr/string/154.php.expect
rename to hphp/test/slow/string/154.php.expect
diff --git a/hphp/test/tcr/string/155.php b/hphp/test/slow/string/155.php
similarity index 100%
rename from hphp/test/tcr/string/155.php
rename to hphp/test/slow/string/155.php
diff --git a/hphp/test/tcr/string/155.php.expect b/hphp/test/slow/string/155.php.expect
similarity index 100%
rename from hphp/test/tcr/string/155.php.expect
rename to hphp/test/slow/string/155.php.expect
diff --git a/hphp/test/tcr/string/156.php b/hphp/test/slow/string/156.php
similarity index 100%
rename from hphp/test/tcr/string/156.php
rename to hphp/test/slow/string/156.php
diff --git a/hphp/test/tcr/string/156.php.expect b/hphp/test/slow/string/156.php.expect
similarity index 100%
rename from hphp/test/tcr/string/156.php.expect
rename to hphp/test/slow/string/156.php.expect
diff --git a/hphp/test/tcr/string/157.php b/hphp/test/slow/string/157.php
similarity index 100%
rename from hphp/test/tcr/string/157.php
rename to hphp/test/slow/string/157.php
diff --git a/hphp/test/tcr/string/157.php.expect b/hphp/test/slow/string/157.php.expect
similarity index 100%
rename from hphp/test/tcr/string/157.php.expect
rename to hphp/test/slow/string/157.php.expect
diff --git a/hphp/test/tcr/string/158.php b/hphp/test/slow/string/158.php
similarity index 100%
rename from hphp/test/tcr/string/158.php
rename to hphp/test/slow/string/158.php
diff --git a/hphp/test/tcr/string/158.php.expect b/hphp/test/slow/string/158.php.expect
similarity index 100%
rename from hphp/test/tcr/string/158.php.expect
rename to hphp/test/slow/string/158.php.expect
diff --git a/hphp/test/tcr/string/159.php b/hphp/test/slow/string/159.php
similarity index 100%
rename from hphp/test/tcr/string/159.php
rename to hphp/test/slow/string/159.php
diff --git a/hphp/test/tcr/string/159.php.expect b/hphp/test/slow/string/159.php.expect
similarity index 100%
rename from hphp/test/tcr/string/159.php.expect
rename to hphp/test/slow/string/159.php.expect
diff --git a/hphp/test/tcr/string/160.php b/hphp/test/slow/string/160.php
similarity index 100%
rename from hphp/test/tcr/string/160.php
rename to hphp/test/slow/string/160.php
diff --git a/hphp/test/tcr/string/160.php.expect b/hphp/test/slow/string/160.php.expect
similarity index 100%
rename from hphp/test/tcr/string/160.php.expect
rename to hphp/test/slow/string/160.php.expect
diff --git a/hphp/test/tcr/string/161.php b/hphp/test/slow/string/161.php
similarity index 100%
rename from hphp/test/tcr/string/161.php
rename to hphp/test/slow/string/161.php
diff --git a/hphp/test/tcr/string/161.php.expect b/hphp/test/slow/string/161.php.expect
similarity index 100%
rename from hphp/test/tcr/string/161.php.expect
rename to hphp/test/slow/string/161.php.expect
diff --git a/hphp/test/tcr/string/162.php b/hphp/test/slow/string/162.php
similarity index 100%
rename from hphp/test/tcr/string/162.php
rename to hphp/test/slow/string/162.php
diff --git a/hphp/test/tcr/string/162.php.expect b/hphp/test/slow/string/162.php.expect
similarity index 100%
rename from hphp/test/tcr/string/162.php.expect
rename to hphp/test/slow/string/162.php.expect
diff --git a/hphp/test/tcr/string/163.php b/hphp/test/slow/string/163.php
similarity index 100%
rename from hphp/test/tcr/string/163.php
rename to hphp/test/slow/string/163.php
diff --git a/hphp/test/tcr/string/163.php.expect b/hphp/test/slow/string/163.php.expect
similarity index 100%
rename from hphp/test/tcr/string/163.php.expect
rename to hphp/test/slow/string/163.php.expect
diff --git a/hphp/test/tcr/string/164.php b/hphp/test/slow/string/164.php
similarity index 100%
rename from hphp/test/tcr/string/164.php
rename to hphp/test/slow/string/164.php
diff --git a/hphp/test/tcr/string/164.php.expect b/hphp/test/slow/string/164.php.expect
similarity index 100%
rename from hphp/test/tcr/string/164.php.expect
rename to hphp/test/slow/string/164.php.expect
diff --git a/hphp/test/tcr/string/165.php b/hphp/test/slow/string/165.php
similarity index 100%
rename from hphp/test/tcr/string/165.php
rename to hphp/test/slow/string/165.php
diff --git a/hphp/test/tcr/string/165.php.expect b/hphp/test/slow/string/165.php.expect
similarity index 100%
rename from hphp/test/tcr/string/165.php.expect
rename to hphp/test/slow/string/165.php.expect
diff --git a/hphp/test/tcr/string/166.php b/hphp/test/slow/string/166.php
similarity index 100%
rename from hphp/test/tcr/string/166.php
rename to hphp/test/slow/string/166.php
diff --git a/hphp/test/tcr/string/166.php.expect b/hphp/test/slow/string/166.php.expect
similarity index 100%
rename from hphp/test/tcr/string/166.php.expect
rename to hphp/test/slow/string/166.php.expect
diff --git a/hphp/test/tcr/string/167.php b/hphp/test/slow/string/167.php
similarity index 100%
rename from hphp/test/tcr/string/167.php
rename to hphp/test/slow/string/167.php
diff --git a/hphp/test/tcr/string/167.php.expect b/hphp/test/slow/string/167.php.expect
similarity index 100%
rename from hphp/test/tcr/string/167.php.expect
rename to hphp/test/slow/string/167.php.expect
diff --git a/hphp/test/tcr/string/168.php b/hphp/test/slow/string/168.php
similarity index 100%
rename from hphp/test/tcr/string/168.php
rename to hphp/test/slow/string/168.php
diff --git a/hphp/test/tcr/string/168.php.expect b/hphp/test/slow/string/168.php.expect
similarity index 100%
rename from hphp/test/tcr/string/168.php.expect
rename to hphp/test/slow/string/168.php.expect
diff --git a/hphp/test/tcr/string/169.php b/hphp/test/slow/string/169.php
similarity index 100%
rename from hphp/test/tcr/string/169.php
rename to hphp/test/slow/string/169.php
diff --git a/hphp/test/tcr/string/169.php.expect b/hphp/test/slow/string/169.php.expect
similarity index 100%
rename from hphp/test/tcr/string/169.php.expect
rename to hphp/test/slow/string/169.php.expect
diff --git a/hphp/test/tcr/string/170.php b/hphp/test/slow/string/170.php
similarity index 100%
rename from hphp/test/tcr/string/170.php
rename to hphp/test/slow/string/170.php
diff --git a/hphp/test/tcr/string/170.php.expect b/hphp/test/slow/string/170.php.expect
similarity index 100%
rename from hphp/test/tcr/string/170.php.expect
rename to hphp/test/slow/string/170.php.expect
diff --git a/hphp/test/tcr/string/171.php b/hphp/test/slow/string/171.php
similarity index 100%
rename from hphp/test/tcr/string/171.php
rename to hphp/test/slow/string/171.php
diff --git a/hphp/test/tcr/string/171.php.expect b/hphp/test/slow/string/171.php.expect
similarity index 100%
rename from hphp/test/tcr/string/171.php.expect
rename to hphp/test/slow/string/171.php.expect
diff --git a/hphp/test/tcr/string/172.php b/hphp/test/slow/string/172.php
similarity index 100%
rename from hphp/test/tcr/string/172.php
rename to hphp/test/slow/string/172.php
diff --git a/hphp/test/tcr/string/172.php.expect b/hphp/test/slow/string/172.php.expect
similarity index 100%
rename from hphp/test/tcr/string/172.php.expect
rename to hphp/test/slow/string/172.php.expect
diff --git a/hphp/test/tcr/super_globals/1384.php b/hphp/test/slow/super_globals/1384.php
similarity index 100%
rename from hphp/test/tcr/super_globals/1384.php
rename to hphp/test/slow/super_globals/1384.php
diff --git a/hphp/test/tcr/super_globals/1384.php.expect b/hphp/test/slow/super_globals/1384.php.expect
similarity index 100%
rename from hphp/test/tcr/super_globals/1384.php.expect
rename to hphp/test/slow/super_globals/1384.php.expect
diff --git a/hphp/test/tcr/super_globals/1385.php b/hphp/test/slow/super_globals/1385.php
similarity index 100%
rename from hphp/test/tcr/super_globals/1385.php
rename to hphp/test/slow/super_globals/1385.php
diff --git a/hphp/test/tcr/super_globals/1385.php.expect b/hphp/test/slow/super_globals/1385.php.expect
similarity index 100%
rename from hphp/test/tcr/super_globals/1385.php.expect
rename to hphp/test/slow/super_globals/1385.php.expect
diff --git a/hphp/test/tcr/super_globals/1386.php b/hphp/test/slow/super_globals/1386.php
similarity index 100%
rename from hphp/test/tcr/super_globals/1386.php
rename to hphp/test/slow/super_globals/1386.php
diff --git a/hphp/test/tcr/super_globals/1386.php.expect b/hphp/test/slow/super_globals/1386.php.expect
similarity index 100%
rename from hphp/test/tcr/super_globals/1386.php.expect
rename to hphp/test/slow/super_globals/1386.php.expect
diff --git a/hphp/test/tcr/super_globals/1387.php b/hphp/test/slow/super_globals/1387.php
similarity index 100%
rename from hphp/test/tcr/super_globals/1387.php
rename to hphp/test/slow/super_globals/1387.php
diff --git a/hphp/test/tcr/super_globals/1387.php.expect b/hphp/test/slow/super_globals/1387.php.expect
similarity index 100%
rename from hphp/test/tcr/super_globals/1387.php.expect
rename to hphp/test/slow/super_globals/1387.php.expect
diff --git a/hphp/test/tcr/switch_statement/1751.php b/hphp/test/slow/switch_statement/1751.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1751.php
rename to hphp/test/slow/switch_statement/1751.php
diff --git a/hphp/test/tcr/volatile/1223.php.expect b/hphp/test/slow/switch_statement/1751.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1223.php.expect
rename to hphp/test/slow/switch_statement/1751.php.expect
diff --git a/hphp/test/tcr/switch_statement/1752.php b/hphp/test/slow/switch_statement/1752.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1752.php
rename to hphp/test/slow/switch_statement/1752.php
diff --git a/hphp/test/vm/EmitSProp.php.expect b/hphp/test/slow/switch_statement/1752.php.expect
similarity index 100%
rename from hphp/test/vm/EmitSProp.php.expect
rename to hphp/test/slow/switch_statement/1752.php.expect
diff --git a/hphp/test/tcr/switch_statement/1753.php b/hphp/test/slow/switch_statement/1753.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1753.php
rename to hphp/test/slow/switch_statement/1753.php
diff --git a/hphp/test/tcr/switch_statement/1753.php.expect b/hphp/test/slow/switch_statement/1753.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1753.php.expect
rename to hphp/test/slow/switch_statement/1753.php.expect
diff --git a/hphp/test/tcr/switch_statement/1754.php b/hphp/test/slow/switch_statement/1754.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1754.php
rename to hphp/test/slow/switch_statement/1754.php
diff --git a/hphp/test/tcr/switch_statement/1754.php.expect b/hphp/test/slow/switch_statement/1754.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1754.php.expect
rename to hphp/test/slow/switch_statement/1754.php.expect
diff --git a/hphp/test/tcr/switch_statement/1755.php b/hphp/test/slow/switch_statement/1755.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1755.php
rename to hphp/test/slow/switch_statement/1755.php
diff --git a/hphp/test/tcr/switch_statement/1755.php.expect b/hphp/test/slow/switch_statement/1755.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1755.php.expect
rename to hphp/test/slow/switch_statement/1755.php.expect
diff --git a/hphp/test/tcr/switch_statement/1756.php b/hphp/test/slow/switch_statement/1756.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1756.php
rename to hphp/test/slow/switch_statement/1756.php
diff --git a/hphp/test/tcr/switch_statement/1756.php.expect b/hphp/test/slow/switch_statement/1756.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1756.php.expect
rename to hphp/test/slow/switch_statement/1756.php.expect
diff --git a/hphp/test/tcr/switch_statement/1757.php b/hphp/test/slow/switch_statement/1757.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1757.php
rename to hphp/test/slow/switch_statement/1757.php
diff --git a/hphp/test/tcr/switch_statement/1757.php.expect b/hphp/test/slow/switch_statement/1757.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1757.php.expect
rename to hphp/test/slow/switch_statement/1757.php.expect
diff --git a/hphp/test/tcr/switch_statement/1757.php.hphp_opts b/hphp/test/slow/switch_statement/1757.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/switch_statement/1757.php.hphp_opts
rename to hphp/test/slow/switch_statement/1757.php.hphp_opts
diff --git a/hphp/test/tcr/switch_statement/1757.php.opts b/hphp/test/slow/switch_statement/1757.php.opts
similarity index 100%
rename from hphp/test/tcr/switch_statement/1757.php.opts
rename to hphp/test/slow/switch_statement/1757.php.opts
diff --git a/hphp/test/tcr/switch_statement/1758.php b/hphp/test/slow/switch_statement/1758.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1758.php
rename to hphp/test/slow/switch_statement/1758.php
diff --git a/hphp/test/tcr/switch_statement/1758.php.expect b/hphp/test/slow/switch_statement/1758.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1758.php.expect
rename to hphp/test/slow/switch_statement/1758.php.expect
diff --git a/hphp/test/tcr/switch_statement/1759.php b/hphp/test/slow/switch_statement/1759.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1759.php
rename to hphp/test/slow/switch_statement/1759.php
diff --git a/hphp/test/tcr/switch_statement/1759.php.expect b/hphp/test/slow/switch_statement/1759.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1759.php.expect
rename to hphp/test/slow/switch_statement/1759.php.expect
diff --git a/hphp/test/tcr/switch_statement/1760.php b/hphp/test/slow/switch_statement/1760.php
similarity index 100%
rename from hphp/test/tcr/switch_statement/1760.php
rename to hphp/test/slow/switch_statement/1760.php
diff --git a/hphp/test/tcr/switch_statement/1760.php.expect b/hphp/test/slow/switch_statement/1760.php.expect
similarity index 100%
rename from hphp/test/tcr/switch_statement/1760.php.expect
rename to hphp/test/slow/switch_statement/1760.php.expect
diff --git a/hphp/test/tcr/ternary/1725.php b/hphp/test/slow/ternary/1725.php
similarity index 100%
rename from hphp/test/tcr/ternary/1725.php
rename to hphp/test/slow/ternary/1725.php
diff --git a/hphp/test/tcr/ternary/1725.php.expect b/hphp/test/slow/ternary/1725.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1725.php.expect
rename to hphp/test/slow/ternary/1725.php.expect
diff --git a/hphp/test/tcr/ternary/1726.php b/hphp/test/slow/ternary/1726.php
similarity index 100%
rename from hphp/test/tcr/ternary/1726.php
rename to hphp/test/slow/ternary/1726.php
diff --git a/hphp/test/tcr/ternary/1726.php.expect b/hphp/test/slow/ternary/1726.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1726.php.expect
rename to hphp/test/slow/ternary/1726.php.expect
diff --git a/hphp/test/tcr/ternary/1727.php b/hphp/test/slow/ternary/1727.php
similarity index 100%
rename from hphp/test/tcr/ternary/1727.php
rename to hphp/test/slow/ternary/1727.php
diff --git a/hphp/test/tcr/ternary/1727.php.expect b/hphp/test/slow/ternary/1727.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1727.php.expect
rename to hphp/test/slow/ternary/1727.php.expect
diff --git a/hphp/test/tcr/ternary/1728.php b/hphp/test/slow/ternary/1728.php
similarity index 100%
rename from hphp/test/tcr/ternary/1728.php
rename to hphp/test/slow/ternary/1728.php
diff --git a/hphp/test/vm/SetThisProp.php.expect b/hphp/test/slow/ternary/1728.php.expect
similarity index 100%
rename from hphp/test/vm/SetThisProp.php.expect
rename to hphp/test/slow/ternary/1728.php.expect
diff --git a/hphp/test/tcr/ternary/1729.php b/hphp/test/slow/ternary/1729.php
similarity index 100%
rename from hphp/test/tcr/ternary/1729.php
rename to hphp/test/slow/ternary/1729.php
diff --git a/hphp/test/tcr/ternary/1729.php.expect b/hphp/test/slow/ternary/1729.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1729.php.expect
rename to hphp/test/slow/ternary/1729.php.expect
diff --git a/hphp/test/tcr/ternary/1730.php b/hphp/test/slow/ternary/1730.php
similarity index 100%
rename from hphp/test/tcr/ternary/1730.php
rename to hphp/test/slow/ternary/1730.php
diff --git a/hphp/test/vm/crossUnitRefsInc.php.expect b/hphp/test/slow/ternary/1730.php.expect
similarity index 100%
rename from hphp/test/vm/crossUnitRefsInc.php.expect
rename to hphp/test/slow/ternary/1730.php.expect
diff --git a/hphp/test/tcr/ternary/1731.php b/hphp/test/slow/ternary/1731.php
similarity index 100%
rename from hphp/test/tcr/ternary/1731.php
rename to hphp/test/slow/ternary/1731.php
diff --git a/hphp/test/vm/doublejump.php.expect b/hphp/test/slow/ternary/1731.php.expect
similarity index 100%
rename from hphp/test/vm/doublejump.php.expect
rename to hphp/test/slow/ternary/1731.php.expect
diff --git a/hphp/test/tcr/ternary/1732.php b/hphp/test/slow/ternary/1732.php
similarity index 100%
rename from hphp/test/tcr/ternary/1732.php
rename to hphp/test/slow/ternary/1732.php
diff --git a/hphp/test/vm/exit.php.expect b/hphp/test/slow/ternary/1732.php.expect
similarity index 100%
rename from hphp/test/vm/exit.php.expect
rename to hphp/test/slow/ternary/1732.php.expect
diff --git a/hphp/test/tcr/ternary/1733.php b/hphp/test/slow/ternary/1733.php
similarity index 100%
rename from hphp/test/tcr/ternary/1733.php
rename to hphp/test/slow/ternary/1733.php
diff --git a/hphp/test/vm/hopt_late_jcc_to_jmp.php.expect b/hphp/test/slow/ternary/1733.php.expect
similarity index 100%
rename from hphp/test/vm/hopt_late_jcc_to_jmp.php.expect
rename to hphp/test/slow/ternary/1733.php.expect
diff --git a/hphp/test/tcr/ternary/1734.php b/hphp/test/slow/ternary/1734.php
similarity index 100%
rename from hphp/test/tcr/ternary/1734.php
rename to hphp/test/slow/ternary/1734.php
diff --git a/hphp/test/vm/rejit.php.expect b/hphp/test/slow/ternary/1734.php.expect
similarity index 100%
rename from hphp/test/vm/rejit.php.expect
rename to hphp/test/slow/ternary/1734.php.expect
diff --git a/hphp/test/tcr/ternary/1735.php b/hphp/test/slow/ternary/1735.php
similarity index 100%
rename from hphp/test/tcr/ternary/1735.php
rename to hphp/test/slow/ternary/1735.php
diff --git a/hphp/test/tcr/ternary/1735.php.expect b/hphp/test/slow/ternary/1735.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1735.php.expect
rename to hphp/test/slow/ternary/1735.php.expect
diff --git a/hphp/test/tcr/ternary/1736.php b/hphp/test/slow/ternary/1736.php
similarity index 100%
rename from hphp/test/tcr/ternary/1736.php
rename to hphp/test/slow/ternary/1736.php
diff --git a/hphp/test/tcr/ternary/1736.php.expect b/hphp/test/slow/ternary/1736.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1736.php.expect
rename to hphp/test/slow/ternary/1736.php.expect
diff --git a/hphp/test/tcr/ternary/1737.php b/hphp/test/slow/ternary/1737.php
similarity index 100%
rename from hphp/test/tcr/ternary/1737.php
rename to hphp/test/slow/ternary/1737.php
diff --git a/hphp/test/tcr/ternary/1737.php.expect b/hphp/test/slow/ternary/1737.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1737.php.expect
rename to hphp/test/slow/ternary/1737.php.expect
diff --git a/hphp/test/tcr/ternary/1738.php b/hphp/test/slow/ternary/1738.php
similarity index 100%
rename from hphp/test/tcr/ternary/1738.php
rename to hphp/test/slow/ternary/1738.php
diff --git a/hphp/test/tcr/ternary/1738.php.expect b/hphp/test/slow/ternary/1738.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary/1738.php.expect
rename to hphp/test/slow/ternary/1738.php.expect
diff --git a/hphp/test/tcr/ternary_shortcut/1908.php b/hphp/test/slow/ternary_shortcut/1908.php
similarity index 100%
rename from hphp/test/tcr/ternary_shortcut/1908.php
rename to hphp/test/slow/ternary_shortcut/1908.php
diff --git a/hphp/test/tcr/ternary_shortcut/1908.php.expect b/hphp/test/slow/ternary_shortcut/1908.php.expect
similarity index 100%
rename from hphp/test/tcr/ternary_shortcut/1908.php.expect
rename to hphp/test/slow/ternary_shortcut/1908.php.expect
diff --git a/hphp/test/tcr/thrift/1556.php b/hphp/test/slow/thrift/1556.php
similarity index 100%
rename from hphp/test/tcr/thrift/1556.php
rename to hphp/test/slow/thrift/1556.php
diff --git a/hphp/test/tcr/thrift/1556.php.expect b/hphp/test/slow/thrift/1556.php.expect
similarity index 100%
rename from hphp/test/tcr/thrift/1556.php.expect
rename to hphp/test/slow/thrift/1556.php.expect
diff --git a/hphp/test/tcr/thrift/1557.php b/hphp/test/slow/thrift/1557.php
similarity index 100%
rename from hphp/test/tcr/thrift/1557.php
rename to hphp/test/slow/thrift/1557.php
diff --git a/hphp/test/tcr/thrift/1557.php.expect b/hphp/test/slow/thrift/1557.php.expect
similarity index 100%
rename from hphp/test/tcr/thrift/1557.php.expect
rename to hphp/test/slow/thrift/1557.php.expect
diff --git a/hphp/test/tcr/thrift/1558.php b/hphp/test/slow/thrift/1558.php
similarity index 100%
rename from hphp/test/tcr/thrift/1558.php
rename to hphp/test/slow/thrift/1558.php
diff --git a/hphp/test/tcr/thrift/1558.php.expect b/hphp/test/slow/thrift/1558.php.expect
similarity index 100%
rename from hphp/test/tcr/thrift/1558.php.expect
rename to hphp/test/slow/thrift/1558.php.expect
diff --git a/hphp/test/tcr/thrift/1559.php b/hphp/test/slow/thrift/1559.php
similarity index 100%
rename from hphp/test/tcr/thrift/1559.php
rename to hphp/test/slow/thrift/1559.php
diff --git a/hphp/test/tcr/thrift/1559.php.expect b/hphp/test/slow/thrift/1559.php.expect
similarity index 100%
rename from hphp/test/tcr/thrift/1559.php.expect
rename to hphp/test/slow/thrift/1559.php.expect
diff --git a/hphp/test/tcr/traits/1942.php b/hphp/test/slow/traits/1942.php
similarity index 100%
rename from hphp/test/tcr/traits/1942.php
rename to hphp/test/slow/traits/1942.php
diff --git a/hphp/test/vm/setmcrash.php.expect b/hphp/test/slow/traits/1942.php.expect
similarity index 100%
rename from hphp/test/vm/setmcrash.php.expect
rename to hphp/test/slow/traits/1942.php.expect
diff --git a/hphp/test/tcr/traits/1943.php b/hphp/test/slow/traits/1943.php
similarity index 100%
rename from hphp/test/tcr/traits/1943.php
rename to hphp/test/slow/traits/1943.php
diff --git a/hphp/test/tcr/traits/1943.php.expect b/hphp/test/slow/traits/1943.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1943.php.expect
rename to hphp/test/slow/traits/1943.php.expect
diff --git a/hphp/test/tcr/traits/1944.php b/hphp/test/slow/traits/1944.php
similarity index 100%
rename from hphp/test/tcr/traits/1944.php
rename to hphp/test/slow/traits/1944.php
diff --git a/hphp/test/tcr/traits/1944.php.expect b/hphp/test/slow/traits/1944.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1944.php.expect
rename to hphp/test/slow/traits/1944.php.expect
diff --git a/hphp/test/tcr/traits/1945.php b/hphp/test/slow/traits/1945.php
similarity index 100%
rename from hphp/test/tcr/traits/1945.php
rename to hphp/test/slow/traits/1945.php
diff --git a/hphp/test/tcr/traits/1945.php.expect b/hphp/test/slow/traits/1945.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1945.php.expect
rename to hphp/test/slow/traits/1945.php.expect
diff --git a/hphp/test/tcr/traits/1946.php b/hphp/test/slow/traits/1946.php
similarity index 100%
rename from hphp/test/tcr/traits/1946.php
rename to hphp/test/slow/traits/1946.php
diff --git a/hphp/test/tcr/traits/1946.php.expect b/hphp/test/slow/traits/1946.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1946.php.expect
rename to hphp/test/slow/traits/1946.php.expect
diff --git a/hphp/test/tcr/traits/1947.php b/hphp/test/slow/traits/1947.php
similarity index 100%
rename from hphp/test/tcr/traits/1947.php
rename to hphp/test/slow/traits/1947.php
diff --git a/hphp/test/tcr/traits/1947.php.expect b/hphp/test/slow/traits/1947.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1947.php.expect
rename to hphp/test/slow/traits/1947.php.expect
diff --git a/hphp/test/tcr/traits/1948.php b/hphp/test/slow/traits/1948.php
similarity index 100%
rename from hphp/test/tcr/traits/1948.php
rename to hphp/test/slow/traits/1948.php
diff --git a/hphp/test/tcr/traits/1948.php.expect b/hphp/test/slow/traits/1948.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1948.php.expect
rename to hphp/test/slow/traits/1948.php.expect
diff --git a/hphp/test/tcr/traits/1949.php b/hphp/test/slow/traits/1949.php
similarity index 100%
rename from hphp/test/tcr/traits/1949.php
rename to hphp/test/slow/traits/1949.php
diff --git a/hphp/test/tcr/traits/1949.php.expect b/hphp/test/slow/traits/1949.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1949.php.expect
rename to hphp/test/slow/traits/1949.php.expect
diff --git a/hphp/test/tcr/traits/1950.php b/hphp/test/slow/traits/1950.php
similarity index 100%
rename from hphp/test/tcr/traits/1950.php
rename to hphp/test/slow/traits/1950.php
diff --git a/hphp/test/tcr/traits/1950.php.expect b/hphp/test/slow/traits/1950.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1950.php.expect
rename to hphp/test/slow/traits/1950.php.expect
diff --git a/hphp/test/tcr/traits/1951.php b/hphp/test/slow/traits/1951.php
similarity index 100%
rename from hphp/test/tcr/traits/1951.php
rename to hphp/test/slow/traits/1951.php
diff --git a/hphp/test/tcr/traits/1951.php.expect b/hphp/test/slow/traits/1951.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1951.php.expect
rename to hphp/test/slow/traits/1951.php.expect
diff --git a/hphp/test/tcr/traits/1952.php b/hphp/test/slow/traits/1952.php
similarity index 100%
rename from hphp/test/tcr/traits/1952.php
rename to hphp/test/slow/traits/1952.php
diff --git a/hphp/test/tcr/traits/1952.php.expect b/hphp/test/slow/traits/1952.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1952.php.expect
rename to hphp/test/slow/traits/1952.php.expect
diff --git a/hphp/test/tcr/traits/1953.php b/hphp/test/slow/traits/1953.php
similarity index 100%
rename from hphp/test/tcr/traits/1953.php
rename to hphp/test/slow/traits/1953.php
diff --git a/hphp/test/tcr/traits/1953.php.expect b/hphp/test/slow/traits/1953.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1953.php.expect
rename to hphp/test/slow/traits/1953.php.expect
diff --git a/hphp/test/tcr/traits/1954.php b/hphp/test/slow/traits/1954.php
similarity index 100%
rename from hphp/test/tcr/traits/1954.php
rename to hphp/test/slow/traits/1954.php
diff --git a/hphp/test/tcr/traits/1954.php.expect b/hphp/test/slow/traits/1954.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1954.php.expect
rename to hphp/test/slow/traits/1954.php.expect
diff --git a/hphp/test/tcr/traits/1955.php b/hphp/test/slow/traits/1955.php
similarity index 100%
rename from hphp/test/tcr/traits/1955.php
rename to hphp/test/slow/traits/1955.php
diff --git a/hphp/test/tcr/traits/1955.php.expect b/hphp/test/slow/traits/1955.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1955.php.expect
rename to hphp/test/slow/traits/1955.php.expect
diff --git a/hphp/test/tcr/traits/1956.php b/hphp/test/slow/traits/1956.php
similarity index 100%
rename from hphp/test/tcr/traits/1956.php
rename to hphp/test/slow/traits/1956.php
diff --git a/hphp/test/tcr/traits/1956.php.expect b/hphp/test/slow/traits/1956.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1956.php.expect
rename to hphp/test/slow/traits/1956.php.expect
diff --git a/hphp/test/tcr/traits/1957.php b/hphp/test/slow/traits/1957.php
similarity index 100%
rename from hphp/test/tcr/traits/1957.php
rename to hphp/test/slow/traits/1957.php
diff --git a/hphp/test/tcr/traits/1957.php.expect b/hphp/test/slow/traits/1957.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1957.php.expect
rename to hphp/test/slow/traits/1957.php.expect
diff --git a/hphp/test/tcr/traits/1958.php b/hphp/test/slow/traits/1958.php
similarity index 100%
rename from hphp/test/tcr/traits/1958.php
rename to hphp/test/slow/traits/1958.php
diff --git a/hphp/test/tcr/traits/1958.php.expect b/hphp/test/slow/traits/1958.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1958.php.expect
rename to hphp/test/slow/traits/1958.php.expect
diff --git a/hphp/test/tcr/traits/1959.php b/hphp/test/slow/traits/1959.php
similarity index 100%
rename from hphp/test/tcr/traits/1959.php
rename to hphp/test/slow/traits/1959.php
diff --git a/hphp/test/tcr/traits/1959.php.expect b/hphp/test/slow/traits/1959.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1959.php.expect
rename to hphp/test/slow/traits/1959.php.expect
diff --git a/hphp/test/tcr/traits/1960.php b/hphp/test/slow/traits/1960.php
similarity index 100%
rename from hphp/test/tcr/traits/1960.php
rename to hphp/test/slow/traits/1960.php
diff --git a/hphp/test/tcr/traits/1960.php.expect b/hphp/test/slow/traits/1960.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1960.php.expect
rename to hphp/test/slow/traits/1960.php.expect
diff --git a/hphp/test/tcr/traits/1961.php b/hphp/test/slow/traits/1961.php
similarity index 100%
rename from hphp/test/tcr/traits/1961.php
rename to hphp/test/slow/traits/1961.php
diff --git a/hphp/test/tcr/traits/1961.php.expect b/hphp/test/slow/traits/1961.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1961.php.expect
rename to hphp/test/slow/traits/1961.php.expect
diff --git a/hphp/test/tcr/traits/1962.php b/hphp/test/slow/traits/1962.php
similarity index 100%
rename from hphp/test/tcr/traits/1962.php
rename to hphp/test/slow/traits/1962.php
diff --git a/hphp/test/tcr/traits/1962.php.expect b/hphp/test/slow/traits/1962.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1962.php.expect
rename to hphp/test/slow/traits/1962.php.expect
diff --git a/hphp/test/tcr/traits/1963.php b/hphp/test/slow/traits/1963.php
similarity index 100%
rename from hphp/test/tcr/traits/1963.php
rename to hphp/test/slow/traits/1963.php
diff --git a/hphp/test/tcr/traits/1963.php.expect b/hphp/test/slow/traits/1963.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1963.php.expect
rename to hphp/test/slow/traits/1963.php.expect
diff --git a/hphp/test/tcr/traits/1964.php b/hphp/test/slow/traits/1964.php
similarity index 100%
rename from hphp/test/tcr/traits/1964.php
rename to hphp/test/slow/traits/1964.php
diff --git a/hphp/test/tcr/traits/1964.php.expect b/hphp/test/slow/traits/1964.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1964.php.expect
rename to hphp/test/slow/traits/1964.php.expect
diff --git a/hphp/test/tcr/traits/1965.php b/hphp/test/slow/traits/1965.php
similarity index 100%
rename from hphp/test/tcr/traits/1965.php
rename to hphp/test/slow/traits/1965.php
diff --git a/hphp/test/tcr/traits/1965.php.expect b/hphp/test/slow/traits/1965.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1965.php.expect
rename to hphp/test/slow/traits/1965.php.expect
diff --git a/hphp/test/tcr/traits/1966.php b/hphp/test/slow/traits/1966.php
similarity index 100%
rename from hphp/test/tcr/traits/1966.php
rename to hphp/test/slow/traits/1966.php
diff --git a/hphp/test/tcr/traits/1966.php.expect b/hphp/test/slow/traits/1966.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1966.php.expect
rename to hphp/test/slow/traits/1966.php.expect
diff --git a/hphp/test/tcr/traits/1967.php b/hphp/test/slow/traits/1967.php
similarity index 100%
rename from hphp/test/tcr/traits/1967.php
rename to hphp/test/slow/traits/1967.php
diff --git a/hphp/test/tcr/traits/1967.php.expect b/hphp/test/slow/traits/1967.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1967.php.expect
rename to hphp/test/slow/traits/1967.php.expect
diff --git a/hphp/test/tcr/traits/1968.php b/hphp/test/slow/traits/1968.php
similarity index 100%
rename from hphp/test/tcr/traits/1968.php
rename to hphp/test/slow/traits/1968.php
diff --git a/hphp/test/tcr/traits/1968.php.expect b/hphp/test/slow/traits/1968.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1968.php.expect
rename to hphp/test/slow/traits/1968.php.expect
diff --git a/hphp/test/tcr/traits/1969.php b/hphp/test/slow/traits/1969.php
similarity index 100%
rename from hphp/test/tcr/traits/1969.php
rename to hphp/test/slow/traits/1969.php
diff --git a/hphp/test/tcr/traits/1969.php.expect b/hphp/test/slow/traits/1969.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1969.php.expect
rename to hphp/test/slow/traits/1969.php.expect
diff --git a/hphp/test/tcr/traits/1970.php b/hphp/test/slow/traits/1970.php
similarity index 100%
rename from hphp/test/tcr/traits/1970.php
rename to hphp/test/slow/traits/1970.php
diff --git a/hphp/test/tcr/traits/1970.php.expect b/hphp/test/slow/traits/1970.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1970.php.expect
rename to hphp/test/slow/traits/1970.php.expect
diff --git a/hphp/test/tcr/traits/1971.php b/hphp/test/slow/traits/1971.php
similarity index 100%
rename from hphp/test/tcr/traits/1971.php
rename to hphp/test/slow/traits/1971.php
diff --git a/hphp/test/tcr/traits/1971.php.expect b/hphp/test/slow/traits/1971.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1971.php.expect
rename to hphp/test/slow/traits/1971.php.expect
diff --git a/hphp/test/tcr/traits/1972.php b/hphp/test/slow/traits/1972.php
similarity index 100%
rename from hphp/test/tcr/traits/1972.php
rename to hphp/test/slow/traits/1972.php
diff --git a/hphp/test/tcr/traits/1972.php.expect b/hphp/test/slow/traits/1972.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1972.php.expect
rename to hphp/test/slow/traits/1972.php.expect
diff --git a/hphp/test/tcr/traits/1973.php b/hphp/test/slow/traits/1973.php
similarity index 100%
rename from hphp/test/tcr/traits/1973.php
rename to hphp/test/slow/traits/1973.php
diff --git a/hphp/test/tcr/traits/1973.php.expect b/hphp/test/slow/traits/1973.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1973.php.expect
rename to hphp/test/slow/traits/1973.php.expect
diff --git a/hphp/test/tcr/traits/1974.php b/hphp/test/slow/traits/1974.php
similarity index 100%
rename from hphp/test/tcr/traits/1974.php
rename to hphp/test/slow/traits/1974.php
diff --git a/hphp/test/tcr/traits/1974.php.expect b/hphp/test/slow/traits/1974.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1974.php.expect
rename to hphp/test/slow/traits/1974.php.expect
diff --git a/hphp/test/tcr/traits/1975.php b/hphp/test/slow/traits/1975.php
similarity index 100%
rename from hphp/test/tcr/traits/1975.php
rename to hphp/test/slow/traits/1975.php
diff --git a/hphp/test/tcr/traits/1975.php.expect b/hphp/test/slow/traits/1975.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1975.php.expect
rename to hphp/test/slow/traits/1975.php.expect
diff --git a/hphp/test/tcr/traits/1976.php b/hphp/test/slow/traits/1976.php
similarity index 100%
rename from hphp/test/tcr/traits/1976.php
rename to hphp/test/slow/traits/1976.php
diff --git a/hphp/test/tcr/traits/1976.php.expect b/hphp/test/slow/traits/1976.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1976.php.expect
rename to hphp/test/slow/traits/1976.php.expect
diff --git a/hphp/test/tcr/traits/1977.php b/hphp/test/slow/traits/1977.php
similarity index 100%
rename from hphp/test/tcr/traits/1977.php
rename to hphp/test/slow/traits/1977.php
diff --git a/hphp/test/tcr/traits/1977.php.expect b/hphp/test/slow/traits/1977.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1977.php.expect
rename to hphp/test/slow/traits/1977.php.expect
diff --git a/hphp/test/tcr/traits/1978.php b/hphp/test/slow/traits/1978.php
similarity index 100%
rename from hphp/test/tcr/traits/1978.php
rename to hphp/test/slow/traits/1978.php
diff --git a/hphp/test/tcr/traits/1978.php.expect b/hphp/test/slow/traits/1978.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1978.php.expect
rename to hphp/test/slow/traits/1978.php.expect
diff --git a/hphp/test/tcr/traits/1979.php b/hphp/test/slow/traits/1979.php
similarity index 100%
rename from hphp/test/tcr/traits/1979.php
rename to hphp/test/slow/traits/1979.php
diff --git a/hphp/test/tcr/traits/1979.php.expect b/hphp/test/slow/traits/1979.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1979.php.expect
rename to hphp/test/slow/traits/1979.php.expect
diff --git a/hphp/test/tcr/traits/1980.php b/hphp/test/slow/traits/1980.php
similarity index 100%
rename from hphp/test/tcr/traits/1980.php
rename to hphp/test/slow/traits/1980.php
diff --git a/hphp/test/tcr/traits/1980.php.expect b/hphp/test/slow/traits/1980.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1980.php.expect
rename to hphp/test/slow/traits/1980.php.expect
diff --git a/hphp/test/tcr/traits/1981.php b/hphp/test/slow/traits/1981.php
similarity index 100%
rename from hphp/test/tcr/traits/1981.php
rename to hphp/test/slow/traits/1981.php
diff --git a/hphp/test/tcr/traits/1981.php.expect b/hphp/test/slow/traits/1981.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1981.php.expect
rename to hphp/test/slow/traits/1981.php.expect
diff --git a/hphp/test/tcr/traits/1982.php b/hphp/test/slow/traits/1982.php
similarity index 100%
rename from hphp/test/tcr/traits/1982.php
rename to hphp/test/slow/traits/1982.php
diff --git a/hphp/test/tcr/traits/1982.php.expect b/hphp/test/slow/traits/1982.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1982.php.expect
rename to hphp/test/slow/traits/1982.php.expect
diff --git a/hphp/test/tcr/traits/1983.php b/hphp/test/slow/traits/1983.php
similarity index 100%
rename from hphp/test/tcr/traits/1983.php
rename to hphp/test/slow/traits/1983.php
diff --git a/hphp/test/tcr/traits/1983.php.expect b/hphp/test/slow/traits/1983.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1983.php.expect
rename to hphp/test/slow/traits/1983.php.expect
diff --git a/hphp/test/tcr/traits/1984.php b/hphp/test/slow/traits/1984.php
similarity index 100%
rename from hphp/test/tcr/traits/1984.php
rename to hphp/test/slow/traits/1984.php
diff --git a/hphp/test/tcr/traits/1984.php.expect b/hphp/test/slow/traits/1984.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1984.php.expect
rename to hphp/test/slow/traits/1984.php.expect
diff --git a/hphp/test/tcr/traits/1985.php b/hphp/test/slow/traits/1985.php
similarity index 100%
rename from hphp/test/tcr/traits/1985.php
rename to hphp/test/slow/traits/1985.php
diff --git a/hphp/test/tcr/traits/1985.php.expect b/hphp/test/slow/traits/1985.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1985.php.expect
rename to hphp/test/slow/traits/1985.php.expect
diff --git a/hphp/test/tcr/traits/1986.php b/hphp/test/slow/traits/1986.php
similarity index 100%
rename from hphp/test/tcr/traits/1986.php
rename to hphp/test/slow/traits/1986.php
diff --git a/hphp/test/tcr/traits/1986.php.expect b/hphp/test/slow/traits/1986.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1986.php.expect
rename to hphp/test/slow/traits/1986.php.expect
diff --git a/hphp/test/tcr/traits/1987.php b/hphp/test/slow/traits/1987.php
similarity index 100%
rename from hphp/test/tcr/traits/1987.php
rename to hphp/test/slow/traits/1987.php
diff --git a/hphp/test/tcr/traits/1987.php.expect b/hphp/test/slow/traits/1987.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1987.php.expect
rename to hphp/test/slow/traits/1987.php.expect
diff --git a/hphp/test/tcr/traits/1988.php b/hphp/test/slow/traits/1988.php
similarity index 100%
rename from hphp/test/tcr/traits/1988.php
rename to hphp/test/slow/traits/1988.php
diff --git a/hphp/test/tcr/traits/1988.php.expect b/hphp/test/slow/traits/1988.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1988.php.expect
rename to hphp/test/slow/traits/1988.php.expect
diff --git a/hphp/test/tcr/traits/1989.php b/hphp/test/slow/traits/1989.php
similarity index 100%
rename from hphp/test/tcr/traits/1989.php
rename to hphp/test/slow/traits/1989.php
diff --git a/hphp/test/tcr/traits/1989.php.expect b/hphp/test/slow/traits/1989.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1989.php.expect
rename to hphp/test/slow/traits/1989.php.expect
diff --git a/hphp/test/tcr/traits/1990.php b/hphp/test/slow/traits/1990.php
similarity index 100%
rename from hphp/test/tcr/traits/1990.php
rename to hphp/test/slow/traits/1990.php
diff --git a/hphp/test/tcr/traits/1990.php.expect b/hphp/test/slow/traits/1990.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1990.php.expect
rename to hphp/test/slow/traits/1990.php.expect
diff --git a/hphp/test/tcr/traits/1991.php b/hphp/test/slow/traits/1991.php
similarity index 100%
rename from hphp/test/tcr/traits/1991.php
rename to hphp/test/slow/traits/1991.php
diff --git a/hphp/test/tcr/traits/1991.php.expect b/hphp/test/slow/traits/1991.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1991.php.expect
rename to hphp/test/slow/traits/1991.php.expect
diff --git a/hphp/test/tcr/traits/1992.php b/hphp/test/slow/traits/1992.php
similarity index 100%
rename from hphp/test/tcr/traits/1992.php
rename to hphp/test/slow/traits/1992.php
diff --git a/hphp/test/tcr/traits/1992.php.expect b/hphp/test/slow/traits/1992.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1992.php.expect
rename to hphp/test/slow/traits/1992.php.expect
diff --git a/hphp/test/tcr/traits/1993.php b/hphp/test/slow/traits/1993.php
similarity index 100%
rename from hphp/test/tcr/traits/1993.php
rename to hphp/test/slow/traits/1993.php
diff --git a/hphp/test/tcr/traits/1993.php.expect b/hphp/test/slow/traits/1993.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1993.php.expect
rename to hphp/test/slow/traits/1993.php.expect
diff --git a/hphp/test/tcr/traits/1994.php b/hphp/test/slow/traits/1994.php
similarity index 100%
rename from hphp/test/tcr/traits/1994.php
rename to hphp/test/slow/traits/1994.php
diff --git a/hphp/test/tcr/traits/1994.php.expect b/hphp/test/slow/traits/1994.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1994.php.expect
rename to hphp/test/slow/traits/1994.php.expect
diff --git a/hphp/test/tcr/traits/1995.php b/hphp/test/slow/traits/1995.php
similarity index 100%
rename from hphp/test/tcr/traits/1995.php
rename to hphp/test/slow/traits/1995.php
diff --git a/hphp/test/tcr/traits/1995.php.expect b/hphp/test/slow/traits/1995.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1995.php.expect
rename to hphp/test/slow/traits/1995.php.expect
diff --git a/hphp/test/tcr/traits/1996.php b/hphp/test/slow/traits/1996.php
similarity index 100%
rename from hphp/test/tcr/traits/1996.php
rename to hphp/test/slow/traits/1996.php
diff --git a/hphp/test/tcr/traits/1996.php.expect b/hphp/test/slow/traits/1996.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1996.php.expect
rename to hphp/test/slow/traits/1996.php.expect
diff --git a/hphp/test/tcr/traits/1997.php b/hphp/test/slow/traits/1997.php
similarity index 100%
rename from hphp/test/tcr/traits/1997.php
rename to hphp/test/slow/traits/1997.php
diff --git a/hphp/test/tcr/traits/1997.php.expect b/hphp/test/slow/traits/1997.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1997.php.expect
rename to hphp/test/slow/traits/1997.php.expect
diff --git a/hphp/test/tcr/traits/1998.php b/hphp/test/slow/traits/1998.php
similarity index 100%
rename from hphp/test/tcr/traits/1998.php
rename to hphp/test/slow/traits/1998.php
diff --git a/hphp/test/tcr/traits/1998.php.expect b/hphp/test/slow/traits/1998.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1998.php.expect
rename to hphp/test/slow/traits/1998.php.expect
diff --git a/hphp/test/tcr/traits/1999.php b/hphp/test/slow/traits/1999.php
similarity index 100%
rename from hphp/test/tcr/traits/1999.php
rename to hphp/test/slow/traits/1999.php
diff --git a/hphp/test/tcr/traits/1999.php.expect b/hphp/test/slow/traits/1999.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/1999.php.expect
rename to hphp/test/slow/traits/1999.php.expect
diff --git a/hphp/test/tcr/traits/2000.php b/hphp/test/slow/traits/2000.php
similarity index 100%
rename from hphp/test/tcr/traits/2000.php
rename to hphp/test/slow/traits/2000.php
diff --git a/hphp/test/tcr/traits/2000.php.expect b/hphp/test/slow/traits/2000.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2000.php.expect
rename to hphp/test/slow/traits/2000.php.expect
diff --git a/hphp/test/tcr/traits/2001.php b/hphp/test/slow/traits/2001.php
similarity index 100%
rename from hphp/test/tcr/traits/2001.php
rename to hphp/test/slow/traits/2001.php
diff --git a/hphp/test/tcr/traits/2001.php.expect b/hphp/test/slow/traits/2001.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2001.php.expect
rename to hphp/test/slow/traits/2001.php.expect
diff --git a/hphp/test/tcr/traits/2002.php b/hphp/test/slow/traits/2002.php
similarity index 100%
rename from hphp/test/tcr/traits/2002.php
rename to hphp/test/slow/traits/2002.php
diff --git a/hphp/test/tcr/traits/2002.php.expect b/hphp/test/slow/traits/2002.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2002.php.expect
rename to hphp/test/slow/traits/2002.php.expect
diff --git a/hphp/test/tcr/traits/2003.php b/hphp/test/slow/traits/2003.php
similarity index 100%
rename from hphp/test/tcr/traits/2003.php
rename to hphp/test/slow/traits/2003.php
diff --git a/hphp/test/tcr/traits/2003.php.expect b/hphp/test/slow/traits/2003.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2003.php.expect
rename to hphp/test/slow/traits/2003.php.expect
diff --git a/hphp/test/tcr/traits/2004.php b/hphp/test/slow/traits/2004.php
similarity index 100%
rename from hphp/test/tcr/traits/2004.php
rename to hphp/test/slow/traits/2004.php
diff --git a/hphp/test/tcr/traits/2004.php.expect b/hphp/test/slow/traits/2004.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2004.php.expect
rename to hphp/test/slow/traits/2004.php.expect
diff --git a/hphp/test/tcr/traits/2005.php b/hphp/test/slow/traits/2005.php
similarity index 100%
rename from hphp/test/tcr/traits/2005.php
rename to hphp/test/slow/traits/2005.php
diff --git a/hphp/test/tcr/traits/2005.php.expect b/hphp/test/slow/traits/2005.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2005.php.expect
rename to hphp/test/slow/traits/2005.php.expect
diff --git a/hphp/test/tcr/traits/2006.php b/hphp/test/slow/traits/2006.php
similarity index 100%
rename from hphp/test/tcr/traits/2006.php
rename to hphp/test/slow/traits/2006.php
diff --git a/hphp/test/tcr/traits/2006.php.expect b/hphp/test/slow/traits/2006.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2006.php.expect
rename to hphp/test/slow/traits/2006.php.expect
diff --git a/hphp/test/tcr/traits/2007.php b/hphp/test/slow/traits/2007.php
similarity index 100%
rename from hphp/test/tcr/traits/2007.php
rename to hphp/test/slow/traits/2007.php
diff --git a/hphp/test/tcr/traits/2007.php.expect b/hphp/test/slow/traits/2007.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2007.php.expect
rename to hphp/test/slow/traits/2007.php.expect
diff --git a/hphp/test/tcr/traits/2008.php b/hphp/test/slow/traits/2008.php
similarity index 100%
rename from hphp/test/tcr/traits/2008.php
rename to hphp/test/slow/traits/2008.php
diff --git a/hphp/test/tcr/traits/2008.php.expect b/hphp/test/slow/traits/2008.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2008.php.expect
rename to hphp/test/slow/traits/2008.php.expect
diff --git a/hphp/test/tcr/traits/2009.php b/hphp/test/slow/traits/2009.php
similarity index 100%
rename from hphp/test/tcr/traits/2009.php
rename to hphp/test/slow/traits/2009.php
diff --git a/hphp/test/tcr/traits/2009.php.expect b/hphp/test/slow/traits/2009.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2009.php.expect
rename to hphp/test/slow/traits/2009.php.expect
diff --git a/hphp/test/tcr/traits/2010.php b/hphp/test/slow/traits/2010.php
similarity index 100%
rename from hphp/test/tcr/traits/2010.php
rename to hphp/test/slow/traits/2010.php
diff --git a/hphp/test/tcr/traits/2010.php.expect b/hphp/test/slow/traits/2010.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2010.php.expect
rename to hphp/test/slow/traits/2010.php.expect
diff --git a/hphp/test/tcr/traits/2011.php b/hphp/test/slow/traits/2011.php
similarity index 100%
rename from hphp/test/tcr/traits/2011.php
rename to hphp/test/slow/traits/2011.php
diff --git a/hphp/test/tcr/traits/2011.php.expect b/hphp/test/slow/traits/2011.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2011.php.expect
rename to hphp/test/slow/traits/2011.php.expect
diff --git a/hphp/test/tcr/traits/2012.php b/hphp/test/slow/traits/2012.php
similarity index 100%
rename from hphp/test/tcr/traits/2012.php
rename to hphp/test/slow/traits/2012.php
diff --git a/hphp/test/tcr/traits/2012.php.expect b/hphp/test/slow/traits/2012.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2012.php.expect
rename to hphp/test/slow/traits/2012.php.expect
diff --git a/hphp/test/tcr/traits/2013.php b/hphp/test/slow/traits/2013.php
similarity index 100%
rename from hphp/test/tcr/traits/2013.php
rename to hphp/test/slow/traits/2013.php
diff --git a/hphp/test/tcr/traits/2013.php.expect b/hphp/test/slow/traits/2013.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2013.php.expect
rename to hphp/test/slow/traits/2013.php.expect
diff --git a/hphp/test/tcr/traits/2014.php b/hphp/test/slow/traits/2014.php
similarity index 100%
rename from hphp/test/tcr/traits/2014.php
rename to hphp/test/slow/traits/2014.php
diff --git a/hphp/test/tcr/traits/2014.php.expect b/hphp/test/slow/traits/2014.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2014.php.expect
rename to hphp/test/slow/traits/2014.php.expect
diff --git a/hphp/test/tcr/traits/2015.php b/hphp/test/slow/traits/2015.php
similarity index 100%
rename from hphp/test/tcr/traits/2015.php
rename to hphp/test/slow/traits/2015.php
diff --git a/hphp/test/tcr/traits/2015.php.expect b/hphp/test/slow/traits/2015.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2015.php.expect
rename to hphp/test/slow/traits/2015.php.expect
diff --git a/hphp/test/tcr/traits/2016.php b/hphp/test/slow/traits/2016.php
similarity index 100%
rename from hphp/test/tcr/traits/2016.php
rename to hphp/test/slow/traits/2016.php
diff --git a/hphp/test/tcr/traits/2016.php.expect b/hphp/test/slow/traits/2016.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2016.php.expect
rename to hphp/test/slow/traits/2016.php.expect
diff --git a/hphp/test/tcr/traits/2017.php b/hphp/test/slow/traits/2017.php
similarity index 100%
rename from hphp/test/tcr/traits/2017.php
rename to hphp/test/slow/traits/2017.php
diff --git a/hphp/test/tcr/traits/2017.php.expect b/hphp/test/slow/traits/2017.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2017.php.expect
rename to hphp/test/slow/traits/2017.php.expect
diff --git a/hphp/test/tcr/traits/2018.php b/hphp/test/slow/traits/2018.php
similarity index 100%
rename from hphp/test/tcr/traits/2018.php
rename to hphp/test/slow/traits/2018.php
diff --git a/hphp/test/tcr/traits/2018.php.expect b/hphp/test/slow/traits/2018.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2018.php.expect
rename to hphp/test/slow/traits/2018.php.expect
diff --git a/hphp/test/tcr/traits/2019.php b/hphp/test/slow/traits/2019.php
similarity index 100%
rename from hphp/test/tcr/traits/2019.php
rename to hphp/test/slow/traits/2019.php
diff --git a/hphp/test/tcr/traits/2019.php.expect b/hphp/test/slow/traits/2019.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2019.php.expect
rename to hphp/test/slow/traits/2019.php.expect
diff --git a/hphp/test/tcr/traits/2020.php b/hphp/test/slow/traits/2020.php
similarity index 100%
rename from hphp/test/tcr/traits/2020.php
rename to hphp/test/slow/traits/2020.php
diff --git a/hphp/test/tcr/traits/2020.php.expect b/hphp/test/slow/traits/2020.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2020.php.expect
rename to hphp/test/slow/traits/2020.php.expect
diff --git a/hphp/test/tcr/traits/2021.php b/hphp/test/slow/traits/2021.php
similarity index 100%
rename from hphp/test/tcr/traits/2021.php
rename to hphp/test/slow/traits/2021.php
diff --git a/hphp/test/tcr/traits/2021.php.expect b/hphp/test/slow/traits/2021.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2021.php.expect
rename to hphp/test/slow/traits/2021.php.expect
diff --git a/hphp/test/tcr/traits/2022.php b/hphp/test/slow/traits/2022.php
similarity index 100%
rename from hphp/test/tcr/traits/2022.php
rename to hphp/test/slow/traits/2022.php
diff --git a/hphp/test/tcr/traits/2022.php.expect b/hphp/test/slow/traits/2022.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2022.php.expect
rename to hphp/test/slow/traits/2022.php.expect
diff --git a/hphp/test/tcr/traits/2023.php b/hphp/test/slow/traits/2023.php
similarity index 100%
rename from hphp/test/tcr/traits/2023.php
rename to hphp/test/slow/traits/2023.php
diff --git a/hphp/test/tcr/traits/2023.php.expect b/hphp/test/slow/traits/2023.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2023.php.expect
rename to hphp/test/slow/traits/2023.php.expect
diff --git a/hphp/test/tcr/traits/2024.php b/hphp/test/slow/traits/2024.php
similarity index 100%
rename from hphp/test/tcr/traits/2024.php
rename to hphp/test/slow/traits/2024.php
diff --git a/hphp/test/tcr/traits/2024.php.expect b/hphp/test/slow/traits/2024.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2024.php.expect
rename to hphp/test/slow/traits/2024.php.expect
diff --git a/hphp/test/tcr/traits/2025.php b/hphp/test/slow/traits/2025.php
similarity index 100%
rename from hphp/test/tcr/traits/2025.php
rename to hphp/test/slow/traits/2025.php
diff --git a/hphp/test/tcr/traits/2025.php.expect b/hphp/test/slow/traits/2025.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2025.php.expect
rename to hphp/test/slow/traits/2025.php.expect
diff --git a/hphp/test/tcr/traits/2026.php b/hphp/test/slow/traits/2026.php
similarity index 100%
rename from hphp/test/tcr/traits/2026.php
rename to hphp/test/slow/traits/2026.php
diff --git a/hphp/test/tcr/traits/2026.php.expect b/hphp/test/slow/traits/2026.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2026.php.expect
rename to hphp/test/slow/traits/2026.php.expect
diff --git a/hphp/test/tcr/traits/2027.php b/hphp/test/slow/traits/2027.php
similarity index 100%
rename from hphp/test/tcr/traits/2027.php
rename to hphp/test/slow/traits/2027.php
diff --git a/hphp/test/tcr/traits/2027.php.expect b/hphp/test/slow/traits/2027.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2027.php.expect
rename to hphp/test/slow/traits/2027.php.expect
diff --git a/hphp/test/tcr/traits/2028.php b/hphp/test/slow/traits/2028.php
similarity index 100%
rename from hphp/test/tcr/traits/2028.php
rename to hphp/test/slow/traits/2028.php
diff --git a/hphp/test/tcr/traits/2028.php.expect b/hphp/test/slow/traits/2028.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2028.php.expect
rename to hphp/test/slow/traits/2028.php.expect
diff --git a/hphp/test/tcr/traits/2029.php b/hphp/test/slow/traits/2029.php
similarity index 100%
rename from hphp/test/tcr/traits/2029.php
rename to hphp/test/slow/traits/2029.php
diff --git a/hphp/test/tcr/traits/2029.php.expect b/hphp/test/slow/traits/2029.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2029.php.expect
rename to hphp/test/slow/traits/2029.php.expect
diff --git a/hphp/test/tcr/traits/2030.php b/hphp/test/slow/traits/2030.php
similarity index 100%
rename from hphp/test/tcr/traits/2030.php
rename to hphp/test/slow/traits/2030.php
diff --git a/hphp/test/tcr/traits/2030.php.expect b/hphp/test/slow/traits/2030.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2030.php.expect
rename to hphp/test/slow/traits/2030.php.expect
diff --git a/hphp/test/tcr/traits/2031.php b/hphp/test/slow/traits/2031.php
similarity index 100%
rename from hphp/test/tcr/traits/2031.php
rename to hphp/test/slow/traits/2031.php
diff --git a/hphp/test/tcr/traits/2031.php.expect b/hphp/test/slow/traits/2031.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2031.php.expect
rename to hphp/test/slow/traits/2031.php.expect
diff --git a/hphp/test/tcr/traits/2032.php b/hphp/test/slow/traits/2032.php
similarity index 100%
rename from hphp/test/tcr/traits/2032.php
rename to hphp/test/slow/traits/2032.php
diff --git a/hphp/test/tcr/traits/2032.php.expect b/hphp/test/slow/traits/2032.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2032.php.expect
rename to hphp/test/slow/traits/2032.php.expect
diff --git a/hphp/test/tcr/traits/2033.php b/hphp/test/slow/traits/2033.php
similarity index 100%
rename from hphp/test/tcr/traits/2033.php
rename to hphp/test/slow/traits/2033.php
diff --git a/hphp/test/tcr/traits/2033.php.expect b/hphp/test/slow/traits/2033.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2033.php.expect
rename to hphp/test/slow/traits/2033.php.expect
diff --git a/hphp/test/tcr/traits/2034.php b/hphp/test/slow/traits/2034.php
similarity index 100%
rename from hphp/test/tcr/traits/2034.php
rename to hphp/test/slow/traits/2034.php
diff --git a/hphp/test/tcr/traits/2034.php.expect b/hphp/test/slow/traits/2034.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2034.php.expect
rename to hphp/test/slow/traits/2034.php.expect
diff --git a/hphp/test/tcr/traits/2035.php b/hphp/test/slow/traits/2035.php
similarity index 100%
rename from hphp/test/tcr/traits/2035.php
rename to hphp/test/slow/traits/2035.php
diff --git a/hphp/test/tcr/traits/2035.php.expect b/hphp/test/slow/traits/2035.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2035.php.expect
rename to hphp/test/slow/traits/2035.php.expect
diff --git a/hphp/test/tcr/traits/2036.php b/hphp/test/slow/traits/2036.php
similarity index 100%
rename from hphp/test/tcr/traits/2036.php
rename to hphp/test/slow/traits/2036.php
diff --git a/hphp/test/tcr/traits/2036.php.expect b/hphp/test/slow/traits/2036.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2036.php.expect
rename to hphp/test/slow/traits/2036.php.expect
diff --git a/hphp/test/tcr/traits/2037.php b/hphp/test/slow/traits/2037.php
similarity index 100%
rename from hphp/test/tcr/traits/2037.php
rename to hphp/test/slow/traits/2037.php
diff --git a/hphp/test/tcr/traits/2037.php.expect b/hphp/test/slow/traits/2037.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2037.php.expect
rename to hphp/test/slow/traits/2037.php.expect
diff --git a/hphp/test/tcr/traits/2038.php b/hphp/test/slow/traits/2038.php
similarity index 100%
rename from hphp/test/tcr/traits/2038.php
rename to hphp/test/slow/traits/2038.php
diff --git a/hphp/test/tcr/traits/2038.php.expect b/hphp/test/slow/traits/2038.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2038.php.expect
rename to hphp/test/slow/traits/2038.php.expect
diff --git a/hphp/test/tcr/traits/2039.php b/hphp/test/slow/traits/2039.php
similarity index 100%
rename from hphp/test/tcr/traits/2039.php
rename to hphp/test/slow/traits/2039.php
diff --git a/hphp/test/tcr/traits/2039.php.expect b/hphp/test/slow/traits/2039.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2039.php.expect
rename to hphp/test/slow/traits/2039.php.expect
diff --git a/hphp/test/tcr/traits/2040.php b/hphp/test/slow/traits/2040.php
similarity index 100%
rename from hphp/test/tcr/traits/2040.php
rename to hphp/test/slow/traits/2040.php
diff --git a/hphp/test/tcr/traits/2040.php.expect b/hphp/test/slow/traits/2040.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2040.php.expect
rename to hphp/test/slow/traits/2040.php.expect
diff --git a/hphp/test/tcr/traits/2041.php b/hphp/test/slow/traits/2041.php
similarity index 100%
rename from hphp/test/tcr/traits/2041.php
rename to hphp/test/slow/traits/2041.php
diff --git a/hphp/test/tcr/traits/2041.php.expect b/hphp/test/slow/traits/2041.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2041.php.expect
rename to hphp/test/slow/traits/2041.php.expect
diff --git a/hphp/test/tcr/traits/2042.php b/hphp/test/slow/traits/2042.php
similarity index 100%
rename from hphp/test/tcr/traits/2042.php
rename to hphp/test/slow/traits/2042.php
diff --git a/hphp/test/tcr/traits/2042.php.expect b/hphp/test/slow/traits/2042.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2042.php.expect
rename to hphp/test/slow/traits/2042.php.expect
diff --git a/hphp/test/tcr/traits/2043.php b/hphp/test/slow/traits/2043.php
similarity index 100%
rename from hphp/test/tcr/traits/2043.php
rename to hphp/test/slow/traits/2043.php
diff --git a/hphp/test/tcr/traits/2043.php.expect b/hphp/test/slow/traits/2043.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2043.php.expect
rename to hphp/test/slow/traits/2043.php.expect
diff --git a/hphp/test/tcr/traits/2044.php b/hphp/test/slow/traits/2044.php
similarity index 100%
rename from hphp/test/tcr/traits/2044.php
rename to hphp/test/slow/traits/2044.php
diff --git a/hphp/test/tcr/traits/2044.php.expect b/hphp/test/slow/traits/2044.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2044.php.expect
rename to hphp/test/slow/traits/2044.php.expect
diff --git a/hphp/test/tcr/traits/2045.php b/hphp/test/slow/traits/2045.php
similarity index 100%
rename from hphp/test/tcr/traits/2045.php
rename to hphp/test/slow/traits/2045.php
diff --git a/hphp/test/tcr/traits/2045.php.expect b/hphp/test/slow/traits/2045.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2045.php.expect
rename to hphp/test/slow/traits/2045.php.expect
diff --git a/hphp/test/tcr/traits/2046.php b/hphp/test/slow/traits/2046.php
similarity index 100%
rename from hphp/test/tcr/traits/2046.php
rename to hphp/test/slow/traits/2046.php
diff --git a/hphp/test/tcr/traits/2046.php.expect b/hphp/test/slow/traits/2046.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2046.php.expect
rename to hphp/test/slow/traits/2046.php.expect
diff --git a/hphp/test/tcr/traits/2047.php b/hphp/test/slow/traits/2047.php
similarity index 100%
rename from hphp/test/tcr/traits/2047.php
rename to hphp/test/slow/traits/2047.php
diff --git a/hphp/test/tcr/traits/2047.php.expect b/hphp/test/slow/traits/2047.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2047.php.expect
rename to hphp/test/slow/traits/2047.php.expect
diff --git a/hphp/test/tcr/traits/2048.php b/hphp/test/slow/traits/2048.php
similarity index 100%
rename from hphp/test/tcr/traits/2048.php
rename to hphp/test/slow/traits/2048.php
diff --git a/hphp/test/tcr/traits/2048.php.expect b/hphp/test/slow/traits/2048.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2048.php.expect
rename to hphp/test/slow/traits/2048.php.expect
diff --git a/hphp/test/tcr/traits/2049.php b/hphp/test/slow/traits/2049.php
similarity index 100%
rename from hphp/test/tcr/traits/2049.php
rename to hphp/test/slow/traits/2049.php
diff --git a/hphp/test/tcr/traits/2049.php.expect b/hphp/test/slow/traits/2049.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2049.php.expect
rename to hphp/test/slow/traits/2049.php.expect
diff --git a/hphp/test/tcr/traits/2050.php b/hphp/test/slow/traits/2050.php
similarity index 100%
rename from hphp/test/tcr/traits/2050.php
rename to hphp/test/slow/traits/2050.php
diff --git a/hphp/test/tcr/traits/2050.php.expect b/hphp/test/slow/traits/2050.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2050.php.expect
rename to hphp/test/slow/traits/2050.php.expect
diff --git a/hphp/test/tcr/traits/2051.php b/hphp/test/slow/traits/2051.php
similarity index 100%
rename from hphp/test/tcr/traits/2051.php
rename to hphp/test/slow/traits/2051.php
diff --git a/hphp/test/tcr/traits/2051.php.expect b/hphp/test/slow/traits/2051.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2051.php.expect
rename to hphp/test/slow/traits/2051.php.expect
diff --git a/hphp/test/tcr/traits/2052.php b/hphp/test/slow/traits/2052.php
similarity index 100%
rename from hphp/test/tcr/traits/2052.php
rename to hphp/test/slow/traits/2052.php
diff --git a/hphp/test/tcr/traits/2052.php.expect b/hphp/test/slow/traits/2052.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2052.php.expect
rename to hphp/test/slow/traits/2052.php.expect
diff --git a/hphp/test/tcr/traits/2053.php b/hphp/test/slow/traits/2053.php
similarity index 100%
rename from hphp/test/tcr/traits/2053.php
rename to hphp/test/slow/traits/2053.php
diff --git a/hphp/test/tcr/traits/2053.php.expect b/hphp/test/slow/traits/2053.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2053.php.expect
rename to hphp/test/slow/traits/2053.php.expect
diff --git a/hphp/test/tcr/traits/2054.php b/hphp/test/slow/traits/2054.php
similarity index 100%
rename from hphp/test/tcr/traits/2054.php
rename to hphp/test/slow/traits/2054.php
diff --git a/hphp/test/tcr/traits/2054.php.expect b/hphp/test/slow/traits/2054.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2054.php.expect
rename to hphp/test/slow/traits/2054.php.expect
diff --git a/hphp/test/tcr/traits/2055.php b/hphp/test/slow/traits/2055.php
similarity index 100%
rename from hphp/test/tcr/traits/2055.php
rename to hphp/test/slow/traits/2055.php
diff --git a/hphp/test/tcr/traits/2055.php.expect b/hphp/test/slow/traits/2055.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2055.php.expect
rename to hphp/test/slow/traits/2055.php.expect
diff --git a/hphp/test/tcr/traits/2056.php b/hphp/test/slow/traits/2056.php
similarity index 100%
rename from hphp/test/tcr/traits/2056.php
rename to hphp/test/slow/traits/2056.php
diff --git a/hphp/test/tcr/traits/2056.php.expect b/hphp/test/slow/traits/2056.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2056.php.expect
rename to hphp/test/slow/traits/2056.php.expect
diff --git a/hphp/test/tcr/traits/2057.php b/hphp/test/slow/traits/2057.php
similarity index 100%
rename from hphp/test/tcr/traits/2057.php
rename to hphp/test/slow/traits/2057.php
diff --git a/hphp/test/tcr/traits/2057.php.expect b/hphp/test/slow/traits/2057.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2057.php.expect
rename to hphp/test/slow/traits/2057.php.expect
diff --git a/hphp/test/tcr/traits/2058.php b/hphp/test/slow/traits/2058.php
similarity index 100%
rename from hphp/test/tcr/traits/2058.php
rename to hphp/test/slow/traits/2058.php
diff --git a/hphp/test/tcr/traits/2058.php.expect b/hphp/test/slow/traits/2058.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2058.php.expect
rename to hphp/test/slow/traits/2058.php.expect
diff --git a/hphp/test/tcr/traits/2059.php b/hphp/test/slow/traits/2059.php
similarity index 100%
rename from hphp/test/tcr/traits/2059.php
rename to hphp/test/slow/traits/2059.php
diff --git a/hphp/test/tcr/traits/2059.php.expect b/hphp/test/slow/traits/2059.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2059.php.expect
rename to hphp/test/slow/traits/2059.php.expect
diff --git a/hphp/test/tcr/traits/2060.php b/hphp/test/slow/traits/2060.php
similarity index 100%
rename from hphp/test/tcr/traits/2060.php
rename to hphp/test/slow/traits/2060.php
diff --git a/hphp/test/tcr/traits/2060.php.expect b/hphp/test/slow/traits/2060.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2060.php.expect
rename to hphp/test/slow/traits/2060.php.expect
diff --git a/hphp/test/tcr/traits/2061.php b/hphp/test/slow/traits/2061.php
similarity index 100%
rename from hphp/test/tcr/traits/2061.php
rename to hphp/test/slow/traits/2061.php
diff --git a/hphp/test/tcr/traits/2061.php.expect b/hphp/test/slow/traits/2061.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2061.php.expect
rename to hphp/test/slow/traits/2061.php.expect
diff --git a/hphp/test/tcr/traits/2062.php b/hphp/test/slow/traits/2062.php
similarity index 100%
rename from hphp/test/tcr/traits/2062.php
rename to hphp/test/slow/traits/2062.php
diff --git a/hphp/test/tcr/traits/2062.php.expect b/hphp/test/slow/traits/2062.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2062.php.expect
rename to hphp/test/slow/traits/2062.php.expect
diff --git a/hphp/test/tcr/traits/2063.php b/hphp/test/slow/traits/2063.php
similarity index 100%
rename from hphp/test/tcr/traits/2063.php
rename to hphp/test/slow/traits/2063.php
diff --git a/hphp/test/tcr/traits/2063.php.expect b/hphp/test/slow/traits/2063.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2063.php.expect
rename to hphp/test/slow/traits/2063.php.expect
diff --git a/hphp/test/tcr/traits/2064.php b/hphp/test/slow/traits/2064.php
similarity index 100%
rename from hphp/test/tcr/traits/2064.php
rename to hphp/test/slow/traits/2064.php
diff --git a/hphp/test/tcr/traits/2064.php.expect b/hphp/test/slow/traits/2064.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2064.php.expect
rename to hphp/test/slow/traits/2064.php.expect
diff --git a/hphp/test/tcr/traits/2065.php b/hphp/test/slow/traits/2065.php
similarity index 100%
rename from hphp/test/tcr/traits/2065.php
rename to hphp/test/slow/traits/2065.php
diff --git a/hphp/test/tcr/traits/2065.php.expect b/hphp/test/slow/traits/2065.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2065.php.expect
rename to hphp/test/slow/traits/2065.php.expect
diff --git a/hphp/test/tcr/traits/2066.php b/hphp/test/slow/traits/2066.php
similarity index 100%
rename from hphp/test/tcr/traits/2066.php
rename to hphp/test/slow/traits/2066.php
diff --git a/hphp/test/tcr/traits/2066.php.expect b/hphp/test/slow/traits/2066.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2066.php.expect
rename to hphp/test/slow/traits/2066.php.expect
diff --git a/hphp/test/tcr/traits/2066.php.hphp_opts b/hphp/test/slow/traits/2066.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2066.php.hphp_opts
rename to hphp/test/slow/traits/2066.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2066.php.opts b/hphp/test/slow/traits/2066.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2066.php.opts
rename to hphp/test/slow/traits/2066.php.opts
diff --git a/hphp/test/tcr/traits/2067.php b/hphp/test/slow/traits/2067.php
similarity index 100%
rename from hphp/test/tcr/traits/2067.php
rename to hphp/test/slow/traits/2067.php
diff --git a/hphp/test/tcr/traits/2067.php.expect b/hphp/test/slow/traits/2067.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2067.php.expect
rename to hphp/test/slow/traits/2067.php.expect
diff --git a/hphp/test/tcr/traits/2067.php.hphp_opts b/hphp/test/slow/traits/2067.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2067.php.hphp_opts
rename to hphp/test/slow/traits/2067.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2067.php.opts b/hphp/test/slow/traits/2067.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2067.php.opts
rename to hphp/test/slow/traits/2067.php.opts
diff --git a/hphp/test/tcr/traits/2068.php b/hphp/test/slow/traits/2068.php
similarity index 100%
rename from hphp/test/tcr/traits/2068.php
rename to hphp/test/slow/traits/2068.php
diff --git a/hphp/test/tcr/traits/2068.php.expect b/hphp/test/slow/traits/2068.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2068.php.expect
rename to hphp/test/slow/traits/2068.php.expect
diff --git a/hphp/test/tcr/traits/2068.php.hphp_opts b/hphp/test/slow/traits/2068.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2068.php.hphp_opts
rename to hphp/test/slow/traits/2068.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2068.php.opts b/hphp/test/slow/traits/2068.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2068.php.opts
rename to hphp/test/slow/traits/2068.php.opts
diff --git a/hphp/test/tcr/traits/2069.php b/hphp/test/slow/traits/2069.php
similarity index 100%
rename from hphp/test/tcr/traits/2069.php
rename to hphp/test/slow/traits/2069.php
diff --git a/hphp/test/tcr/traits/2069.php.expect b/hphp/test/slow/traits/2069.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2069.php.expect
rename to hphp/test/slow/traits/2069.php.expect
diff --git a/hphp/test/tcr/traits/2069.php.hphp_opts b/hphp/test/slow/traits/2069.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2069.php.hphp_opts
rename to hphp/test/slow/traits/2069.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2069.php.opts b/hphp/test/slow/traits/2069.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2069.php.opts
rename to hphp/test/slow/traits/2069.php.opts
diff --git a/hphp/test/tcr/traits/2070.php b/hphp/test/slow/traits/2070.php
similarity index 100%
rename from hphp/test/tcr/traits/2070.php
rename to hphp/test/slow/traits/2070.php
diff --git a/hphp/test/tcr/traits/2070.php.expect b/hphp/test/slow/traits/2070.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2070.php.expect
rename to hphp/test/slow/traits/2070.php.expect
diff --git a/hphp/test/tcr/traits/2070.php.hphp_opts b/hphp/test/slow/traits/2070.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2070.php.hphp_opts
rename to hphp/test/slow/traits/2070.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2070.php.opts b/hphp/test/slow/traits/2070.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2070.php.opts
rename to hphp/test/slow/traits/2070.php.opts
diff --git a/hphp/test/tcr/traits/2071.php b/hphp/test/slow/traits/2071.php
similarity index 100%
rename from hphp/test/tcr/traits/2071.php
rename to hphp/test/slow/traits/2071.php
diff --git a/hphp/test/tcr/traits/2071.php.expect b/hphp/test/slow/traits/2071.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2071.php.expect
rename to hphp/test/slow/traits/2071.php.expect
diff --git a/hphp/test/tcr/traits/2071.php.hphp_opts b/hphp/test/slow/traits/2071.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2071.php.hphp_opts
rename to hphp/test/slow/traits/2071.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2071.php.opts b/hphp/test/slow/traits/2071.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2071.php.opts
rename to hphp/test/slow/traits/2071.php.opts
diff --git a/hphp/test/tcr/traits/2072.php b/hphp/test/slow/traits/2072.php
similarity index 100%
rename from hphp/test/tcr/traits/2072.php
rename to hphp/test/slow/traits/2072.php
diff --git a/hphp/test/tcr/traits/2072.php.expect b/hphp/test/slow/traits/2072.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2072.php.expect
rename to hphp/test/slow/traits/2072.php.expect
diff --git a/hphp/test/tcr/traits/2072.php.hphp_opts b/hphp/test/slow/traits/2072.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2072.php.hphp_opts
rename to hphp/test/slow/traits/2072.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2072.php.opts b/hphp/test/slow/traits/2072.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2072.php.opts
rename to hphp/test/slow/traits/2072.php.opts
diff --git a/hphp/test/tcr/traits/2073.php b/hphp/test/slow/traits/2073.php
similarity index 100%
rename from hphp/test/tcr/traits/2073.php
rename to hphp/test/slow/traits/2073.php
diff --git a/hphp/test/tcr/traits/2073.php.expect b/hphp/test/slow/traits/2073.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2073.php.expect
rename to hphp/test/slow/traits/2073.php.expect
diff --git a/hphp/test/tcr/traits/2073.php.hphp_opts b/hphp/test/slow/traits/2073.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2073.php.hphp_opts
rename to hphp/test/slow/traits/2073.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2073.php.opts b/hphp/test/slow/traits/2073.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2073.php.opts
rename to hphp/test/slow/traits/2073.php.opts
diff --git a/hphp/test/tcr/traits/2074.php b/hphp/test/slow/traits/2074.php
similarity index 100%
rename from hphp/test/tcr/traits/2074.php
rename to hphp/test/slow/traits/2074.php
diff --git a/hphp/test/tcr/traits/2074.php.expect b/hphp/test/slow/traits/2074.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2074.php.expect
rename to hphp/test/slow/traits/2074.php.expect
diff --git a/hphp/test/tcr/traits/2074.php.hphp_opts b/hphp/test/slow/traits/2074.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2074.php.hphp_opts
rename to hphp/test/slow/traits/2074.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2074.php.opts b/hphp/test/slow/traits/2074.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2074.php.opts
rename to hphp/test/slow/traits/2074.php.opts
diff --git a/hphp/test/tcr/traits/2075.php b/hphp/test/slow/traits/2075.php
similarity index 100%
rename from hphp/test/tcr/traits/2075.php
rename to hphp/test/slow/traits/2075.php
diff --git a/hphp/test/tcr/traits/2075.php.expect b/hphp/test/slow/traits/2075.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2075.php.expect
rename to hphp/test/slow/traits/2075.php.expect
diff --git a/hphp/test/tcr/traits/2075.php.hphp_opts b/hphp/test/slow/traits/2075.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2075.php.hphp_opts
rename to hphp/test/slow/traits/2075.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2075.php.opts b/hphp/test/slow/traits/2075.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2075.php.opts
rename to hphp/test/slow/traits/2075.php.opts
diff --git a/hphp/test/tcr/traits/2076.php b/hphp/test/slow/traits/2076.php
similarity index 100%
rename from hphp/test/tcr/traits/2076.php
rename to hphp/test/slow/traits/2076.php
diff --git a/hphp/test/tcr/traits/2076.php.expect b/hphp/test/slow/traits/2076.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2076.php.expect
rename to hphp/test/slow/traits/2076.php.expect
diff --git a/hphp/test/tcr/traits/2076.php.hphp_opts b/hphp/test/slow/traits/2076.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2076.php.hphp_opts
rename to hphp/test/slow/traits/2076.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2076.php.opts b/hphp/test/slow/traits/2076.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2076.php.opts
rename to hphp/test/slow/traits/2076.php.opts
diff --git a/hphp/test/tcr/traits/2077.php b/hphp/test/slow/traits/2077.php
similarity index 100%
rename from hphp/test/tcr/traits/2077.php
rename to hphp/test/slow/traits/2077.php
diff --git a/hphp/test/vm/typedef_mixed_case.php.expect b/hphp/test/slow/traits/2077.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_mixed_case.php.expect
rename to hphp/test/slow/traits/2077.php.expect
diff --git a/hphp/test/tcr/traits/2077.php.hphp_opts b/hphp/test/slow/traits/2077.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2077.php.hphp_opts
rename to hphp/test/slow/traits/2077.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2077.php.opts b/hphp/test/slow/traits/2077.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2077.php.opts
rename to hphp/test/slow/traits/2077.php.opts
diff --git a/hphp/test/tcr/traits/2078.php b/hphp/test/slow/traits/2078.php
similarity index 100%
rename from hphp/test/tcr/traits/2078.php
rename to hphp/test/slow/traits/2078.php
diff --git a/hphp/test/tcr/traits/2078.php.expect b/hphp/test/slow/traits/2078.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2078.php.expect
rename to hphp/test/slow/traits/2078.php.expect
diff --git a/hphp/test/tcr/traits/2078.php.hphp_opts b/hphp/test/slow/traits/2078.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2078.php.hphp_opts
rename to hphp/test/slow/traits/2078.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2078.php.opts b/hphp/test/slow/traits/2078.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2078.php.opts
rename to hphp/test/slow/traits/2078.php.opts
diff --git a/hphp/test/tcr/traits/2079.php b/hphp/test/slow/traits/2079.php
similarity index 100%
rename from hphp/test/tcr/traits/2079.php
rename to hphp/test/slow/traits/2079.php
diff --git a/hphp/test/tcr/traits/2079.php.expect b/hphp/test/slow/traits/2079.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2079.php.expect
rename to hphp/test/slow/traits/2079.php.expect
diff --git a/hphp/test/tcr/traits/2079.php.hphp_opts b/hphp/test/slow/traits/2079.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2079.php.hphp_opts
rename to hphp/test/slow/traits/2079.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2079.php.opts b/hphp/test/slow/traits/2079.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2079.php.opts
rename to hphp/test/slow/traits/2079.php.opts
diff --git a/hphp/test/tcr/traits/2080.php b/hphp/test/slow/traits/2080.php
similarity index 100%
rename from hphp/test/tcr/traits/2080.php
rename to hphp/test/slow/traits/2080.php
diff --git a/hphp/test/tcr/traits/2080.php.expect b/hphp/test/slow/traits/2080.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2080.php.expect
rename to hphp/test/slow/traits/2080.php.expect
diff --git a/hphp/test/tcr/traits/2080.php.hphp_opts b/hphp/test/slow/traits/2080.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2080.php.hphp_opts
rename to hphp/test/slow/traits/2080.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2080.php.opts b/hphp/test/slow/traits/2080.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2080.php.opts
rename to hphp/test/slow/traits/2080.php.opts
diff --git a/hphp/test/tcr/traits/2081.php b/hphp/test/slow/traits/2081.php
similarity index 100%
rename from hphp/test/tcr/traits/2081.php
rename to hphp/test/slow/traits/2081.php
diff --git a/hphp/test/tcr/traits/2081.php.expect b/hphp/test/slow/traits/2081.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2081.php.expect
rename to hphp/test/slow/traits/2081.php.expect
diff --git a/hphp/test/tcr/traits/2081.php.hphp_opts b/hphp/test/slow/traits/2081.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/traits/2081.php.hphp_opts
rename to hphp/test/slow/traits/2081.php.hphp_opts
diff --git a/hphp/test/tcr/traits/2081.php.opts b/hphp/test/slow/traits/2081.php.opts
similarity index 100%
rename from hphp/test/tcr/traits/2081.php.opts
rename to hphp/test/slow/traits/2081.php.opts
diff --git a/hphp/test/tcr/traits/2082.php b/hphp/test/slow/traits/2082.php
similarity index 100%
rename from hphp/test/tcr/traits/2082.php
rename to hphp/test/slow/traits/2082.php
diff --git a/hphp/test/tcr/traits/2082.php.expect b/hphp/test/slow/traits/2082.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2082.php.expect
rename to hphp/test/slow/traits/2082.php.expect
diff --git a/hphp/test/tcr/traits/2083.php b/hphp/test/slow/traits/2083.php
similarity index 100%
rename from hphp/test/tcr/traits/2083.php
rename to hphp/test/slow/traits/2083.php
diff --git a/hphp/test/tcr/traits/2083.php.expect b/hphp/test/slow/traits/2083.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2083.php.expect
rename to hphp/test/slow/traits/2083.php.expect
diff --git a/hphp/test/tcr/traits/2084.php b/hphp/test/slow/traits/2084.php
similarity index 100%
rename from hphp/test/tcr/traits/2084.php
rename to hphp/test/slow/traits/2084.php
diff --git a/hphp/test/tcr/traits/2084.php.expect b/hphp/test/slow/traits/2084.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2084.php.expect
rename to hphp/test/slow/traits/2084.php.expect
diff --git a/hphp/test/tcr/traits/2085.php b/hphp/test/slow/traits/2085.php
similarity index 100%
rename from hphp/test/tcr/traits/2085.php
rename to hphp/test/slow/traits/2085.php
diff --git a/hphp/test/tcr/traits/2085.php.expect b/hphp/test/slow/traits/2085.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2085.php.expect
rename to hphp/test/slow/traits/2085.php.expect
diff --git a/hphp/test/tcr/traits/2086.php b/hphp/test/slow/traits/2086.php
similarity index 100%
rename from hphp/test/tcr/traits/2086.php
rename to hphp/test/slow/traits/2086.php
diff --git a/hphp/test/tcr/traits/2086.php.expect b/hphp/test/slow/traits/2086.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2086.php.expect
rename to hphp/test/slow/traits/2086.php.expect
diff --git a/hphp/test/tcr/traits/2087.php b/hphp/test/slow/traits/2087.php
similarity index 100%
rename from hphp/test/tcr/traits/2087.php
rename to hphp/test/slow/traits/2087.php
diff --git a/hphp/test/tcr/traits/2087.php.expect b/hphp/test/slow/traits/2087.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2087.php.expect
rename to hphp/test/slow/traits/2087.php.expect
diff --git a/hphp/test/tcr/traits/2088.php b/hphp/test/slow/traits/2088.php
similarity index 100%
rename from hphp/test/tcr/traits/2088.php
rename to hphp/test/slow/traits/2088.php
diff --git a/hphp/test/tcr/traits/2088.php.expect b/hphp/test/slow/traits/2088.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2088.php.expect
rename to hphp/test/slow/traits/2088.php.expect
diff --git a/hphp/test/tcr/traits/2089.php b/hphp/test/slow/traits/2089.php
similarity index 100%
rename from hphp/test/tcr/traits/2089.php
rename to hphp/test/slow/traits/2089.php
diff --git a/hphp/test/tcr/traits/2089.php.expect b/hphp/test/slow/traits/2089.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2089.php.expect
rename to hphp/test/slow/traits/2089.php.expect
diff --git a/hphp/test/tcr/traits/2090.php b/hphp/test/slow/traits/2090.php
similarity index 100%
rename from hphp/test/tcr/traits/2090.php
rename to hphp/test/slow/traits/2090.php
diff --git a/hphp/test/tcr/traits/2090.php.expect b/hphp/test/slow/traits/2090.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2090.php.expect
rename to hphp/test/slow/traits/2090.php.expect
diff --git a/hphp/test/tcr/traits/2091.php b/hphp/test/slow/traits/2091.php
similarity index 100%
rename from hphp/test/tcr/traits/2091.php
rename to hphp/test/slow/traits/2091.php
diff --git a/hphp/test/tcr/traits/2091.php.expect b/hphp/test/slow/traits/2091.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2091.php.expect
rename to hphp/test/slow/traits/2091.php.expect
diff --git a/hphp/test/tcr/traits/2092.php b/hphp/test/slow/traits/2092.php
similarity index 100%
rename from hphp/test/tcr/traits/2092.php
rename to hphp/test/slow/traits/2092.php
diff --git a/hphp/test/tcr/traits/2092.php.expect b/hphp/test/slow/traits/2092.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2092.php.expect
rename to hphp/test/slow/traits/2092.php.expect
diff --git a/hphp/test/tcr/traits/2093.php b/hphp/test/slow/traits/2093.php
similarity index 100%
rename from hphp/test/tcr/traits/2093.php
rename to hphp/test/slow/traits/2093.php
diff --git a/hphp/test/tcr/traits/2093.php.expect b/hphp/test/slow/traits/2093.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2093.php.expect
rename to hphp/test/slow/traits/2093.php.expect
diff --git a/hphp/test/tcr/traits/2094.php b/hphp/test/slow/traits/2094.php
similarity index 100%
rename from hphp/test/tcr/traits/2094.php
rename to hphp/test/slow/traits/2094.php
diff --git a/hphp/test/tcr/traits/2094.php.expect b/hphp/test/slow/traits/2094.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2094.php.expect
rename to hphp/test/slow/traits/2094.php.expect
diff --git a/hphp/test/tcr/traits/2095.php b/hphp/test/slow/traits/2095.php
similarity index 100%
rename from hphp/test/tcr/traits/2095.php
rename to hphp/test/slow/traits/2095.php
diff --git a/hphp/test/tcr/traits/2095.php.expect b/hphp/test/slow/traits/2095.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2095.php.expect
rename to hphp/test/slow/traits/2095.php.expect
diff --git a/hphp/test/tcr/traits/2096.php b/hphp/test/slow/traits/2096.php
similarity index 100%
rename from hphp/test/tcr/traits/2096.php
rename to hphp/test/slow/traits/2096.php
diff --git a/hphp/test/tcr/traits/2096.php.expect b/hphp/test/slow/traits/2096.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2096.php.expect
rename to hphp/test/slow/traits/2096.php.expect
diff --git a/hphp/test/tcr/traits/2097.php b/hphp/test/slow/traits/2097.php
similarity index 100%
rename from hphp/test/tcr/traits/2097.php
rename to hphp/test/slow/traits/2097.php
diff --git a/hphp/test/tcr/traits/2097.php.expect b/hphp/test/slow/traits/2097.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2097.php.expect
rename to hphp/test/slow/traits/2097.php.expect
diff --git a/hphp/test/tcr/traits/2098.php b/hphp/test/slow/traits/2098.php
similarity index 100%
rename from hphp/test/tcr/traits/2098.php
rename to hphp/test/slow/traits/2098.php
diff --git a/hphp/test/tcr/traits/2098.php.expect b/hphp/test/slow/traits/2098.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2098.php.expect
rename to hphp/test/slow/traits/2098.php.expect
diff --git a/hphp/test/tcr/traits/2099.php b/hphp/test/slow/traits/2099.php
similarity index 100%
rename from hphp/test/tcr/traits/2099.php
rename to hphp/test/slow/traits/2099.php
diff --git a/hphp/test/tcr/traits/2099.php.expect b/hphp/test/slow/traits/2099.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2099.php.expect
rename to hphp/test/slow/traits/2099.php.expect
diff --git a/hphp/test/tcr/traits/2100.php b/hphp/test/slow/traits/2100.php
similarity index 100%
rename from hphp/test/tcr/traits/2100.php
rename to hphp/test/slow/traits/2100.php
diff --git a/hphp/test/tcr/traits/2100.php.expect b/hphp/test/slow/traits/2100.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2100.php.expect
rename to hphp/test/slow/traits/2100.php.expect
diff --git a/hphp/test/tcr/traits/2101.php b/hphp/test/slow/traits/2101.php
similarity index 100%
rename from hphp/test/tcr/traits/2101.php
rename to hphp/test/slow/traits/2101.php
diff --git a/hphp/test/tcr/traits/2101.php.expect b/hphp/test/slow/traits/2101.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2101.php.expect
rename to hphp/test/slow/traits/2101.php.expect
diff --git a/hphp/test/tcr/traits/2102.php b/hphp/test/slow/traits/2102.php
similarity index 100%
rename from hphp/test/tcr/traits/2102.php
rename to hphp/test/slow/traits/2102.php
diff --git a/hphp/test/tcr/traits/2102.php.expect b/hphp/test/slow/traits/2102.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2102.php.expect
rename to hphp/test/slow/traits/2102.php.expect
diff --git a/hphp/test/tcr/traits/2103.php b/hphp/test/slow/traits/2103.php
similarity index 100%
rename from hphp/test/tcr/traits/2103.php
rename to hphp/test/slow/traits/2103.php
diff --git a/hphp/test/tcr/traits/2103.php.expect b/hphp/test/slow/traits/2103.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2103.php.expect
rename to hphp/test/slow/traits/2103.php.expect
diff --git a/hphp/test/tcr/traits/2104.php b/hphp/test/slow/traits/2104.php
similarity index 100%
rename from hphp/test/tcr/traits/2104.php
rename to hphp/test/slow/traits/2104.php
diff --git a/hphp/test/tcr/traits/2104.php.expect b/hphp/test/slow/traits/2104.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2104.php.expect
rename to hphp/test/slow/traits/2104.php.expect
diff --git a/hphp/test/tcr/traits/2105.php b/hphp/test/slow/traits/2105.php
similarity index 100%
rename from hphp/test/tcr/traits/2105.php
rename to hphp/test/slow/traits/2105.php
diff --git a/hphp/test/tcr/traits/2105.php.expect b/hphp/test/slow/traits/2105.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2105.php.expect
rename to hphp/test/slow/traits/2105.php.expect
diff --git a/hphp/test/tcr/traits/2106.php b/hphp/test/slow/traits/2106.php
similarity index 100%
rename from hphp/test/tcr/traits/2106.php
rename to hphp/test/slow/traits/2106.php
diff --git a/hphp/test/tcr/traits/2106.php.expect b/hphp/test/slow/traits/2106.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2106.php.expect
rename to hphp/test/slow/traits/2106.php.expect
diff --git a/hphp/test/tcr/traits/2107.php b/hphp/test/slow/traits/2107.php
similarity index 100%
rename from hphp/test/tcr/traits/2107.php
rename to hphp/test/slow/traits/2107.php
diff --git a/hphp/test/tcr/traits/2107.php.expect b/hphp/test/slow/traits/2107.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2107.php.expect
rename to hphp/test/slow/traits/2107.php.expect
diff --git a/hphp/test/tcr/traits/2108.php b/hphp/test/slow/traits/2108.php
similarity index 100%
rename from hphp/test/tcr/traits/2108.php
rename to hphp/test/slow/traits/2108.php
diff --git a/hphp/test/tcr/traits/2108.php.expect b/hphp/test/slow/traits/2108.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2108.php.expect
rename to hphp/test/slow/traits/2108.php.expect
diff --git a/hphp/test/tcr/traits/2109.php b/hphp/test/slow/traits/2109.php
similarity index 100%
rename from hphp/test/tcr/traits/2109.php
rename to hphp/test/slow/traits/2109.php
diff --git a/hphp/test/tcr/traits/2109.php.expect b/hphp/test/slow/traits/2109.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2109.php.expect
rename to hphp/test/slow/traits/2109.php.expect
diff --git a/hphp/test/tcr/traits/2110.php b/hphp/test/slow/traits/2110.php
similarity index 100%
rename from hphp/test/tcr/traits/2110.php
rename to hphp/test/slow/traits/2110.php
diff --git a/hphp/test/tcr/traits/2110.php.expect b/hphp/test/slow/traits/2110.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2110.php.expect
rename to hphp/test/slow/traits/2110.php.expect
diff --git a/hphp/test/tcr/traits/2111.php b/hphp/test/slow/traits/2111.php
similarity index 100%
rename from hphp/test/tcr/traits/2111.php
rename to hphp/test/slow/traits/2111.php
diff --git a/hphp/test/tcr/traits/2111.php.expect b/hphp/test/slow/traits/2111.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2111.php.expect
rename to hphp/test/slow/traits/2111.php.expect
diff --git a/hphp/test/tcr/traits/2112.php b/hphp/test/slow/traits/2112.php
similarity index 100%
rename from hphp/test/tcr/traits/2112.php
rename to hphp/test/slow/traits/2112.php
diff --git a/hphp/test/tcr/traits/2112.php.expect b/hphp/test/slow/traits/2112.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2112.php.expect
rename to hphp/test/slow/traits/2112.php.expect
diff --git a/hphp/test/tcr/traits/2113.php b/hphp/test/slow/traits/2113.php
similarity index 100%
rename from hphp/test/tcr/traits/2113.php
rename to hphp/test/slow/traits/2113.php
diff --git a/hphp/test/tcr/traits/2113.php.expect b/hphp/test/slow/traits/2113.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2113.php.expect
rename to hphp/test/slow/traits/2113.php.expect
diff --git a/hphp/test/tcr/traits/2114.php b/hphp/test/slow/traits/2114.php
similarity index 100%
rename from hphp/test/tcr/traits/2114.php
rename to hphp/test/slow/traits/2114.php
diff --git a/hphp/test/tcr/traits/2114.php.expect b/hphp/test/slow/traits/2114.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2114.php.expect
rename to hphp/test/slow/traits/2114.php.expect
diff --git a/hphp/test/tcr/traits/2115.php b/hphp/test/slow/traits/2115.php
similarity index 100%
rename from hphp/test/tcr/traits/2115.php
rename to hphp/test/slow/traits/2115.php
diff --git a/hphp/test/tcr/traits/2115.php.expect b/hphp/test/slow/traits/2115.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2115.php.expect
rename to hphp/test/slow/traits/2115.php.expect
diff --git a/hphp/test/tcr/traits/2116.php b/hphp/test/slow/traits/2116.php
similarity index 100%
rename from hphp/test/tcr/traits/2116.php
rename to hphp/test/slow/traits/2116.php
diff --git a/hphp/test/tcr/traits/2116.php.expect b/hphp/test/slow/traits/2116.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2116.php.expect
rename to hphp/test/slow/traits/2116.php.expect
diff --git a/hphp/test/tcr/traits/2117.php b/hphp/test/slow/traits/2117.php
similarity index 100%
rename from hphp/test/tcr/traits/2117.php
rename to hphp/test/slow/traits/2117.php
diff --git a/hphp/test/tcr/traits/2117.php.expect b/hphp/test/slow/traits/2117.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2117.php.expect
rename to hphp/test/slow/traits/2117.php.expect
diff --git a/hphp/test/tcr/traits/2118.php b/hphp/test/slow/traits/2118.php
similarity index 100%
rename from hphp/test/tcr/traits/2118.php
rename to hphp/test/slow/traits/2118.php
diff --git a/hphp/test/tcr/traits/2118.php.expect b/hphp/test/slow/traits/2118.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2118.php.expect
rename to hphp/test/slow/traits/2118.php.expect
diff --git a/hphp/test/tcr/traits/2119.php b/hphp/test/slow/traits/2119.php
similarity index 100%
rename from hphp/test/tcr/traits/2119.php
rename to hphp/test/slow/traits/2119.php
diff --git a/hphp/test/tcr/traits/2119.php.expect b/hphp/test/slow/traits/2119.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2119.php.expect
rename to hphp/test/slow/traits/2119.php.expect
diff --git a/hphp/test/tcr/traits/2120.php b/hphp/test/slow/traits/2120.php
similarity index 100%
rename from hphp/test/tcr/traits/2120.php
rename to hphp/test/slow/traits/2120.php
diff --git a/hphp/test/tcr/traits/2120.php.expect b/hphp/test/slow/traits/2120.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2120.php.expect
rename to hphp/test/slow/traits/2120.php.expect
diff --git a/hphp/test/tcr/traits/2121.php b/hphp/test/slow/traits/2121.php
similarity index 100%
rename from hphp/test/tcr/traits/2121.php
rename to hphp/test/slow/traits/2121.php
diff --git a/hphp/test/tcr/traits/2121.php.expect b/hphp/test/slow/traits/2121.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2121.php.expect
rename to hphp/test/slow/traits/2121.php.expect
diff --git a/hphp/test/tcr/traits/2122.php b/hphp/test/slow/traits/2122.php
similarity index 100%
rename from hphp/test/tcr/traits/2122.php
rename to hphp/test/slow/traits/2122.php
diff --git a/hphp/test/tcr/traits/2122.php.expect b/hphp/test/slow/traits/2122.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2122.php.expect
rename to hphp/test/slow/traits/2122.php.expect
diff --git a/hphp/test/tcr/traits/2123.php b/hphp/test/slow/traits/2123.php
similarity index 100%
rename from hphp/test/tcr/traits/2123.php
rename to hphp/test/slow/traits/2123.php
diff --git a/hphp/test/tcr/traits/2123.php.expect b/hphp/test/slow/traits/2123.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2123.php.expect
rename to hphp/test/slow/traits/2123.php.expect
diff --git a/hphp/test/tcr/traits/2124.php b/hphp/test/slow/traits/2124.php
similarity index 100%
rename from hphp/test/tcr/traits/2124.php
rename to hphp/test/slow/traits/2124.php
diff --git a/hphp/test/tcr/traits/2124.php.expect b/hphp/test/slow/traits/2124.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2124.php.expect
rename to hphp/test/slow/traits/2124.php.expect
diff --git a/hphp/test/tcr/traits/2125.php b/hphp/test/slow/traits/2125.php
similarity index 100%
rename from hphp/test/tcr/traits/2125.php
rename to hphp/test/slow/traits/2125.php
diff --git a/hphp/test/tcr/traits/2125.php.expect b/hphp/test/slow/traits/2125.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2125.php.expect
rename to hphp/test/slow/traits/2125.php.expect
diff --git a/hphp/test/tcr/traits/2126.php b/hphp/test/slow/traits/2126.php
similarity index 100%
rename from hphp/test/tcr/traits/2126.php
rename to hphp/test/slow/traits/2126.php
diff --git a/hphp/test/tcr/traits/2126.php.expect b/hphp/test/slow/traits/2126.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2126.php.expect
rename to hphp/test/slow/traits/2126.php.expect
diff --git a/hphp/test/tcr/traits/2127.php b/hphp/test/slow/traits/2127.php
similarity index 100%
rename from hphp/test/tcr/traits/2127.php
rename to hphp/test/slow/traits/2127.php
diff --git a/hphp/test/tcr/traits/2127.php.expect b/hphp/test/slow/traits/2127.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2127.php.expect
rename to hphp/test/slow/traits/2127.php.expect
diff --git a/hphp/test/tcr/traits/2128.php b/hphp/test/slow/traits/2128.php
similarity index 100%
rename from hphp/test/tcr/traits/2128.php
rename to hphp/test/slow/traits/2128.php
diff --git a/hphp/test/tcr/traits/2128.php.expect b/hphp/test/slow/traits/2128.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2128.php.expect
rename to hphp/test/slow/traits/2128.php.expect
diff --git a/hphp/test/tcr/traits/2129.php b/hphp/test/slow/traits/2129.php
similarity index 100%
rename from hphp/test/tcr/traits/2129.php
rename to hphp/test/slow/traits/2129.php
diff --git a/hphp/test/tcr/traits/2129.php.expect b/hphp/test/slow/traits/2129.php.expect
similarity index 100%
rename from hphp/test/tcr/traits/2129.php.expect
rename to hphp/test/slow/traits/2129.php.expect
diff --git a/hphp/test/tcr/type_assertions/1853.php b/hphp/test/slow/type_assertions/1853.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1853.php
rename to hphp/test/slow/type_assertions/1853.php
diff --git a/hphp/test/tcr/type_assertions/1853.php.expect b/hphp/test/slow/type_assertions/1853.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1853.php.expect
rename to hphp/test/slow/type_assertions/1853.php.expect
diff --git a/hphp/test/tcr/type_assertions/1854.php b/hphp/test/slow/type_assertions/1854.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1854.php
rename to hphp/test/slow/type_assertions/1854.php
diff --git a/hphp/test/tcr/type_assertions/1854.php.expect b/hphp/test/slow/type_assertions/1854.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1854.php.expect
rename to hphp/test/slow/type_assertions/1854.php.expect
diff --git a/hphp/test/tcr/type_assertions/1855.php b/hphp/test/slow/type_assertions/1855.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1855.php
rename to hphp/test/slow/type_assertions/1855.php
diff --git a/hphp/test/tcr/type_assertions/1855.php.expect b/hphp/test/slow/type_assertions/1855.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1855.php.expect
rename to hphp/test/slow/type_assertions/1855.php.expect
diff --git a/hphp/test/tcr/type_assertions/1856.php b/hphp/test/slow/type_assertions/1856.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1856.php
rename to hphp/test/slow/type_assertions/1856.php
diff --git a/hphp/test/tcr/type_assertions/1856.php.expect b/hphp/test/slow/type_assertions/1856.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1856.php.expect
rename to hphp/test/slow/type_assertions/1856.php.expect
diff --git a/hphp/test/tcr/type_assertions/1857.php b/hphp/test/slow/type_assertions/1857.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1857.php
rename to hphp/test/slow/type_assertions/1857.php
diff --git a/hphp/test/tcr/type_assertions/1857.php.expect b/hphp/test/slow/type_assertions/1857.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1857.php.expect
rename to hphp/test/slow/type_assertions/1857.php.expect
diff --git a/hphp/test/tcr/type_assertions/1858.php b/hphp/test/slow/type_assertions/1858.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1858.php
rename to hphp/test/slow/type_assertions/1858.php
diff --git a/hphp/test/tcr/type_assertions/1858.php.expect b/hphp/test/slow/type_assertions/1858.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1858.php.expect
rename to hphp/test/slow/type_assertions/1858.php.expect
diff --git a/hphp/test/tcr/type_assertions/1859.php b/hphp/test/slow/type_assertions/1859.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1859.php
rename to hphp/test/slow/type_assertions/1859.php
diff --git a/hphp/test/tcr/type_assertions/1859.php.expect b/hphp/test/slow/type_assertions/1859.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1859.php.expect
rename to hphp/test/slow/type_assertions/1859.php.expect
diff --git a/hphp/test/tcr/type_assertions/1860.php b/hphp/test/slow/type_assertions/1860.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1860.php
rename to hphp/test/slow/type_assertions/1860.php
diff --git a/hphp/test/tcr/type_assertions/1860.php.expect b/hphp/test/slow/type_assertions/1860.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1860.php.expect
rename to hphp/test/slow/type_assertions/1860.php.expect
diff --git a/hphp/test/tcr/type_assertions/1861.php b/hphp/test/slow/type_assertions/1861.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1861.php
rename to hphp/test/slow/type_assertions/1861.php
diff --git a/hphp/test/tcr/type_assertions/1861.php.expect b/hphp/test/slow/type_assertions/1861.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1861.php.expect
rename to hphp/test/slow/type_assertions/1861.php.expect
diff --git a/hphp/test/tcr/type_assertions/1862.php b/hphp/test/slow/type_assertions/1862.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1862.php
rename to hphp/test/slow/type_assertions/1862.php
diff --git a/hphp/test/tcr/type_assertions/1862.php.expect b/hphp/test/slow/type_assertions/1862.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1862.php.expect
rename to hphp/test/slow/type_assertions/1862.php.expect
diff --git a/hphp/test/tcr/type_assertions/1863.php b/hphp/test/slow/type_assertions/1863.php
similarity index 100%
rename from hphp/test/tcr/type_assertions/1863.php
rename to hphp/test/slow/type_assertions/1863.php
diff --git a/hphp/test/tcr/type_assertions/1863.php.expect b/hphp/test/slow/type_assertions/1863.php.expect
similarity index 100%
rename from hphp/test/tcr/type_assertions/1863.php.expect
rename to hphp/test/slow/type_assertions/1863.php.expect
diff --git a/hphp/test/tcr/types/1746.php b/hphp/test/slow/types/1746.php
similarity index 100%
rename from hphp/test/tcr/types/1746.php
rename to hphp/test/slow/types/1746.php
diff --git a/hphp/test/tcr/types/1746.php.expect b/hphp/test/slow/types/1746.php.expect
similarity index 100%
rename from hphp/test/tcr/types/1746.php.expect
rename to hphp/test/slow/types/1746.php.expect
diff --git a/hphp/test/tcr/types/1747.php b/hphp/test/slow/types/1747.php
similarity index 100%
rename from hphp/test/tcr/types/1747.php
rename to hphp/test/slow/types/1747.php
diff --git a/hphp/test/tcr/types/1747.php.expect b/hphp/test/slow/types/1747.php.expect
similarity index 100%
rename from hphp/test/tcr/types/1747.php.expect
rename to hphp/test/slow/types/1747.php.expect
diff --git a/hphp/test/tcr/types/1748.php b/hphp/test/slow/types/1748.php
similarity index 100%
rename from hphp/test/tcr/types/1748.php
rename to hphp/test/slow/types/1748.php
diff --git a/hphp/test/tcr/types/1748.php.expect b/hphp/test/slow/types/1748.php.expect
similarity index 100%
rename from hphp/test/tcr/types/1748.php.expect
rename to hphp/test/slow/types/1748.php.expect
diff --git a/hphp/test/tcr/types/1749.php b/hphp/test/slow/types/1749.php
similarity index 100%
rename from hphp/test/tcr/types/1749.php
rename to hphp/test/slow/types/1749.php
diff --git a/hphp/test/tcr/types/1749.php.expect b/hphp/test/slow/types/1749.php.expect
similarity index 100%
rename from hphp/test/tcr/types/1749.php.expect
rename to hphp/test/slow/types/1749.php.expect
diff --git a/hphp/test/tcr/types/1750.php b/hphp/test/slow/types/1750.php
similarity index 100%
rename from hphp/test/tcr/types/1750.php
rename to hphp/test/slow/types/1750.php
diff --git a/hphp/test/tcr/types/1750.php.expect b/hphp/test/slow/types/1750.php.expect
similarity index 100%
rename from hphp/test/tcr/types/1750.php.expect
rename to hphp/test/slow/types/1750.php.expect
diff --git a/hphp/test/tcr/u_converter/2130.php b/hphp/test/slow/u_converter/2130.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2130.php
rename to hphp/test/slow/u_converter/2130.php
diff --git a/hphp/test/tcr/u_converter/2130.php.expect b/hphp/test/slow/u_converter/2130.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2130.php.expect
rename to hphp/test/slow/u_converter/2130.php.expect
diff --git a/hphp/test/tcr/u_converter/2131.php b/hphp/test/slow/u_converter/2131.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2131.php
rename to hphp/test/slow/u_converter/2131.php
diff --git a/hphp/test/tcr/u_converter/2131.php.expect b/hphp/test/slow/u_converter/2131.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2131.php.expect
rename to hphp/test/slow/u_converter/2131.php.expect
diff --git a/hphp/test/tcr/u_converter/2132.php b/hphp/test/slow/u_converter/2132.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2132.php
rename to hphp/test/slow/u_converter/2132.php
diff --git a/hphp/test/tcr/u_converter/2132.php.expect b/hphp/test/slow/u_converter/2132.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2132.php.expect
rename to hphp/test/slow/u_converter/2132.php.expect
diff --git a/hphp/test/tcr/u_converter/2133.php b/hphp/test/slow/u_converter/2133.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2133.php
rename to hphp/test/slow/u_converter/2133.php
diff --git a/hphp/test/tcr/u_converter/2133.php.expect b/hphp/test/slow/u_converter/2133.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2133.php.expect
rename to hphp/test/slow/u_converter/2133.php.expect
diff --git a/hphp/test/tcr/u_converter/2134.php b/hphp/test/slow/u_converter/2134.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2134.php
rename to hphp/test/slow/u_converter/2134.php
diff --git a/hphp/test/tcr/u_converter/2134.php.expect b/hphp/test/slow/u_converter/2134.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2134.php.expect
rename to hphp/test/slow/u_converter/2134.php.expect
diff --git a/hphp/test/tcr/u_converter/2135.php b/hphp/test/slow/u_converter/2135.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2135.php
rename to hphp/test/slow/u_converter/2135.php
diff --git a/hphp/test/tcr/u_converter/2135.php.expect b/hphp/test/slow/u_converter/2135.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2135.php.expect
rename to hphp/test/slow/u_converter/2135.php.expect
diff --git a/hphp/test/tcr/u_converter/2136.php b/hphp/test/slow/u_converter/2136.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2136.php
rename to hphp/test/slow/u_converter/2136.php
diff --git a/hphp/test/tcr/u_converter/2136.php.expect b/hphp/test/slow/u_converter/2136.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2136.php.expect
rename to hphp/test/slow/u_converter/2136.php.expect
diff --git a/hphp/test/tcr/u_converter/2137.php b/hphp/test/slow/u_converter/2137.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2137.php
rename to hphp/test/slow/u_converter/2137.php
diff --git a/hphp/test/tcr/u_converter/2137.php.expect b/hphp/test/slow/u_converter/2137.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2137.php.expect
rename to hphp/test/slow/u_converter/2137.php.expect
diff --git a/hphp/test/tcr/u_converter/2138.php b/hphp/test/slow/u_converter/2138.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2138.php
rename to hphp/test/slow/u_converter/2138.php
diff --git a/hphp/test/tcr/u_converter/2138.php.expect b/hphp/test/slow/u_converter/2138.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2138.php.expect
rename to hphp/test/slow/u_converter/2138.php.expect
diff --git a/hphp/test/tcr/u_converter/2139.php b/hphp/test/slow/u_converter/2139.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2139.php
rename to hphp/test/slow/u_converter/2139.php
diff --git a/hphp/test/tcr/u_converter/2139.php.expect b/hphp/test/slow/u_converter/2139.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2139.php.expect
rename to hphp/test/slow/u_converter/2139.php.expect
diff --git a/hphp/test/tcr/u_converter/2140.php b/hphp/test/slow/u_converter/2140.php
similarity index 100%
rename from hphp/test/tcr/u_converter/2140.php
rename to hphp/test/slow/u_converter/2140.php
diff --git a/hphp/test/tcr/u_converter/2140.php.expect b/hphp/test/slow/u_converter/2140.php.expect
similarity index 100%
rename from hphp/test/tcr/u_converter/2140.php.expect
rename to hphp/test/slow/u_converter/2140.php.expect
diff --git a/hphp/test/tcr/unary_operators/1436.php b/hphp/test/slow/unary_operators/1436.php
similarity index 100%
rename from hphp/test/tcr/unary_operators/1436.php
rename to hphp/test/slow/unary_operators/1436.php
diff --git a/hphp/test/tcr/unary_operators/1436.php.expect b/hphp/test/slow/unary_operators/1436.php.expect
similarity index 100%
rename from hphp/test/tcr/unary_operators/1436.php.expect
rename to hphp/test/slow/unary_operators/1436.php.expect
diff --git a/hphp/test/tcr/unary_operators/1437.php b/hphp/test/slow/unary_operators/1437.php
similarity index 100%
rename from hphp/test/tcr/unary_operators/1437.php
rename to hphp/test/slow/unary_operators/1437.php
diff --git a/hphp/test/tcr/unary_operators/1437.php.expect b/hphp/test/slow/unary_operators/1437.php.expect
similarity index 100%
rename from hphp/test/tcr/unary_operators/1437.php.expect
rename to hphp/test/slow/unary_operators/1437.php.expect
diff --git a/hphp/test/tcr/unary_operators/1438.php b/hphp/test/slow/unary_operators/1438.php
similarity index 100%
rename from hphp/test/tcr/unary_operators/1438.php
rename to hphp/test/slow/unary_operators/1438.php
diff --git a/hphp/test/tcr/unary_operators/1438.php.expect b/hphp/test/slow/unary_operators/1438.php.expect
similarity index 100%
rename from hphp/test/tcr/unary_operators/1438.php.expect
rename to hphp/test/slow/unary_operators/1438.php.expect
diff --git a/hphp/test/tcr/unary_operators/1439.php b/hphp/test/slow/unary_operators/1439.php
similarity index 100%
rename from hphp/test/tcr/unary_operators/1439.php
rename to hphp/test/slow/unary_operators/1439.php
diff --git a/hphp/test/tcr/unary_operators/1439.php.expect b/hphp/test/slow/unary_operators/1439.php.expect
similarity index 100%
rename from hphp/test/tcr/unary_operators/1439.php.expect
rename to hphp/test/slow/unary_operators/1439.php.expect
diff --git a/hphp/test/tcr/unset/1106.php b/hphp/test/slow/unset/1106.php
similarity index 100%
rename from hphp/test/tcr/unset/1106.php
rename to hphp/test/slow/unset/1106.php
diff --git a/hphp/test/vm/typedef_newtype.php.expect b/hphp/test/slow/unset/1106.php.expect
similarity index 100%
rename from hphp/test/vm/typedef_newtype.php.expect
rename to hphp/test/slow/unset/1106.php.expect
diff --git a/hphp/test/tcr/unset/1107.php b/hphp/test/slow/unset/1107.php
similarity index 100%
rename from hphp/test/tcr/unset/1107.php
rename to hphp/test/slow/unset/1107.php
diff --git a/hphp/test/tcr/unset/1107.php.expect b/hphp/test/slow/unset/1107.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1107.php.expect
rename to hphp/test/slow/unset/1107.php.expect
diff --git a/hphp/test/tcr/unset/1108.php b/hphp/test/slow/unset/1108.php
similarity index 100%
rename from hphp/test/tcr/unset/1108.php
rename to hphp/test/slow/unset/1108.php
diff --git a/hphp/test/tcr/unset/1108.php.expect b/hphp/test/slow/unset/1108.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1108.php.expect
rename to hphp/test/slow/unset/1108.php.expect
diff --git a/hphp/test/tcr/unset/1109.php b/hphp/test/slow/unset/1109.php
similarity index 100%
rename from hphp/test/tcr/unset/1109.php
rename to hphp/test/slow/unset/1109.php
diff --git a/hphp/test/tcr/unset/1109.php.expect b/hphp/test/slow/unset/1109.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1109.php.expect
rename to hphp/test/slow/unset/1109.php.expect
diff --git a/hphp/test/tcr/unset/1110.php b/hphp/test/slow/unset/1110.php
similarity index 100%
rename from hphp/test/tcr/unset/1110.php
rename to hphp/test/slow/unset/1110.php
diff --git a/hphp/test/tcr/unset/1110.php.expect b/hphp/test/slow/unset/1110.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1110.php.expect
rename to hphp/test/slow/unset/1110.php.expect
diff --git a/hphp/test/tcr/unset/1111.php b/hphp/test/slow/unset/1111.php
similarity index 100%
rename from hphp/test/tcr/unset/1111.php
rename to hphp/test/slow/unset/1111.php
diff --git a/hphp/test/tcr/unset/1111.php.expect b/hphp/test/slow/unset/1111.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1111.php.expect
rename to hphp/test/slow/unset/1111.php.expect
diff --git a/hphp/test/tcr/unset/1112.php b/hphp/test/slow/unset/1112.php
similarity index 100%
rename from hphp/test/tcr/unset/1112.php
rename to hphp/test/slow/unset/1112.php
diff --git a/hphp/test/vm/unset_undef_g.php.expect b/hphp/test/slow/unset/1112.php.expect
similarity index 100%
rename from hphp/test/vm/unset_undef_g.php.expect
rename to hphp/test/slow/unset/1112.php.expect
diff --git a/hphp/test/tcr/unset/1113.php b/hphp/test/slow/unset/1113.php
similarity index 100%
rename from hphp/test/tcr/unset/1113.php
rename to hphp/test/slow/unset/1113.php
diff --git a/hphp/test/tcr/unset/1113.php.expect b/hphp/test/slow/unset/1113.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1113.php.expect
rename to hphp/test/slow/unset/1113.php.expect
diff --git a/hphp/test/tcr/unset/1114.php b/hphp/test/slow/unset/1114.php
similarity index 100%
rename from hphp/test/tcr/unset/1114.php
rename to hphp/test/slow/unset/1114.php
diff --git a/hphp/test/tcr/unset/1114.php.expect b/hphp/test/slow/unset/1114.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1114.php.expect
rename to hphp/test/slow/unset/1114.php.expect
diff --git a/hphp/test/tcr/unset/1115.php b/hphp/test/slow/unset/1115.php
similarity index 100%
rename from hphp/test/tcr/unset/1115.php
rename to hphp/test/slow/unset/1115.php
diff --git a/hphp/test/tcr/unset/1115.php.expect b/hphp/test/slow/unset/1115.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1115.php.expect
rename to hphp/test/slow/unset/1115.php.expect
diff --git a/hphp/test/tcr/unset/1116.php b/hphp/test/slow/unset/1116.php
similarity index 100%
rename from hphp/test/tcr/unset/1116.php
rename to hphp/test/slow/unset/1116.php
diff --git a/hphp/test/tcr/unset/1116.php.expect b/hphp/test/slow/unset/1116.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1116.php.expect
rename to hphp/test/slow/unset/1116.php.expect
diff --git a/hphp/test/tcr/unset/1117.php b/hphp/test/slow/unset/1117.php
similarity index 100%
rename from hphp/test/tcr/unset/1117.php
rename to hphp/test/slow/unset/1117.php
diff --git a/hphp/test/tcr/unset/1117.php.expect b/hphp/test/slow/unset/1117.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1117.php.expect
rename to hphp/test/slow/unset/1117.php.expect
diff --git a/hphp/test/tcr/unset/1118.php b/hphp/test/slow/unset/1118.php
similarity index 100%
rename from hphp/test/tcr/unset/1118.php
rename to hphp/test/slow/unset/1118.php
diff --git a/hphp/test/tcr/unset/1118.php.expect b/hphp/test/slow/unset/1118.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1118.php.expect
rename to hphp/test/slow/unset/1118.php.expect
diff --git a/hphp/test/tcr/unset/1119.php b/hphp/test/slow/unset/1119.php
similarity index 100%
rename from hphp/test/tcr/unset/1119.php
rename to hphp/test/slow/unset/1119.php
diff --git a/hphp/test/tcr/unset/1119.php.expect b/hphp/test/slow/unset/1119.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1119.php.expect
rename to hphp/test/slow/unset/1119.php.expect
diff --git a/hphp/test/tcr/unset/1120.php b/hphp/test/slow/unset/1120.php
similarity index 100%
rename from hphp/test/tcr/unset/1120.php
rename to hphp/test/slow/unset/1120.php
diff --git a/hphp/test/tcr/unset/1120.php.expect b/hphp/test/slow/unset/1120.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1120.php.expect
rename to hphp/test/slow/unset/1120.php.expect
diff --git a/hphp/test/tcr/unset/1121.php b/hphp/test/slow/unset/1121.php
similarity index 100%
rename from hphp/test/tcr/unset/1121.php
rename to hphp/test/slow/unset/1121.php
diff --git a/hphp/test/tcr/unset/1121.php.expect b/hphp/test/slow/unset/1121.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1121.php.expect
rename to hphp/test/slow/unset/1121.php.expect
diff --git a/hphp/test/tcr/unset/1122.php b/hphp/test/slow/unset/1122.php
similarity index 100%
rename from hphp/test/tcr/unset/1122.php
rename to hphp/test/slow/unset/1122.php
diff --git a/hphp/test/tcr/unset/1122.php.expect b/hphp/test/slow/unset/1122.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1122.php.expect
rename to hphp/test/slow/unset/1122.php.expect
diff --git a/hphp/test/tcr/unset/1123.php b/hphp/test/slow/unset/1123.php
similarity index 100%
rename from hphp/test/tcr/unset/1123.php
rename to hphp/test/slow/unset/1123.php
diff --git a/hphp/test/tcr/unset/1123.php.expect b/hphp/test/slow/unset/1123.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1123.php.expect
rename to hphp/test/slow/unset/1123.php.expect
diff --git a/hphp/test/tcr/unset/1124.php b/hphp/test/slow/unset/1124.php
similarity index 100%
rename from hphp/test/tcr/unset/1124.php
rename to hphp/test/slow/unset/1124.php
diff --git a/hphp/test/tcr/unset/1124.php.expect b/hphp/test/slow/unset/1124.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1124.php.expect
rename to hphp/test/slow/unset/1124.php.expect
diff --git a/hphp/test/tcr/unset/1125.php b/hphp/test/slow/unset/1125.php
similarity index 100%
rename from hphp/test/tcr/unset/1125.php
rename to hphp/test/slow/unset/1125.php
diff --git a/hphp/test/tcr/unset/1125.php.expect b/hphp/test/slow/unset/1125.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1125.php.expect
rename to hphp/test/slow/unset/1125.php.expect
diff --git a/hphp/test/tcr/unset/1126.php b/hphp/test/slow/unset/1126.php
similarity index 100%
rename from hphp/test/tcr/unset/1126.php
rename to hphp/test/slow/unset/1126.php
diff --git a/hphp/test/tcr/unset/1126.php.expect b/hphp/test/slow/unset/1126.php.expect
similarity index 100%
rename from hphp/test/tcr/unset/1126.php.expect
rename to hphp/test/slow/unset/1126.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1739.php b/hphp/test/slow/useless_assignment/1739.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1739.php
rename to hphp/test/slow/useless_assignment/1739.php
diff --git a/hphp/test/tcr/useless_assignment/1739.php.expect b/hphp/test/slow/useless_assignment/1739.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1739.php.expect
rename to hphp/test/slow/useless_assignment/1739.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1740.php b/hphp/test/slow/useless_assignment/1740.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1740.php
rename to hphp/test/slow/useless_assignment/1740.php
diff --git a/hphp/test/tcr/useless_assignment/1740.php.expect b/hphp/test/slow/useless_assignment/1740.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1740.php.expect
rename to hphp/test/slow/useless_assignment/1740.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1741.php b/hphp/test/slow/useless_assignment/1741.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1741.php
rename to hphp/test/slow/useless_assignment/1741.php
diff --git a/hphp/test/tcr/useless_assignment/1741.php.expect b/hphp/test/slow/useless_assignment/1741.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1741.php.expect
rename to hphp/test/slow/useless_assignment/1741.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1742.php b/hphp/test/slow/useless_assignment/1742.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1742.php
rename to hphp/test/slow/useless_assignment/1742.php
diff --git a/hphp/test/tcr/useless_assignment/1742.php.expect b/hphp/test/slow/useless_assignment/1742.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1742.php.expect
rename to hphp/test/slow/useless_assignment/1742.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1743.php b/hphp/test/slow/useless_assignment/1743.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1743.php
rename to hphp/test/slow/useless_assignment/1743.php
diff --git a/hphp/test/tcr/useless_assignment/1743.php.expect b/hphp/test/slow/useless_assignment/1743.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1743.php.expect
rename to hphp/test/slow/useless_assignment/1743.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1744.php b/hphp/test/slow/useless_assignment/1744.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1744.php
rename to hphp/test/slow/useless_assignment/1744.php
diff --git a/hphp/test/vm/va_poly.php.expect b/hphp/test/slow/useless_assignment/1744.php.expect
similarity index 100%
rename from hphp/test/vm/va_poly.php.expect
rename to hphp/test/slow/useless_assignment/1744.php.expect
diff --git a/hphp/test/tcr/useless_assignment/1745.php b/hphp/test/slow/useless_assignment/1745.php
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1745.php
rename to hphp/test/slow/useless_assignment/1745.php
diff --git a/hphp/test/tcr/useless_assignment/1745.php.expect b/hphp/test/slow/useless_assignment/1745.php.expect
similarity index 100%
rename from hphp/test/tcr/useless_assignment/1745.php.expect
rename to hphp/test/slow/useless_assignment/1745.php.expect
diff --git a/hphp/test/tcr/user_attributes/2196.php b/hphp/test/slow/user_attributes/2196.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2196.php
rename to hphp/test/slow/user_attributes/2196.php
diff --git a/hphp/test/tcr/user_attributes/2196.php.expect b/hphp/test/slow/user_attributes/2196.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2196.php.expect
rename to hphp/test/slow/user_attributes/2196.php.expect
diff --git a/hphp/test/tcr/user_attributes/2196.php.hphp_opts b/hphp/test/slow/user_attributes/2196.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2196.php.hphp_opts
rename to hphp/test/slow/user_attributes/2196.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2196.php.opts b/hphp/test/slow/user_attributes/2196.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2196.php.opts
rename to hphp/test/slow/user_attributes/2196.php.opts
diff --git a/hphp/test/tcr/user_attributes/2197.php b/hphp/test/slow/user_attributes/2197.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2197.php
rename to hphp/test/slow/user_attributes/2197.php
diff --git a/hphp/test/tcr/user_attributes/2197.php.expect b/hphp/test/slow/user_attributes/2197.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2197.php.expect
rename to hphp/test/slow/user_attributes/2197.php.expect
diff --git a/hphp/test/tcr/user_attributes/2197.php.hphp_opts b/hphp/test/slow/user_attributes/2197.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2197.php.hphp_opts
rename to hphp/test/slow/user_attributes/2197.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2197.php.opts b/hphp/test/slow/user_attributes/2197.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2197.php.opts
rename to hphp/test/slow/user_attributes/2197.php.opts
diff --git a/hphp/test/tcr/user_attributes/2198.php b/hphp/test/slow/user_attributes/2198.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2198.php
rename to hphp/test/slow/user_attributes/2198.php
diff --git a/hphp/test/tcr/user_attributes/2198.php.expect b/hphp/test/slow/user_attributes/2198.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2198.php.expect
rename to hphp/test/slow/user_attributes/2198.php.expect
diff --git a/hphp/test/tcr/user_attributes/2198.php.hphp_opts b/hphp/test/slow/user_attributes/2198.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2198.php.hphp_opts
rename to hphp/test/slow/user_attributes/2198.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2198.php.opts b/hphp/test/slow/user_attributes/2198.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2198.php.opts
rename to hphp/test/slow/user_attributes/2198.php.opts
diff --git a/hphp/test/tcr/user_attributes/2199.php b/hphp/test/slow/user_attributes/2199.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2199.php
rename to hphp/test/slow/user_attributes/2199.php
diff --git a/hphp/test/tcr/user_attributes/2199.php.expect b/hphp/test/slow/user_attributes/2199.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2199.php.expect
rename to hphp/test/slow/user_attributes/2199.php.expect
diff --git a/hphp/test/tcr/user_attributes/2199.php.hphp_opts b/hphp/test/slow/user_attributes/2199.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2199.php.hphp_opts
rename to hphp/test/slow/user_attributes/2199.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2199.php.opts b/hphp/test/slow/user_attributes/2199.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2199.php.opts
rename to hphp/test/slow/user_attributes/2199.php.opts
diff --git a/hphp/test/tcr/user_attributes/2200.php b/hphp/test/slow/user_attributes/2200.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2200.php
rename to hphp/test/slow/user_attributes/2200.php
diff --git a/hphp/test/tcr/user_attributes/2200.php.expect b/hphp/test/slow/user_attributes/2200.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2200.php.expect
rename to hphp/test/slow/user_attributes/2200.php.expect
diff --git a/hphp/test/tcr/user_attributes/2200.php.hphp_opts b/hphp/test/slow/user_attributes/2200.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2200.php.hphp_opts
rename to hphp/test/slow/user_attributes/2200.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2200.php.opts b/hphp/test/slow/user_attributes/2200.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2200.php.opts
rename to hphp/test/slow/user_attributes/2200.php.opts
diff --git a/hphp/test/tcr/user_attributes/2201.php b/hphp/test/slow/user_attributes/2201.php
similarity index 100%
rename from hphp/test/tcr/user_attributes/2201.php
rename to hphp/test/slow/user_attributes/2201.php
diff --git a/hphp/test/tcr/user_attributes/2201.php.expect b/hphp/test/slow/user_attributes/2201.php.expect
similarity index 100%
rename from hphp/test/tcr/user_attributes/2201.php.expect
rename to hphp/test/slow/user_attributes/2201.php.expect
diff --git a/hphp/test/tcr/user_attributes/2201.php.hphp_opts b/hphp/test/slow/user_attributes/2201.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2201.php.hphp_opts
rename to hphp/test/slow/user_attributes/2201.php.hphp_opts
diff --git a/hphp/test/tcr/user_attributes/2201.php.opts b/hphp/test/slow/user_attributes/2201.php.opts
similarity index 100%
rename from hphp/test/tcr/user_attributes/2201.php.opts
rename to hphp/test/slow/user_attributes/2201.php.opts
diff --git a/hphp/test/tcr/user_wrappers/1695.php b/hphp/test/slow/user_wrappers/1695.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1695.php
rename to hphp/test/slow/user_wrappers/1695.php
diff --git a/hphp/test/tcr/user_wrappers/1695.php.expect b/hphp/test/slow/user_wrappers/1695.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1695.php.expect
rename to hphp/test/slow/user_wrappers/1695.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1696.php b/hphp/test/slow/user_wrappers/1696.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1696.php
rename to hphp/test/slow/user_wrappers/1696.php
diff --git a/hphp/test/tcr/user_wrappers/1696.php.expect b/hphp/test/slow/user_wrappers/1696.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1696.php.expect
rename to hphp/test/slow/user_wrappers/1696.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1697.php b/hphp/test/slow/user_wrappers/1697.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1697.php
rename to hphp/test/slow/user_wrappers/1697.php
diff --git a/hphp/test/tcr/user_wrappers/1697.php.expect b/hphp/test/slow/user_wrappers/1697.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1697.php.expect
rename to hphp/test/slow/user_wrappers/1697.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1698.php b/hphp/test/slow/user_wrappers/1698.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1698.php
rename to hphp/test/slow/user_wrappers/1698.php
diff --git a/hphp/test/tcr/user_wrappers/1698.php.expect b/hphp/test/slow/user_wrappers/1698.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1698.php.expect
rename to hphp/test/slow/user_wrappers/1698.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1699.php b/hphp/test/slow/user_wrappers/1699.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1699.php
rename to hphp/test/slow/user_wrappers/1699.php
diff --git a/hphp/test/tcr/user_wrappers/1699.php.expect b/hphp/test/slow/user_wrappers/1699.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1699.php.expect
rename to hphp/test/slow/user_wrappers/1699.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1700.php b/hphp/test/slow/user_wrappers/1700.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1700.php
rename to hphp/test/slow/user_wrappers/1700.php
diff --git a/hphp/test/tcr/user_wrappers/1700.php.expect b/hphp/test/slow/user_wrappers/1700.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1700.php.expect
rename to hphp/test/slow/user_wrappers/1700.php.expect
diff --git a/hphp/test/tcr/user_wrappers/1701.php b/hphp/test/slow/user_wrappers/1701.php
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1701.php
rename to hphp/test/slow/user_wrappers/1701.php
diff --git a/hphp/test/tcr/user_wrappers/1701.php.expect b/hphp/test/slow/user_wrappers/1701.php.expect
similarity index 100%
rename from hphp/test/tcr/user_wrappers/1701.php.expect
rename to hphp/test/slow/user_wrappers/1701.php.expect
diff --git a/hphp/test/tcr/var_export/1449.php b/hphp/test/slow/var_export/1449.php
similarity index 100%
rename from hphp/test/tcr/var_export/1449.php
rename to hphp/test/slow/var_export/1449.php
diff --git a/hphp/test/tcr/var_export/1449.php.expect b/hphp/test/slow/var_export/1449.php.expect
similarity index 100%
rename from hphp/test/tcr/var_export/1449.php.expect
rename to hphp/test/slow/var_export/1449.php.expect
diff --git a/hphp/test/tcr/var_export/1450.php b/hphp/test/slow/var_export/1450.php
similarity index 100%
rename from hphp/test/tcr/var_export/1450.php
rename to hphp/test/slow/var_export/1450.php
diff --git a/hphp/test/tcr/var_export/1450.php.expect b/hphp/test/slow/var_export/1450.php.expect
similarity index 100%
rename from hphp/test/tcr/var_export/1450.php.expect
rename to hphp/test/slow/var_export/1450.php.expect
diff --git a/hphp/test/tcr/variable_argument/11.php b/hphp/test/slow/variable_argument/11.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/11.php
rename to hphp/test/slow/variable_argument/11.php
diff --git a/hphp/test/tcr/variable_argument/11.php.expect b/hphp/test/slow/variable_argument/11.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/11.php.expect
rename to hphp/test/slow/variable_argument/11.php.expect
diff --git a/hphp/test/tcr/variable_argument/12.php b/hphp/test/slow/variable_argument/12.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/12.php
rename to hphp/test/slow/variable_argument/12.php
diff --git a/hphp/test/tcr/variable_argument/12.php.expect b/hphp/test/slow/variable_argument/12.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/12.php.expect
rename to hphp/test/slow/variable_argument/12.php.expect
diff --git a/hphp/test/tcr/variable_argument/13.php b/hphp/test/slow/variable_argument/13.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/13.php
rename to hphp/test/slow/variable_argument/13.php
diff --git a/hphp/test/tcr/variable_argument/13.php.expect b/hphp/test/slow/variable_argument/13.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/13.php.expect
rename to hphp/test/slow/variable_argument/13.php.expect
diff --git a/hphp/test/tcr/variable_argument/14.php b/hphp/test/slow/variable_argument/14.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/14.php
rename to hphp/test/slow/variable_argument/14.php
diff --git a/hphp/test/tcr/variable_argument/14.php.expect b/hphp/test/slow/variable_argument/14.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/14.php.expect
rename to hphp/test/slow/variable_argument/14.php.expect
diff --git a/hphp/test/tcr/variable_argument/15.php b/hphp/test/slow/variable_argument/15.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/15.php
rename to hphp/test/slow/variable_argument/15.php
diff --git a/hphp/test/tcr/variable_argument/15.php.expect b/hphp/test/slow/variable_argument/15.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/15.php.expect
rename to hphp/test/slow/variable_argument/15.php.expect
diff --git a/hphp/test/tcr/variable_argument/16.php b/hphp/test/slow/variable_argument/16.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/16.php
rename to hphp/test/slow/variable_argument/16.php
diff --git a/hphp/test/tcr/variable_argument/16.php.expect b/hphp/test/slow/variable_argument/16.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/16.php.expect
rename to hphp/test/slow/variable_argument/16.php.expect
diff --git a/hphp/test/tcr/variable_argument/17.php b/hphp/test/slow/variable_argument/17.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/17.php
rename to hphp/test/slow/variable_argument/17.php
diff --git a/hphp/test/tcr/variable_argument/17.php.expect b/hphp/test/slow/variable_argument/17.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/17.php.expect
rename to hphp/test/slow/variable_argument/17.php.expect
diff --git a/hphp/test/tcr/variable_argument/18.php b/hphp/test/slow/variable_argument/18.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/18.php
rename to hphp/test/slow/variable_argument/18.php
diff --git a/hphp/test/tcr/variable_argument/18.php.expect b/hphp/test/slow/variable_argument/18.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/18.php.expect
rename to hphp/test/slow/variable_argument/18.php.expect
diff --git a/hphp/test/tcr/variable_argument/19.php b/hphp/test/slow/variable_argument/19.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/19.php
rename to hphp/test/slow/variable_argument/19.php
diff --git a/hphp/test/tcr/variable_argument/19.php.expect b/hphp/test/slow/variable_argument/19.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/19.php.expect
rename to hphp/test/slow/variable_argument/19.php.expect
diff --git a/hphp/test/tcr/variable_argument/20.php b/hphp/test/slow/variable_argument/20.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/20.php
rename to hphp/test/slow/variable_argument/20.php
diff --git a/hphp/test/tcr/variable_argument/20.php.expect b/hphp/test/slow/variable_argument/20.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/20.php.expect
rename to hphp/test/slow/variable_argument/20.php.expect
diff --git a/hphp/test/tcr/variable_argument/21.php b/hphp/test/slow/variable_argument/21.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/21.php
rename to hphp/test/slow/variable_argument/21.php
diff --git a/hphp/test/tcr/variable_argument/21.php.expect b/hphp/test/slow/variable_argument/21.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/21.php.expect
rename to hphp/test/slow/variable_argument/21.php.expect
diff --git a/hphp/test/tcr/variable_argument/22.php b/hphp/test/slow/variable_argument/22.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/22.php
rename to hphp/test/slow/variable_argument/22.php
diff --git a/hphp/test/tcr/variable_argument/22.php.expect b/hphp/test/slow/variable_argument/22.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/22.php.expect
rename to hphp/test/slow/variable_argument/22.php.expect
diff --git a/hphp/test/tcr/variable_argument/23.php b/hphp/test/slow/variable_argument/23.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/23.php
rename to hphp/test/slow/variable_argument/23.php
diff --git a/hphp/test/tcr/variable_argument/23.php.expect b/hphp/test/slow/variable_argument/23.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/23.php.expect
rename to hphp/test/slow/variable_argument/23.php.expect
diff --git a/hphp/test/tcr/variable_argument/24.php b/hphp/test/slow/variable_argument/24.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/24.php
rename to hphp/test/slow/variable_argument/24.php
diff --git a/hphp/test/tcr/variable_argument/24.php.expect b/hphp/test/slow/variable_argument/24.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/24.php.expect
rename to hphp/test/slow/variable_argument/24.php.expect
diff --git a/hphp/test/tcr/variable_argument/25.php b/hphp/test/slow/variable_argument/25.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/25.php
rename to hphp/test/slow/variable_argument/25.php
diff --git a/hphp/test/tcr/variable_argument/25.php.expect b/hphp/test/slow/variable_argument/25.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/25.php.expect
rename to hphp/test/slow/variable_argument/25.php.expect
diff --git a/hphp/test/tcr/variable_argument/26.php b/hphp/test/slow/variable_argument/26.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/26.php
rename to hphp/test/slow/variable_argument/26.php
diff --git a/hphp/test/tcr/variable_argument/26.php.expect b/hphp/test/slow/variable_argument/26.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/26.php.expect
rename to hphp/test/slow/variable_argument/26.php.expect
diff --git a/hphp/test/tcr/variable_argument/27.php b/hphp/test/slow/variable_argument/27.php
similarity index 100%
rename from hphp/test/tcr/variable_argument/27.php
rename to hphp/test/slow/variable_argument/27.php
diff --git a/hphp/test/tcr/variable_argument/27.php.expect b/hphp/test/slow/variable_argument/27.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_argument/27.php.expect
rename to hphp/test/slow/variable_argument/27.php.expect
diff --git a/hphp/test/tcr/variable_class_name/1870.php b/hphp/test/slow/variable_class_name/1870.php
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1870.php
rename to hphp/test/slow/variable_class_name/1870.php
diff --git a/hphp/test/tcr/variable_class_name/1870.php.expect b/hphp/test/slow/variable_class_name/1870.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1870.php.expect
rename to hphp/test/slow/variable_class_name/1870.php.expect
diff --git a/hphp/test/tcr/variable_class_name/1871.php b/hphp/test/slow/variable_class_name/1871.php
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1871.php
rename to hphp/test/slow/variable_class_name/1871.php
diff --git a/hphp/test/tcr/variable_class_name/1871.php.expect b/hphp/test/slow/variable_class_name/1871.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1871.php.expect
rename to hphp/test/slow/variable_class_name/1871.php.expect
diff --git a/hphp/test/tcr/variable_class_name/1872.php b/hphp/test/slow/variable_class_name/1872.php
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1872.php
rename to hphp/test/slow/variable_class_name/1872.php
diff --git a/hphp/test/tcr/variable_class_name/1872.php.expect b/hphp/test/slow/variable_class_name/1872.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1872.php.expect
rename to hphp/test/slow/variable_class_name/1872.php.expect
diff --git a/hphp/test/tcr/variable_class_name/1873.php b/hphp/test/slow/variable_class_name/1873.php
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1873.php
rename to hphp/test/slow/variable_class_name/1873.php
diff --git a/hphp/test/tcr/variable_class_name/1873.php.expect b/hphp/test/slow/variable_class_name/1873.php.expect
similarity index 100%
rename from hphp/test/tcr/variable_class_name/1873.php.expect
rename to hphp/test/slow/variable_class_name/1873.php.expect
diff --git a/hphp/test/tcr/variant/549.php b/hphp/test/slow/variant/549.php
similarity index 100%
rename from hphp/test/tcr/variant/549.php
rename to hphp/test/slow/variant/549.php
diff --git a/hphp/test/tcr/variant/549.php.expect b/hphp/test/slow/variant/549.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/549.php.expect
rename to hphp/test/slow/variant/549.php.expect
diff --git a/hphp/test/tcr/variant/550.php b/hphp/test/slow/variant/550.php
similarity index 100%
rename from hphp/test/tcr/variant/550.php
rename to hphp/test/slow/variant/550.php
diff --git a/hphp/test/tcr/variant/550.php.expect b/hphp/test/slow/variant/550.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/550.php.expect
rename to hphp/test/slow/variant/550.php.expect
diff --git a/hphp/test/tcr/variant/551.php b/hphp/test/slow/variant/551.php
similarity index 100%
rename from hphp/test/tcr/variant/551.php
rename to hphp/test/slow/variant/551.php
diff --git a/hphp/test/tcr/variant/551.php.expect b/hphp/test/slow/variant/551.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/551.php.expect
rename to hphp/test/slow/variant/551.php.expect
diff --git a/hphp/test/tcr/variant/552.php b/hphp/test/slow/variant/552.php
similarity index 100%
rename from hphp/test/tcr/variant/552.php
rename to hphp/test/slow/variant/552.php
diff --git a/hphp/test/tcr/variant/552.php.expect b/hphp/test/slow/variant/552.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/552.php.expect
rename to hphp/test/slow/variant/552.php.expect
diff --git a/hphp/test/tcr/variant/553.php b/hphp/test/slow/variant/553.php
similarity index 100%
rename from hphp/test/tcr/variant/553.php
rename to hphp/test/slow/variant/553.php
diff --git a/hphp/test/tcr/variant/553.php.expect b/hphp/test/slow/variant/553.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/553.php.expect
rename to hphp/test/slow/variant/553.php.expect
diff --git a/hphp/test/tcr/variant/554.php b/hphp/test/slow/variant/554.php
similarity index 100%
rename from hphp/test/tcr/variant/554.php
rename to hphp/test/slow/variant/554.php
diff --git a/hphp/test/tcr/variant/554.php.expect b/hphp/test/slow/variant/554.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/554.php.expect
rename to hphp/test/slow/variant/554.php.expect
diff --git a/hphp/test/tcr/variant/555.php b/hphp/test/slow/variant/555.php
similarity index 100%
rename from hphp/test/tcr/variant/555.php
rename to hphp/test/slow/variant/555.php
diff --git a/hphp/test/tcr/variant/555.php.expect b/hphp/test/slow/variant/555.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/555.php.expect
rename to hphp/test/slow/variant/555.php.expect
diff --git a/hphp/test/tcr/variant/556.php b/hphp/test/slow/variant/556.php
similarity index 100%
rename from hphp/test/tcr/variant/556.php
rename to hphp/test/slow/variant/556.php
diff --git a/hphp/test/tcr/variant/556.php.expect b/hphp/test/slow/variant/556.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/556.php.expect
rename to hphp/test/slow/variant/556.php.expect
diff --git a/hphp/test/tcr/variant/557.php b/hphp/test/slow/variant/557.php
similarity index 100%
rename from hphp/test/tcr/variant/557.php
rename to hphp/test/slow/variant/557.php
diff --git a/hphp/test/tcr/variant/557.php.expect b/hphp/test/slow/variant/557.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/557.php.expect
rename to hphp/test/slow/variant/557.php.expect
diff --git a/hphp/test/tcr/variant/558.php b/hphp/test/slow/variant/558.php
similarity index 100%
rename from hphp/test/tcr/variant/558.php
rename to hphp/test/slow/variant/558.php
diff --git a/hphp/test/tcr/variant/558.php.expect b/hphp/test/slow/variant/558.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/558.php.expect
rename to hphp/test/slow/variant/558.php.expect
diff --git a/hphp/test/tcr/variant/559.php b/hphp/test/slow/variant/559.php
similarity index 100%
rename from hphp/test/tcr/variant/559.php
rename to hphp/test/slow/variant/559.php
diff --git a/hphp/test/tcr/variant/559.php.expect b/hphp/test/slow/variant/559.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/559.php.expect
rename to hphp/test/slow/variant/559.php.expect
diff --git a/hphp/test/tcr/variant/560.php b/hphp/test/slow/variant/560.php
similarity index 100%
rename from hphp/test/tcr/variant/560.php
rename to hphp/test/slow/variant/560.php
diff --git a/hphp/test/tcr/variant/560.php.expect b/hphp/test/slow/variant/560.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/560.php.expect
rename to hphp/test/slow/variant/560.php.expect
diff --git a/hphp/test/tcr/variant/561.php b/hphp/test/slow/variant/561.php
similarity index 100%
rename from hphp/test/tcr/variant/561.php
rename to hphp/test/slow/variant/561.php
diff --git a/hphp/test/tcr/variant/561.php.expect b/hphp/test/slow/variant/561.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/561.php.expect
rename to hphp/test/slow/variant/561.php.expect
diff --git a/hphp/test/tcr/variant/562.php b/hphp/test/slow/variant/562.php
similarity index 100%
rename from hphp/test/tcr/variant/562.php
rename to hphp/test/slow/variant/562.php
diff --git a/hphp/test/tcr/variant/562.php.expect b/hphp/test/slow/variant/562.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/562.php.expect
rename to hphp/test/slow/variant/562.php.expect
diff --git a/hphp/test/tcr/variant/563.php b/hphp/test/slow/variant/563.php
similarity index 100%
rename from hphp/test/tcr/variant/563.php
rename to hphp/test/slow/variant/563.php
diff --git a/hphp/test/tcr/variant/563.php.expect b/hphp/test/slow/variant/563.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/563.php.expect
rename to hphp/test/slow/variant/563.php.expect
diff --git a/hphp/test/tcr/variant/564.php b/hphp/test/slow/variant/564.php
similarity index 100%
rename from hphp/test/tcr/variant/564.php
rename to hphp/test/slow/variant/564.php
diff --git a/hphp/test/tcr/variant/564.php.expect b/hphp/test/slow/variant/564.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/564.php.expect
rename to hphp/test/slow/variant/564.php.expect
diff --git a/hphp/test/tcr/variant/565.php b/hphp/test/slow/variant/565.php
similarity index 100%
rename from hphp/test/tcr/variant/565.php
rename to hphp/test/slow/variant/565.php
diff --git a/hphp/test/tcr/variant/565.php.expect b/hphp/test/slow/variant/565.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/565.php.expect
rename to hphp/test/slow/variant/565.php.expect
diff --git a/hphp/test/tcr/variant/566.php b/hphp/test/slow/variant/566.php
similarity index 100%
rename from hphp/test/tcr/variant/566.php
rename to hphp/test/slow/variant/566.php
diff --git a/hphp/test/tcr/variant/566.php.expect b/hphp/test/slow/variant/566.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/566.php.expect
rename to hphp/test/slow/variant/566.php.expect
diff --git a/hphp/test/tcr/variant/567.php b/hphp/test/slow/variant/567.php
similarity index 100%
rename from hphp/test/tcr/variant/567.php
rename to hphp/test/slow/variant/567.php
diff --git a/hphp/test/tcr/variant/567.php.expect b/hphp/test/slow/variant/567.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/567.php.expect
rename to hphp/test/slow/variant/567.php.expect
diff --git a/hphp/test/tcr/variant/568.php b/hphp/test/slow/variant/568.php
similarity index 100%
rename from hphp/test/tcr/variant/568.php
rename to hphp/test/slow/variant/568.php
diff --git a/hphp/test/tcr/variant/568.php.expect b/hphp/test/slow/variant/568.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/568.php.expect
rename to hphp/test/slow/variant/568.php.expect
diff --git a/hphp/test/tcr/variant/569.php b/hphp/test/slow/variant/569.php
similarity index 100%
rename from hphp/test/tcr/variant/569.php
rename to hphp/test/slow/variant/569.php
diff --git a/hphp/test/tcr/variant/569.php.expect b/hphp/test/slow/variant/569.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/569.php.expect
rename to hphp/test/slow/variant/569.php.expect
diff --git a/hphp/test/tcr/variant/570.php b/hphp/test/slow/variant/570.php
similarity index 100%
rename from hphp/test/tcr/variant/570.php
rename to hphp/test/slow/variant/570.php
diff --git a/hphp/test/tcr/variant/570.php.expect b/hphp/test/slow/variant/570.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/570.php.expect
rename to hphp/test/slow/variant/570.php.expect
diff --git a/hphp/test/tcr/variant/571.php b/hphp/test/slow/variant/571.php
similarity index 100%
rename from hphp/test/tcr/variant/571.php
rename to hphp/test/slow/variant/571.php
diff --git a/hphp/test/tcr/variant/571.php.expect b/hphp/test/slow/variant/571.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/571.php.expect
rename to hphp/test/slow/variant/571.php.expect
diff --git a/hphp/test/tcr/variant/572.php b/hphp/test/slow/variant/572.php
similarity index 100%
rename from hphp/test/tcr/variant/572.php
rename to hphp/test/slow/variant/572.php
diff --git a/hphp/test/tcr/variant/572.php.expect b/hphp/test/slow/variant/572.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/572.php.expect
rename to hphp/test/slow/variant/572.php.expect
diff --git a/hphp/test/tcr/variant/573.php b/hphp/test/slow/variant/573.php
similarity index 100%
rename from hphp/test/tcr/variant/573.php
rename to hphp/test/slow/variant/573.php
diff --git a/hphp/test/tcr/variant/573.php.expect b/hphp/test/slow/variant/573.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/573.php.expect
rename to hphp/test/slow/variant/573.php.expect
diff --git a/hphp/test/tcr/variant/574.php b/hphp/test/slow/variant/574.php
similarity index 100%
rename from hphp/test/tcr/variant/574.php
rename to hphp/test/slow/variant/574.php
diff --git a/hphp/test/tcr/variant/574.php.expect b/hphp/test/slow/variant/574.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/574.php.expect
rename to hphp/test/slow/variant/574.php.expect
diff --git a/hphp/test/tcr/variant/575.php b/hphp/test/slow/variant/575.php
similarity index 100%
rename from hphp/test/tcr/variant/575.php
rename to hphp/test/slow/variant/575.php
diff --git a/hphp/test/tcr/variant/575.php.expect b/hphp/test/slow/variant/575.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/575.php.expect
rename to hphp/test/slow/variant/575.php.expect
diff --git a/hphp/test/tcr/variant/576.php b/hphp/test/slow/variant/576.php
similarity index 100%
rename from hphp/test/tcr/variant/576.php
rename to hphp/test/slow/variant/576.php
diff --git a/hphp/test/tcr/variant/576.php.expect b/hphp/test/slow/variant/576.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/576.php.expect
rename to hphp/test/slow/variant/576.php.expect
diff --git a/hphp/test/tcr/variant/577.php b/hphp/test/slow/variant/577.php
similarity index 100%
rename from hphp/test/tcr/variant/577.php
rename to hphp/test/slow/variant/577.php
diff --git a/hphp/test/tcr/variant/577.php.expect b/hphp/test/slow/variant/577.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/577.php.expect
rename to hphp/test/slow/variant/577.php.expect
diff --git a/hphp/test/tcr/variant/578.php b/hphp/test/slow/variant/578.php
similarity index 100%
rename from hphp/test/tcr/variant/578.php
rename to hphp/test/slow/variant/578.php
diff --git a/hphp/test/tcr/variant/578.php.expect b/hphp/test/slow/variant/578.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/578.php.expect
rename to hphp/test/slow/variant/578.php.expect
diff --git a/hphp/test/tcr/variant/579.php b/hphp/test/slow/variant/579.php
similarity index 100%
rename from hphp/test/tcr/variant/579.php
rename to hphp/test/slow/variant/579.php
diff --git a/hphp/test/tcr/variant/579.php.expect b/hphp/test/slow/variant/579.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/579.php.expect
rename to hphp/test/slow/variant/579.php.expect
diff --git a/hphp/test/tcr/variant/580.php b/hphp/test/slow/variant/580.php
similarity index 100%
rename from hphp/test/tcr/variant/580.php
rename to hphp/test/slow/variant/580.php
diff --git a/hphp/test/tcr/variant/580.php.expect b/hphp/test/slow/variant/580.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/580.php.expect
rename to hphp/test/slow/variant/580.php.expect
diff --git a/hphp/test/tcr/variant/581.php b/hphp/test/slow/variant/581.php
similarity index 100%
rename from hphp/test/tcr/variant/581.php
rename to hphp/test/slow/variant/581.php
diff --git a/hphp/test/tcr/variant/581.php.expect b/hphp/test/slow/variant/581.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/581.php.expect
rename to hphp/test/slow/variant/581.php.expect
diff --git a/hphp/test/tcr/variant/582.php b/hphp/test/slow/variant/582.php
similarity index 100%
rename from hphp/test/tcr/variant/582.php
rename to hphp/test/slow/variant/582.php
diff --git a/hphp/test/tcr/variant/582.php.expect b/hphp/test/slow/variant/582.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/582.php.expect
rename to hphp/test/slow/variant/582.php.expect
diff --git a/hphp/test/tcr/variant/583.php b/hphp/test/slow/variant/583.php
similarity index 100%
rename from hphp/test/tcr/variant/583.php
rename to hphp/test/slow/variant/583.php
diff --git a/hphp/test/tcr/variant/583.php.expect b/hphp/test/slow/variant/583.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/583.php.expect
rename to hphp/test/slow/variant/583.php.expect
diff --git a/hphp/test/tcr/variant/584.php b/hphp/test/slow/variant/584.php
similarity index 100%
rename from hphp/test/tcr/variant/584.php
rename to hphp/test/slow/variant/584.php
diff --git a/hphp/test/tcr/variant/584.php.expect b/hphp/test/slow/variant/584.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/584.php.expect
rename to hphp/test/slow/variant/584.php.expect
diff --git a/hphp/test/tcr/variant/585.php b/hphp/test/slow/variant/585.php
similarity index 100%
rename from hphp/test/tcr/variant/585.php
rename to hphp/test/slow/variant/585.php
diff --git a/hphp/test/tcr/variant/585.php.expect b/hphp/test/slow/variant/585.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/585.php.expect
rename to hphp/test/slow/variant/585.php.expect
diff --git a/hphp/test/tcr/variant/586.php b/hphp/test/slow/variant/586.php
similarity index 100%
rename from hphp/test/tcr/variant/586.php
rename to hphp/test/slow/variant/586.php
diff --git a/hphp/test/tcr/variant/586.php.expect b/hphp/test/slow/variant/586.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/586.php.expect
rename to hphp/test/slow/variant/586.php.expect
diff --git a/hphp/test/tcr/variant/587.php b/hphp/test/slow/variant/587.php
similarity index 100%
rename from hphp/test/tcr/variant/587.php
rename to hphp/test/slow/variant/587.php
diff --git a/hphp/test/tcr/variant/587.php.expect b/hphp/test/slow/variant/587.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/587.php.expect
rename to hphp/test/slow/variant/587.php.expect
diff --git a/hphp/test/tcr/variant/588.php b/hphp/test/slow/variant/588.php
similarity index 100%
rename from hphp/test/tcr/variant/588.php
rename to hphp/test/slow/variant/588.php
diff --git a/hphp/test/tcr/variant/588.php.expect b/hphp/test/slow/variant/588.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/588.php.expect
rename to hphp/test/slow/variant/588.php.expect
diff --git a/hphp/test/tcr/variant/589.php b/hphp/test/slow/variant/589.php
similarity index 100%
rename from hphp/test/tcr/variant/589.php
rename to hphp/test/slow/variant/589.php
diff --git a/hphp/test/tcr/variant/589.php.expect b/hphp/test/slow/variant/589.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/589.php.expect
rename to hphp/test/slow/variant/589.php.expect
diff --git a/hphp/test/tcr/variant/590.php b/hphp/test/slow/variant/590.php
similarity index 100%
rename from hphp/test/tcr/variant/590.php
rename to hphp/test/slow/variant/590.php
diff --git a/hphp/test/tcr/variant/590.php.expect b/hphp/test/slow/variant/590.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/590.php.expect
rename to hphp/test/slow/variant/590.php.expect
diff --git a/hphp/test/tcr/variant/591.php b/hphp/test/slow/variant/591.php
similarity index 100%
rename from hphp/test/tcr/variant/591.php
rename to hphp/test/slow/variant/591.php
diff --git a/hphp/test/tcr/variant/591.php.expect b/hphp/test/slow/variant/591.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/591.php.expect
rename to hphp/test/slow/variant/591.php.expect
diff --git a/hphp/test/tcr/variant/592.php b/hphp/test/slow/variant/592.php
similarity index 100%
rename from hphp/test/tcr/variant/592.php
rename to hphp/test/slow/variant/592.php
diff --git a/hphp/test/tcr/variant/592.php.expect b/hphp/test/slow/variant/592.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/592.php.expect
rename to hphp/test/slow/variant/592.php.expect
diff --git a/hphp/test/tcr/variant/593.php b/hphp/test/slow/variant/593.php
similarity index 100%
rename from hphp/test/tcr/variant/593.php
rename to hphp/test/slow/variant/593.php
diff --git a/hphp/test/tcr/variant/593.php.expect b/hphp/test/slow/variant/593.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/593.php.expect
rename to hphp/test/slow/variant/593.php.expect
diff --git a/hphp/test/tcr/variant/594.php b/hphp/test/slow/variant/594.php
similarity index 100%
rename from hphp/test/tcr/variant/594.php
rename to hphp/test/slow/variant/594.php
diff --git a/hphp/test/tcr/variant/594.php.expect b/hphp/test/slow/variant/594.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/594.php.expect
rename to hphp/test/slow/variant/594.php.expect
diff --git a/hphp/test/tcr/variant/595.php b/hphp/test/slow/variant/595.php
similarity index 100%
rename from hphp/test/tcr/variant/595.php
rename to hphp/test/slow/variant/595.php
diff --git a/hphp/test/tcr/variant/595.php.expect b/hphp/test/slow/variant/595.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/595.php.expect
rename to hphp/test/slow/variant/595.php.expect
diff --git a/hphp/test/tcr/variant/596.php b/hphp/test/slow/variant/596.php
similarity index 100%
rename from hphp/test/tcr/variant/596.php
rename to hphp/test/slow/variant/596.php
diff --git a/hphp/test/tcr/variant/596.php.expect b/hphp/test/slow/variant/596.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/596.php.expect
rename to hphp/test/slow/variant/596.php.expect
diff --git a/hphp/test/tcr/variant/597.php b/hphp/test/slow/variant/597.php
similarity index 100%
rename from hphp/test/tcr/variant/597.php
rename to hphp/test/slow/variant/597.php
diff --git a/hphp/test/tcr/variant/597.php.expect b/hphp/test/slow/variant/597.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/597.php.expect
rename to hphp/test/slow/variant/597.php.expect
diff --git a/hphp/test/tcr/variant/598.php b/hphp/test/slow/variant/598.php
similarity index 100%
rename from hphp/test/tcr/variant/598.php
rename to hphp/test/slow/variant/598.php
diff --git a/hphp/test/tcr/variant/598.php.expect b/hphp/test/slow/variant/598.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/598.php.expect
rename to hphp/test/slow/variant/598.php.expect
diff --git a/hphp/test/tcr/variant/599.php b/hphp/test/slow/variant/599.php
similarity index 100%
rename from hphp/test/tcr/variant/599.php
rename to hphp/test/slow/variant/599.php
diff --git a/hphp/test/tcr/variant/599.php.expect b/hphp/test/slow/variant/599.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/599.php.expect
rename to hphp/test/slow/variant/599.php.expect
diff --git a/hphp/test/tcr/variant/600.php b/hphp/test/slow/variant/600.php
similarity index 100%
rename from hphp/test/tcr/variant/600.php
rename to hphp/test/slow/variant/600.php
diff --git a/hphp/test/tcr/variant/600.php.expect b/hphp/test/slow/variant/600.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/600.php.expect
rename to hphp/test/slow/variant/600.php.expect
diff --git a/hphp/test/tcr/variant/601.php b/hphp/test/slow/variant/601.php
similarity index 100%
rename from hphp/test/tcr/variant/601.php
rename to hphp/test/slow/variant/601.php
diff --git a/hphp/test/tcr/variant/601.php.expect b/hphp/test/slow/variant/601.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/601.php.expect
rename to hphp/test/slow/variant/601.php.expect
diff --git a/hphp/test/tcr/variant/602.php b/hphp/test/slow/variant/602.php
similarity index 100%
rename from hphp/test/tcr/variant/602.php
rename to hphp/test/slow/variant/602.php
diff --git a/hphp/test/tcr/variant/602.php.expect b/hphp/test/slow/variant/602.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/602.php.expect
rename to hphp/test/slow/variant/602.php.expect
diff --git a/hphp/test/tcr/variant/603.php b/hphp/test/slow/variant/603.php
similarity index 100%
rename from hphp/test/tcr/variant/603.php
rename to hphp/test/slow/variant/603.php
diff --git a/hphp/test/tcr/variant/603.php.expect b/hphp/test/slow/variant/603.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/603.php.expect
rename to hphp/test/slow/variant/603.php.expect
diff --git a/hphp/test/tcr/variant/604.php b/hphp/test/slow/variant/604.php
similarity index 100%
rename from hphp/test/tcr/variant/604.php
rename to hphp/test/slow/variant/604.php
diff --git a/hphp/test/tcr/variant/604.php.expect b/hphp/test/slow/variant/604.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/604.php.expect
rename to hphp/test/slow/variant/604.php.expect
diff --git a/hphp/test/tcr/variant/605.php b/hphp/test/slow/variant/605.php
similarity index 100%
rename from hphp/test/tcr/variant/605.php
rename to hphp/test/slow/variant/605.php
diff --git a/hphp/test/tcr/variant/605.php.expect b/hphp/test/slow/variant/605.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/605.php.expect
rename to hphp/test/slow/variant/605.php.expect
diff --git a/hphp/test/tcr/variant/606.php b/hphp/test/slow/variant/606.php
similarity index 100%
rename from hphp/test/tcr/variant/606.php
rename to hphp/test/slow/variant/606.php
diff --git a/hphp/test/tcr/variant/606.php.expect b/hphp/test/slow/variant/606.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/606.php.expect
rename to hphp/test/slow/variant/606.php.expect
diff --git a/hphp/test/tcr/variant/607.php b/hphp/test/slow/variant/607.php
similarity index 100%
rename from hphp/test/tcr/variant/607.php
rename to hphp/test/slow/variant/607.php
diff --git a/hphp/test/tcr/variant/607.php.expect b/hphp/test/slow/variant/607.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/607.php.expect
rename to hphp/test/slow/variant/607.php.expect
diff --git a/hphp/test/tcr/variant/608.php b/hphp/test/slow/variant/608.php
similarity index 100%
rename from hphp/test/tcr/variant/608.php
rename to hphp/test/slow/variant/608.php
diff --git a/hphp/test/tcr/variant/608.php.expect b/hphp/test/slow/variant/608.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/608.php.expect
rename to hphp/test/slow/variant/608.php.expect
diff --git a/hphp/test/tcr/variant/609.php b/hphp/test/slow/variant/609.php
similarity index 100%
rename from hphp/test/tcr/variant/609.php
rename to hphp/test/slow/variant/609.php
diff --git a/hphp/test/tcr/variant/609.php.expect b/hphp/test/slow/variant/609.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/609.php.expect
rename to hphp/test/slow/variant/609.php.expect
diff --git a/hphp/test/tcr/variant/610.php b/hphp/test/slow/variant/610.php
similarity index 100%
rename from hphp/test/tcr/variant/610.php
rename to hphp/test/slow/variant/610.php
diff --git a/hphp/test/tcr/variant/610.php.expect b/hphp/test/slow/variant/610.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/610.php.expect
rename to hphp/test/slow/variant/610.php.expect
diff --git a/hphp/test/tcr/variant/611.php b/hphp/test/slow/variant/611.php
similarity index 100%
rename from hphp/test/tcr/variant/611.php
rename to hphp/test/slow/variant/611.php
diff --git a/hphp/test/tcr/variant/611.php.expect b/hphp/test/slow/variant/611.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/611.php.expect
rename to hphp/test/slow/variant/611.php.expect
diff --git a/hphp/test/tcr/variant/612.php b/hphp/test/slow/variant/612.php
similarity index 100%
rename from hphp/test/tcr/variant/612.php
rename to hphp/test/slow/variant/612.php
diff --git a/hphp/test/tcr/variant/612.php.expect b/hphp/test/slow/variant/612.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/612.php.expect
rename to hphp/test/slow/variant/612.php.expect
diff --git a/hphp/test/tcr/variant/613.php b/hphp/test/slow/variant/613.php
similarity index 100%
rename from hphp/test/tcr/variant/613.php
rename to hphp/test/slow/variant/613.php
diff --git a/hphp/test/tcr/variant/613.php.expect b/hphp/test/slow/variant/613.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/613.php.expect
rename to hphp/test/slow/variant/613.php.expect
diff --git a/hphp/test/tcr/variant/614.php b/hphp/test/slow/variant/614.php
similarity index 100%
rename from hphp/test/tcr/variant/614.php
rename to hphp/test/slow/variant/614.php
diff --git a/hphp/test/tcr/variant/614.php.expect b/hphp/test/slow/variant/614.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/614.php.expect
rename to hphp/test/slow/variant/614.php.expect
diff --git a/hphp/test/tcr/variant/615.php b/hphp/test/slow/variant/615.php
similarity index 100%
rename from hphp/test/tcr/variant/615.php
rename to hphp/test/slow/variant/615.php
diff --git a/hphp/test/tcr/variant/615.php.expect b/hphp/test/slow/variant/615.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/615.php.expect
rename to hphp/test/slow/variant/615.php.expect
diff --git a/hphp/test/tcr/variant/616.php b/hphp/test/slow/variant/616.php
similarity index 100%
rename from hphp/test/tcr/variant/616.php
rename to hphp/test/slow/variant/616.php
diff --git a/hphp/test/tcr/variant/616.php.expect b/hphp/test/slow/variant/616.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/616.php.expect
rename to hphp/test/slow/variant/616.php.expect
diff --git a/hphp/test/tcr/variant/617.php b/hphp/test/slow/variant/617.php
similarity index 100%
rename from hphp/test/tcr/variant/617.php
rename to hphp/test/slow/variant/617.php
diff --git a/hphp/test/tcr/variant/617.php.expect b/hphp/test/slow/variant/617.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/617.php.expect
rename to hphp/test/slow/variant/617.php.expect
diff --git a/hphp/test/tcr/variant/618.php b/hphp/test/slow/variant/618.php
similarity index 100%
rename from hphp/test/tcr/variant/618.php
rename to hphp/test/slow/variant/618.php
diff --git a/hphp/test/tcr/variant/618.php.expect b/hphp/test/slow/variant/618.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/618.php.expect
rename to hphp/test/slow/variant/618.php.expect
diff --git a/hphp/test/tcr/variant/619.php b/hphp/test/slow/variant/619.php
similarity index 100%
rename from hphp/test/tcr/variant/619.php
rename to hphp/test/slow/variant/619.php
diff --git a/hphp/test/tcr/variant/619.php.expect b/hphp/test/slow/variant/619.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/619.php.expect
rename to hphp/test/slow/variant/619.php.expect
diff --git a/hphp/test/tcr/variant/620.php b/hphp/test/slow/variant/620.php
similarity index 100%
rename from hphp/test/tcr/variant/620.php
rename to hphp/test/slow/variant/620.php
diff --git a/hphp/test/tcr/variant/620.php.expect b/hphp/test/slow/variant/620.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/620.php.expect
rename to hphp/test/slow/variant/620.php.expect
diff --git a/hphp/test/tcr/variant/621.php b/hphp/test/slow/variant/621.php
similarity index 100%
rename from hphp/test/tcr/variant/621.php
rename to hphp/test/slow/variant/621.php
diff --git a/hphp/test/tcr/variant/621.php.expect b/hphp/test/slow/variant/621.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/621.php.expect
rename to hphp/test/slow/variant/621.php.expect
diff --git a/hphp/test/tcr/variant/622.php b/hphp/test/slow/variant/622.php
similarity index 100%
rename from hphp/test/tcr/variant/622.php
rename to hphp/test/slow/variant/622.php
diff --git a/hphp/test/tcr/variant/622.php.expect b/hphp/test/slow/variant/622.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/622.php.expect
rename to hphp/test/slow/variant/622.php.expect
diff --git a/hphp/test/tcr/variant/623.php b/hphp/test/slow/variant/623.php
similarity index 100%
rename from hphp/test/tcr/variant/623.php
rename to hphp/test/slow/variant/623.php
diff --git a/hphp/test/tcr/variant/623.php.expect b/hphp/test/slow/variant/623.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/623.php.expect
rename to hphp/test/slow/variant/623.php.expect
diff --git a/hphp/test/tcr/variant/624.php b/hphp/test/slow/variant/624.php
similarity index 100%
rename from hphp/test/tcr/variant/624.php
rename to hphp/test/slow/variant/624.php
diff --git a/hphp/test/tcr/variant/624.php.expect b/hphp/test/slow/variant/624.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/624.php.expect
rename to hphp/test/slow/variant/624.php.expect
diff --git a/hphp/test/tcr/variant/625.php b/hphp/test/slow/variant/625.php
similarity index 100%
rename from hphp/test/tcr/variant/625.php
rename to hphp/test/slow/variant/625.php
diff --git a/hphp/test/tcr/variant/625.php.expect b/hphp/test/slow/variant/625.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/625.php.expect
rename to hphp/test/slow/variant/625.php.expect
diff --git a/hphp/test/tcr/variant/626.php b/hphp/test/slow/variant/626.php
similarity index 100%
rename from hphp/test/tcr/variant/626.php
rename to hphp/test/slow/variant/626.php
diff --git a/hphp/test/tcr/variant/626.php.expect b/hphp/test/slow/variant/626.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/626.php.expect
rename to hphp/test/slow/variant/626.php.expect
diff --git a/hphp/test/tcr/variant/627.php b/hphp/test/slow/variant/627.php
similarity index 100%
rename from hphp/test/tcr/variant/627.php
rename to hphp/test/slow/variant/627.php
diff --git a/hphp/test/tcr/variant/627.php.expect b/hphp/test/slow/variant/627.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/627.php.expect
rename to hphp/test/slow/variant/627.php.expect
diff --git a/hphp/test/tcr/variant/628.php b/hphp/test/slow/variant/628.php
similarity index 100%
rename from hphp/test/tcr/variant/628.php
rename to hphp/test/slow/variant/628.php
diff --git a/hphp/test/tcr/variant/628.php.expect b/hphp/test/slow/variant/628.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/628.php.expect
rename to hphp/test/slow/variant/628.php.expect
diff --git a/hphp/test/tcr/variant/629.php b/hphp/test/slow/variant/629.php
similarity index 100%
rename from hphp/test/tcr/variant/629.php
rename to hphp/test/slow/variant/629.php
diff --git a/hphp/test/tcr/variant/629.php.expect b/hphp/test/slow/variant/629.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/629.php.expect
rename to hphp/test/slow/variant/629.php.expect
diff --git a/hphp/test/tcr/variant/630.php b/hphp/test/slow/variant/630.php
similarity index 100%
rename from hphp/test/tcr/variant/630.php
rename to hphp/test/slow/variant/630.php
diff --git a/hphp/test/tcr/variant/630.php.expect b/hphp/test/slow/variant/630.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/630.php.expect
rename to hphp/test/slow/variant/630.php.expect
diff --git a/hphp/test/tcr/variant/631.php b/hphp/test/slow/variant/631.php
similarity index 100%
rename from hphp/test/tcr/variant/631.php
rename to hphp/test/slow/variant/631.php
diff --git a/hphp/test/tcr/variant/631.php.expect b/hphp/test/slow/variant/631.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/631.php.expect
rename to hphp/test/slow/variant/631.php.expect
diff --git a/hphp/test/tcr/variant/632.php b/hphp/test/slow/variant/632.php
similarity index 100%
rename from hphp/test/tcr/variant/632.php
rename to hphp/test/slow/variant/632.php
diff --git a/hphp/test/tcr/variant/632.php.expect b/hphp/test/slow/variant/632.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/632.php.expect
rename to hphp/test/slow/variant/632.php.expect
diff --git a/hphp/test/tcr/variant/633.php b/hphp/test/slow/variant/633.php
similarity index 100%
rename from hphp/test/tcr/variant/633.php
rename to hphp/test/slow/variant/633.php
diff --git a/hphp/test/tcr/variant/633.php.expect b/hphp/test/slow/variant/633.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/633.php.expect
rename to hphp/test/slow/variant/633.php.expect
diff --git a/hphp/test/tcr/variant/634.php b/hphp/test/slow/variant/634.php
similarity index 100%
rename from hphp/test/tcr/variant/634.php
rename to hphp/test/slow/variant/634.php
diff --git a/hphp/test/tcr/variant/634.php.expect b/hphp/test/slow/variant/634.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/634.php.expect
rename to hphp/test/slow/variant/634.php.expect
diff --git a/hphp/test/tcr/variant/635.php b/hphp/test/slow/variant/635.php
similarity index 100%
rename from hphp/test/tcr/variant/635.php
rename to hphp/test/slow/variant/635.php
diff --git a/hphp/test/tcr/variant/635.php.expect b/hphp/test/slow/variant/635.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/635.php.expect
rename to hphp/test/slow/variant/635.php.expect
diff --git a/hphp/test/tcr/variant/636.php b/hphp/test/slow/variant/636.php
similarity index 100%
rename from hphp/test/tcr/variant/636.php
rename to hphp/test/slow/variant/636.php
diff --git a/hphp/test/tcr/variant/636.php.expect b/hphp/test/slow/variant/636.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/636.php.expect
rename to hphp/test/slow/variant/636.php.expect
diff --git a/hphp/test/tcr/variant/637.php b/hphp/test/slow/variant/637.php
similarity index 100%
rename from hphp/test/tcr/variant/637.php
rename to hphp/test/slow/variant/637.php
diff --git a/hphp/test/tcr/variant/637.php.expect b/hphp/test/slow/variant/637.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/637.php.expect
rename to hphp/test/slow/variant/637.php.expect
diff --git a/hphp/test/tcr/variant/638.php b/hphp/test/slow/variant/638.php
similarity index 100%
rename from hphp/test/tcr/variant/638.php
rename to hphp/test/slow/variant/638.php
diff --git a/hphp/test/tcr/variant/638.php.expect b/hphp/test/slow/variant/638.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/638.php.expect
rename to hphp/test/slow/variant/638.php.expect
diff --git a/hphp/test/tcr/variant/639.php b/hphp/test/slow/variant/639.php
similarity index 100%
rename from hphp/test/tcr/variant/639.php
rename to hphp/test/slow/variant/639.php
diff --git a/hphp/test/tcr/variant/639.php.expect b/hphp/test/slow/variant/639.php.expect
similarity index 100%
rename from hphp/test/tcr/variant/639.php.expect
rename to hphp/test/slow/variant/639.php.expect
diff --git a/hphp/test/tcr/volatile/1215.php b/hphp/test/slow/volatile/1215.php
similarity index 100%
rename from hphp/test/tcr/volatile/1215.php
rename to hphp/test/slow/volatile/1215.php
diff --git a/hphp/test/tcr/volatile/1215.php.expect b/hphp/test/slow/volatile/1215.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1215.php.expect
rename to hphp/test/slow/volatile/1215.php.expect
diff --git a/hphp/test/tcr/volatile/1216.php b/hphp/test/slow/volatile/1216.php
similarity index 100%
rename from hphp/test/tcr/volatile/1216.php
rename to hphp/test/slow/volatile/1216.php
diff --git a/hphp/test/tcr/volatile/1216.php.expect b/hphp/test/slow/volatile/1216.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1216.php.expect
rename to hphp/test/slow/volatile/1216.php.expect
diff --git a/hphp/test/tcr/volatile/1217.php b/hphp/test/slow/volatile/1217.php
similarity index 100%
rename from hphp/test/tcr/volatile/1217.php
rename to hphp/test/slow/volatile/1217.php
diff --git a/hphp/test/tcr/volatile/1217.php.expect b/hphp/test/slow/volatile/1217.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1217.php.expect
rename to hphp/test/slow/volatile/1217.php.expect
diff --git a/hphp/test/tcr/volatile/1218.php b/hphp/test/slow/volatile/1218.php
similarity index 100%
rename from hphp/test/tcr/volatile/1218.php
rename to hphp/test/slow/volatile/1218.php
diff --git a/hphp/test/tcr/volatile/1218.php.expect b/hphp/test/slow/volatile/1218.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1218.php.expect
rename to hphp/test/slow/volatile/1218.php.expect
diff --git a/hphp/test/tcr/volatile/1219.php b/hphp/test/slow/volatile/1219.php
similarity index 100%
rename from hphp/test/tcr/volatile/1219.php
rename to hphp/test/slow/volatile/1219.php
diff --git a/hphp/test/tcr/volatile/1219.php.expect b/hphp/test/slow/volatile/1219.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1219.php.expect
rename to hphp/test/slow/volatile/1219.php.expect
diff --git a/hphp/test/tcr/volatile/1220.php b/hphp/test/slow/volatile/1220.php
similarity index 100%
rename from hphp/test/tcr/volatile/1220.php
rename to hphp/test/slow/volatile/1220.php
diff --git a/hphp/test/tcr/volatile/1220.php.expect b/hphp/test/slow/volatile/1220.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1220.php.expect
rename to hphp/test/slow/volatile/1220.php.expect
diff --git a/hphp/test/tcr/volatile/1221.php b/hphp/test/slow/volatile/1221.php
similarity index 100%
rename from hphp/test/tcr/volatile/1221.php
rename to hphp/test/slow/volatile/1221.php
diff --git a/hphp/test/tcr/volatile/1221.php.expect b/hphp/test/slow/volatile/1221.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1221.php.expect
rename to hphp/test/slow/volatile/1221.php.expect
diff --git a/hphp/test/tcr/volatile/1222.php b/hphp/test/slow/volatile/1222.php
similarity index 100%
rename from hphp/test/tcr/volatile/1222.php
rename to hphp/test/slow/volatile/1222.php
diff --git a/hphp/test/tcr/volatile/1222.php.expect b/hphp/test/slow/volatile/1222.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1222.php.expect
rename to hphp/test/slow/volatile/1222.php.expect
diff --git a/hphp/test/tcr/volatile/1223.php b/hphp/test/slow/volatile/1223.php
similarity index 100%
rename from hphp/test/tcr/volatile/1223.php
rename to hphp/test/slow/volatile/1223.php
diff --git a/hphp/test/slow/volatile/1223.php.expect b/hphp/test/slow/volatile/1223.php.expect
new file mode 100644
index 000000000..e69de29bb
diff --git a/hphp/test/tcr/volatile/1224.php b/hphp/test/slow/volatile/1224.php
similarity index 100%
rename from hphp/test/tcr/volatile/1224.php
rename to hphp/test/slow/volatile/1224.php
diff --git a/hphp/test/tcr/volatile/1224.php.expect b/hphp/test/slow/volatile/1224.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1224.php.expect
rename to hphp/test/slow/volatile/1224.php.expect
diff --git a/hphp/test/tcr/volatile/1225.php b/hphp/test/slow/volatile/1225.php
similarity index 100%
rename from hphp/test/tcr/volatile/1225.php
rename to hphp/test/slow/volatile/1225.php
diff --git a/hphp/test/tcr/volatile/1225.php.expect b/hphp/test/slow/volatile/1225.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1225.php.expect
rename to hphp/test/slow/volatile/1225.php.expect
diff --git a/hphp/test/tcr/volatile/1226.php b/hphp/test/slow/volatile/1226.php
similarity index 100%
rename from hphp/test/tcr/volatile/1226.php
rename to hphp/test/slow/volatile/1226.php
diff --git a/hphp/test/tcr/volatile/1226.php.expect b/hphp/test/slow/volatile/1226.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1226.php.expect
rename to hphp/test/slow/volatile/1226.php.expect
diff --git a/hphp/test/tcr/volatile/1227.php b/hphp/test/slow/volatile/1227.php
similarity index 100%
rename from hphp/test/tcr/volatile/1227.php
rename to hphp/test/slow/volatile/1227.php
diff --git a/hphp/test/tcr/volatile/1227.php.expect b/hphp/test/slow/volatile/1227.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1227.php.expect
rename to hphp/test/slow/volatile/1227.php.expect
diff --git a/hphp/test/tcr/volatile/1228.php b/hphp/test/slow/volatile/1228.php
similarity index 100%
rename from hphp/test/tcr/volatile/1228.php
rename to hphp/test/slow/volatile/1228.php
diff --git a/hphp/test/tcr/volatile/1228.php.expect b/hphp/test/slow/volatile/1228.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1228.php.expect
rename to hphp/test/slow/volatile/1228.php.expect
diff --git a/hphp/test/tcr/volatile/1229.php b/hphp/test/slow/volatile/1229.php
similarity index 100%
rename from hphp/test/tcr/volatile/1229.php
rename to hphp/test/slow/volatile/1229.php
diff --git a/hphp/test/tcr/volatile/1229.php.expect b/hphp/test/slow/volatile/1229.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1229.php.expect
rename to hphp/test/slow/volatile/1229.php.expect
diff --git a/hphp/test/tcr/volatile/1230.php b/hphp/test/slow/volatile/1230.php
similarity index 100%
rename from hphp/test/tcr/volatile/1230.php
rename to hphp/test/slow/volatile/1230.php
diff --git a/hphp/test/tcr/volatile/1230.php.expect b/hphp/test/slow/volatile/1230.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1230.php.expect
rename to hphp/test/slow/volatile/1230.php.expect
diff --git a/hphp/test/tcr/volatile/1231.php b/hphp/test/slow/volatile/1231.php
similarity index 100%
rename from hphp/test/tcr/volatile/1231.php
rename to hphp/test/slow/volatile/1231.php
diff --git a/hphp/test/tcr/volatile/1231.php.expect b/hphp/test/slow/volatile/1231.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1231.php.expect
rename to hphp/test/slow/volatile/1231.php.expect
diff --git a/hphp/test/tcr/volatile/1232.php b/hphp/test/slow/volatile/1232.php
similarity index 100%
rename from hphp/test/tcr/volatile/1232.php
rename to hphp/test/slow/volatile/1232.php
diff --git a/hphp/test/tcr/volatile/1232.php.expect b/hphp/test/slow/volatile/1232.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1232.php.expect
rename to hphp/test/slow/volatile/1232.php.expect
diff --git a/hphp/test/tcr/volatile/1233.php b/hphp/test/slow/volatile/1233.php
similarity index 100%
rename from hphp/test/tcr/volatile/1233.php
rename to hphp/test/slow/volatile/1233.php
diff --git a/hphp/test/tcr/volatile/1233.php.expect b/hphp/test/slow/volatile/1233.php.expect
similarity index 100%
rename from hphp/test/tcr/volatile/1233.php.expect
rename to hphp/test/slow/volatile/1233.php.expect
diff --git a/hphp/test/tcr/xhp.hphp_opts b/hphp/test/slow/xhp.hphp_opts
similarity index 100%
rename from hphp/test/tcr/xhp.hphp_opts
rename to hphp/test/slow/xhp.hphp_opts
diff --git a/hphp/test/tcr/xhp.opts b/hphp/test/slow/xhp.opts
similarity index 100%
rename from hphp/test/tcr/xhp.opts
rename to hphp/test/slow/xhp.opts
diff --git a/hphp/test/tcr/xml/1667.php b/hphp/test/slow/xml/1667.php
similarity index 100%
rename from hphp/test/tcr/xml/1667.php
rename to hphp/test/slow/xml/1667.php
diff --git a/hphp/test/tcr/xml/1667.php.expect b/hphp/test/slow/xml/1667.php.expect
similarity index 100%
rename from hphp/test/tcr/xml/1667.php.expect
rename to hphp/test/slow/xml/1667.php.expect
diff --git a/hphp/test/tcr/xml/1668.php b/hphp/test/slow/xml/1668.php
similarity index 100%
rename from hphp/test/tcr/xml/1668.php
rename to hphp/test/slow/xml/1668.php
diff --git a/hphp/test/tcr/xml/1668.php.expect b/hphp/test/slow/xml/1668.php.expect
similarity index 100%
rename from hphp/test/tcr/xml/1668.php.expect
rename to hphp/test/slow/xml/1668.php.expect
diff --git a/hphp/test/tcr/yield/2141.php b/hphp/test/slow/yield/2141.php
similarity index 100%
rename from hphp/test/tcr/yield/2141.php
rename to hphp/test/slow/yield/2141.php
diff --git a/hphp/test/tcr/yield/2141.php.expect b/hphp/test/slow/yield/2141.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2141.php.expect
rename to hphp/test/slow/yield/2141.php.expect
diff --git a/hphp/test/tcr/yield/2141.php.hphp_opts b/hphp/test/slow/yield/2141.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2141.php.hphp_opts
rename to hphp/test/slow/yield/2141.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2141.php.opts b/hphp/test/slow/yield/2141.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2141.php.opts
rename to hphp/test/slow/yield/2141.php.opts
diff --git a/hphp/test/tcr/yield/2142.php b/hphp/test/slow/yield/2142.php
similarity index 100%
rename from hphp/test/tcr/yield/2142.php
rename to hphp/test/slow/yield/2142.php
diff --git a/hphp/test/tcr/yield/2142.php.expect b/hphp/test/slow/yield/2142.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2142.php.expect
rename to hphp/test/slow/yield/2142.php.expect
diff --git a/hphp/test/tcr/yield/2142.php.hphp_opts b/hphp/test/slow/yield/2142.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2142.php.hphp_opts
rename to hphp/test/slow/yield/2142.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2142.php.opts b/hphp/test/slow/yield/2142.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2142.php.opts
rename to hphp/test/slow/yield/2142.php.opts
diff --git a/hphp/test/tcr/yield/2143.php b/hphp/test/slow/yield/2143.php
similarity index 100%
rename from hphp/test/tcr/yield/2143.php
rename to hphp/test/slow/yield/2143.php
diff --git a/hphp/test/tcr/yield/2143.php.expect b/hphp/test/slow/yield/2143.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2143.php.expect
rename to hphp/test/slow/yield/2143.php.expect
diff --git a/hphp/test/tcr/yield/2143.php.hphp_opts b/hphp/test/slow/yield/2143.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2143.php.hphp_opts
rename to hphp/test/slow/yield/2143.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2143.php.opts b/hphp/test/slow/yield/2143.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2143.php.opts
rename to hphp/test/slow/yield/2143.php.opts
diff --git a/hphp/test/tcr/yield/2144.php b/hphp/test/slow/yield/2144.php
similarity index 100%
rename from hphp/test/tcr/yield/2144.php
rename to hphp/test/slow/yield/2144.php
diff --git a/hphp/test/tcr/yield/2144.php.expect b/hphp/test/slow/yield/2144.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2144.php.expect
rename to hphp/test/slow/yield/2144.php.expect
diff --git a/hphp/test/tcr/yield/2144.php.hphp_opts b/hphp/test/slow/yield/2144.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2144.php.hphp_opts
rename to hphp/test/slow/yield/2144.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2144.php.opts b/hphp/test/slow/yield/2144.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2144.php.opts
rename to hphp/test/slow/yield/2144.php.opts
diff --git a/hphp/test/tcr/yield/2145.php b/hphp/test/slow/yield/2145.php
similarity index 100%
rename from hphp/test/tcr/yield/2145.php
rename to hphp/test/slow/yield/2145.php
diff --git a/hphp/test/tcr/yield/2145.php.expect b/hphp/test/slow/yield/2145.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2145.php.expect
rename to hphp/test/slow/yield/2145.php.expect
diff --git a/hphp/test/tcr/yield/2145.php.hphp_opts b/hphp/test/slow/yield/2145.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2145.php.hphp_opts
rename to hphp/test/slow/yield/2145.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2145.php.opts b/hphp/test/slow/yield/2145.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2145.php.opts
rename to hphp/test/slow/yield/2145.php.opts
diff --git a/hphp/test/tcr/yield/2146.php b/hphp/test/slow/yield/2146.php
similarity index 100%
rename from hphp/test/tcr/yield/2146.php
rename to hphp/test/slow/yield/2146.php
diff --git a/hphp/test/tcr/yield/2146.php.expect b/hphp/test/slow/yield/2146.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2146.php.expect
rename to hphp/test/slow/yield/2146.php.expect
diff --git a/hphp/test/tcr/yield/2146.php.hphp_opts b/hphp/test/slow/yield/2146.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2146.php.hphp_opts
rename to hphp/test/slow/yield/2146.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2146.php.opts b/hphp/test/slow/yield/2146.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2146.php.opts
rename to hphp/test/slow/yield/2146.php.opts
diff --git a/hphp/test/tcr/yield/2147.php b/hphp/test/slow/yield/2147.php
similarity index 100%
rename from hphp/test/tcr/yield/2147.php
rename to hphp/test/slow/yield/2147.php
diff --git a/hphp/test/tcr/yield/2147.php.expect b/hphp/test/slow/yield/2147.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2147.php.expect
rename to hphp/test/slow/yield/2147.php.expect
diff --git a/hphp/test/tcr/yield/2147.php.hphp_opts b/hphp/test/slow/yield/2147.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2147.php.hphp_opts
rename to hphp/test/slow/yield/2147.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2147.php.opts b/hphp/test/slow/yield/2147.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2147.php.opts
rename to hphp/test/slow/yield/2147.php.opts
diff --git a/hphp/test/tcr/yield/2148.php b/hphp/test/slow/yield/2148.php
similarity index 100%
rename from hphp/test/tcr/yield/2148.php
rename to hphp/test/slow/yield/2148.php
diff --git a/hphp/test/tcr/yield/2148.php.expect b/hphp/test/slow/yield/2148.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2148.php.expect
rename to hphp/test/slow/yield/2148.php.expect
diff --git a/hphp/test/tcr/yield/2148.php.hphp_opts b/hphp/test/slow/yield/2148.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2148.php.hphp_opts
rename to hphp/test/slow/yield/2148.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2148.php.opts b/hphp/test/slow/yield/2148.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2148.php.opts
rename to hphp/test/slow/yield/2148.php.opts
diff --git a/hphp/test/tcr/yield/2149.php b/hphp/test/slow/yield/2149.php
similarity index 100%
rename from hphp/test/tcr/yield/2149.php
rename to hphp/test/slow/yield/2149.php
diff --git a/hphp/test/tcr/yield/2149.php.expect b/hphp/test/slow/yield/2149.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2149.php.expect
rename to hphp/test/slow/yield/2149.php.expect
diff --git a/hphp/test/tcr/yield/2149.php.hphp_opts b/hphp/test/slow/yield/2149.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2149.php.hphp_opts
rename to hphp/test/slow/yield/2149.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2149.php.opts b/hphp/test/slow/yield/2149.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2149.php.opts
rename to hphp/test/slow/yield/2149.php.opts
diff --git a/hphp/test/tcr/yield/2150.php b/hphp/test/slow/yield/2150.php
similarity index 100%
rename from hphp/test/tcr/yield/2150.php
rename to hphp/test/slow/yield/2150.php
diff --git a/hphp/test/tcr/yield/2150.php.expect b/hphp/test/slow/yield/2150.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2150.php.expect
rename to hphp/test/slow/yield/2150.php.expect
diff --git a/hphp/test/tcr/yield/2150.php.hphp_opts b/hphp/test/slow/yield/2150.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2150.php.hphp_opts
rename to hphp/test/slow/yield/2150.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2150.php.opts b/hphp/test/slow/yield/2150.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2150.php.opts
rename to hphp/test/slow/yield/2150.php.opts
diff --git a/hphp/test/tcr/yield/2151.php b/hphp/test/slow/yield/2151.php
similarity index 100%
rename from hphp/test/tcr/yield/2151.php
rename to hphp/test/slow/yield/2151.php
diff --git a/hphp/test/tcr/yield/2151.php.expect b/hphp/test/slow/yield/2151.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2151.php.expect
rename to hphp/test/slow/yield/2151.php.expect
diff --git a/hphp/test/tcr/yield/2151.php.hphp_opts b/hphp/test/slow/yield/2151.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2151.php.hphp_opts
rename to hphp/test/slow/yield/2151.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2151.php.opts b/hphp/test/slow/yield/2151.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2151.php.opts
rename to hphp/test/slow/yield/2151.php.opts
diff --git a/hphp/test/tcr/yield/2152.php b/hphp/test/slow/yield/2152.php
similarity index 100%
rename from hphp/test/tcr/yield/2152.php
rename to hphp/test/slow/yield/2152.php
diff --git a/hphp/test/tcr/yield/2152.php.expect b/hphp/test/slow/yield/2152.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2152.php.expect
rename to hphp/test/slow/yield/2152.php.expect
diff --git a/hphp/test/tcr/yield/2152.php.hphp_opts b/hphp/test/slow/yield/2152.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2152.php.hphp_opts
rename to hphp/test/slow/yield/2152.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2152.php.opts b/hphp/test/slow/yield/2152.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2152.php.opts
rename to hphp/test/slow/yield/2152.php.opts
diff --git a/hphp/test/tcr/yield/2153.php b/hphp/test/slow/yield/2153.php
similarity index 100%
rename from hphp/test/tcr/yield/2153.php
rename to hphp/test/slow/yield/2153.php
diff --git a/hphp/test/tcr/yield/2153.php.expect b/hphp/test/slow/yield/2153.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2153.php.expect
rename to hphp/test/slow/yield/2153.php.expect
diff --git a/hphp/test/tcr/yield/2153.php.hphp_opts b/hphp/test/slow/yield/2153.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2153.php.hphp_opts
rename to hphp/test/slow/yield/2153.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2153.php.opts b/hphp/test/slow/yield/2153.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2153.php.opts
rename to hphp/test/slow/yield/2153.php.opts
diff --git a/hphp/test/tcr/yield/2154.php b/hphp/test/slow/yield/2154.php
similarity index 100%
rename from hphp/test/tcr/yield/2154.php
rename to hphp/test/slow/yield/2154.php
diff --git a/hphp/test/tcr/yield/2154.php.expect b/hphp/test/slow/yield/2154.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2154.php.expect
rename to hphp/test/slow/yield/2154.php.expect
diff --git a/hphp/test/tcr/yield/2154.php.hphp_opts b/hphp/test/slow/yield/2154.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2154.php.hphp_opts
rename to hphp/test/slow/yield/2154.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2154.php.opts b/hphp/test/slow/yield/2154.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2154.php.opts
rename to hphp/test/slow/yield/2154.php.opts
diff --git a/hphp/test/tcr/yield/2155.php b/hphp/test/slow/yield/2155.php
similarity index 100%
rename from hphp/test/tcr/yield/2155.php
rename to hphp/test/slow/yield/2155.php
diff --git a/hphp/test/tcr/yield/2155.php.expect b/hphp/test/slow/yield/2155.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2155.php.expect
rename to hphp/test/slow/yield/2155.php.expect
diff --git a/hphp/test/tcr/yield/2155.php.hphp_opts b/hphp/test/slow/yield/2155.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2155.php.hphp_opts
rename to hphp/test/slow/yield/2155.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2155.php.opts b/hphp/test/slow/yield/2155.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2155.php.opts
rename to hphp/test/slow/yield/2155.php.opts
diff --git a/hphp/test/tcr/yield/2156.php b/hphp/test/slow/yield/2156.php
similarity index 100%
rename from hphp/test/tcr/yield/2156.php
rename to hphp/test/slow/yield/2156.php
diff --git a/hphp/test/tcr/yield/2156.php.expect b/hphp/test/slow/yield/2156.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2156.php.expect
rename to hphp/test/slow/yield/2156.php.expect
diff --git a/hphp/test/tcr/yield/2156.php.hphp_opts b/hphp/test/slow/yield/2156.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2156.php.hphp_opts
rename to hphp/test/slow/yield/2156.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2156.php.opts b/hphp/test/slow/yield/2156.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2156.php.opts
rename to hphp/test/slow/yield/2156.php.opts
diff --git a/hphp/test/tcr/yield/2157.php b/hphp/test/slow/yield/2157.php
similarity index 100%
rename from hphp/test/tcr/yield/2157.php
rename to hphp/test/slow/yield/2157.php
diff --git a/hphp/test/tcr/yield/2157.php.expect b/hphp/test/slow/yield/2157.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2157.php.expect
rename to hphp/test/slow/yield/2157.php.expect
diff --git a/hphp/test/tcr/yield/2157.php.hphp_opts b/hphp/test/slow/yield/2157.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2157.php.hphp_opts
rename to hphp/test/slow/yield/2157.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2157.php.opts b/hphp/test/slow/yield/2157.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2157.php.opts
rename to hphp/test/slow/yield/2157.php.opts
diff --git a/hphp/test/tcr/yield/2158.php b/hphp/test/slow/yield/2158.php
similarity index 100%
rename from hphp/test/tcr/yield/2158.php
rename to hphp/test/slow/yield/2158.php
diff --git a/hphp/test/tcr/yield/2158.php.expect b/hphp/test/slow/yield/2158.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2158.php.expect
rename to hphp/test/slow/yield/2158.php.expect
diff --git a/hphp/test/tcr/yield/2158.php.hphp_opts b/hphp/test/slow/yield/2158.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2158.php.hphp_opts
rename to hphp/test/slow/yield/2158.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2158.php.opts b/hphp/test/slow/yield/2158.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2158.php.opts
rename to hphp/test/slow/yield/2158.php.opts
diff --git a/hphp/test/tcr/yield/2159.php b/hphp/test/slow/yield/2159.php
similarity index 100%
rename from hphp/test/tcr/yield/2159.php
rename to hphp/test/slow/yield/2159.php
diff --git a/hphp/test/tcr/yield/2159.php.expect b/hphp/test/slow/yield/2159.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2159.php.expect
rename to hphp/test/slow/yield/2159.php.expect
diff --git a/hphp/test/tcr/yield/2159.php.hphp_opts b/hphp/test/slow/yield/2159.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2159.php.hphp_opts
rename to hphp/test/slow/yield/2159.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2159.php.opts b/hphp/test/slow/yield/2159.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2159.php.opts
rename to hphp/test/slow/yield/2159.php.opts
diff --git a/hphp/test/tcr/yield/2160.php b/hphp/test/slow/yield/2160.php
similarity index 100%
rename from hphp/test/tcr/yield/2160.php
rename to hphp/test/slow/yield/2160.php
diff --git a/hphp/test/tcr/yield/2160.php.expect b/hphp/test/slow/yield/2160.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2160.php.expect
rename to hphp/test/slow/yield/2160.php.expect
diff --git a/hphp/test/tcr/yield/2160.php.hphp_opts b/hphp/test/slow/yield/2160.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2160.php.hphp_opts
rename to hphp/test/slow/yield/2160.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2160.php.opts b/hphp/test/slow/yield/2160.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2160.php.opts
rename to hphp/test/slow/yield/2160.php.opts
diff --git a/hphp/test/tcr/yield/2161.php b/hphp/test/slow/yield/2161.php
similarity index 100%
rename from hphp/test/tcr/yield/2161.php
rename to hphp/test/slow/yield/2161.php
diff --git a/hphp/test/tcr/yield/2161.php.expect b/hphp/test/slow/yield/2161.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2161.php.expect
rename to hphp/test/slow/yield/2161.php.expect
diff --git a/hphp/test/tcr/yield/2161.php.hphp_opts b/hphp/test/slow/yield/2161.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2161.php.hphp_opts
rename to hphp/test/slow/yield/2161.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2161.php.opts b/hphp/test/slow/yield/2161.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2161.php.opts
rename to hphp/test/slow/yield/2161.php.opts
diff --git a/hphp/test/tcr/yield/2162.php b/hphp/test/slow/yield/2162.php
similarity index 100%
rename from hphp/test/tcr/yield/2162.php
rename to hphp/test/slow/yield/2162.php
diff --git a/hphp/test/tcr/yield/2162.php.expect b/hphp/test/slow/yield/2162.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2162.php.expect
rename to hphp/test/slow/yield/2162.php.expect
diff --git a/hphp/test/tcr/yield/2162.php.hphp_opts b/hphp/test/slow/yield/2162.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2162.php.hphp_opts
rename to hphp/test/slow/yield/2162.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2162.php.opts b/hphp/test/slow/yield/2162.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2162.php.opts
rename to hphp/test/slow/yield/2162.php.opts
diff --git a/hphp/test/tcr/yield/2163.php b/hphp/test/slow/yield/2163.php
similarity index 100%
rename from hphp/test/tcr/yield/2163.php
rename to hphp/test/slow/yield/2163.php
diff --git a/hphp/test/tcr/yield/2163.php.expect b/hphp/test/slow/yield/2163.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2163.php.expect
rename to hphp/test/slow/yield/2163.php.expect
diff --git a/hphp/test/tcr/yield/2163.php.hphp_opts b/hphp/test/slow/yield/2163.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2163.php.hphp_opts
rename to hphp/test/slow/yield/2163.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2163.php.opts b/hphp/test/slow/yield/2163.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2163.php.opts
rename to hphp/test/slow/yield/2163.php.opts
diff --git a/hphp/test/tcr/yield/2164.php b/hphp/test/slow/yield/2164.php
similarity index 100%
rename from hphp/test/tcr/yield/2164.php
rename to hphp/test/slow/yield/2164.php
diff --git a/hphp/test/tcr/yield/2164.php.expect b/hphp/test/slow/yield/2164.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2164.php.expect
rename to hphp/test/slow/yield/2164.php.expect
diff --git a/hphp/test/tcr/yield/2164.php.hphp_opts b/hphp/test/slow/yield/2164.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2164.php.hphp_opts
rename to hphp/test/slow/yield/2164.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2164.php.opts b/hphp/test/slow/yield/2164.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2164.php.opts
rename to hphp/test/slow/yield/2164.php.opts
diff --git a/hphp/test/tcr/yield/2165.php b/hphp/test/slow/yield/2165.php
similarity index 100%
rename from hphp/test/tcr/yield/2165.php
rename to hphp/test/slow/yield/2165.php
diff --git a/hphp/test/tcr/yield/2165.php.expect b/hphp/test/slow/yield/2165.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2165.php.expect
rename to hphp/test/slow/yield/2165.php.expect
diff --git a/hphp/test/tcr/yield/2165.php.hphp_opts b/hphp/test/slow/yield/2165.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2165.php.hphp_opts
rename to hphp/test/slow/yield/2165.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2165.php.opts b/hphp/test/slow/yield/2165.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2165.php.opts
rename to hphp/test/slow/yield/2165.php.opts
diff --git a/hphp/test/tcr/yield/2166.php b/hphp/test/slow/yield/2166.php
similarity index 100%
rename from hphp/test/tcr/yield/2166.php
rename to hphp/test/slow/yield/2166.php
diff --git a/hphp/test/tcr/yield/2166.php.expect b/hphp/test/slow/yield/2166.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2166.php.expect
rename to hphp/test/slow/yield/2166.php.expect
diff --git a/hphp/test/tcr/yield/2166.php.hphp_opts b/hphp/test/slow/yield/2166.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2166.php.hphp_opts
rename to hphp/test/slow/yield/2166.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2166.php.opts b/hphp/test/slow/yield/2166.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2166.php.opts
rename to hphp/test/slow/yield/2166.php.opts
diff --git a/hphp/test/tcr/yield/2167.php b/hphp/test/slow/yield/2167.php
similarity index 100%
rename from hphp/test/tcr/yield/2167.php
rename to hphp/test/slow/yield/2167.php
diff --git a/hphp/test/tcr/yield/2167.php.expect b/hphp/test/slow/yield/2167.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2167.php.expect
rename to hphp/test/slow/yield/2167.php.expect
diff --git a/hphp/test/tcr/yield/2167.php.hphp_opts b/hphp/test/slow/yield/2167.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2167.php.hphp_opts
rename to hphp/test/slow/yield/2167.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2167.php.opts b/hphp/test/slow/yield/2167.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2167.php.opts
rename to hphp/test/slow/yield/2167.php.opts
diff --git a/hphp/test/tcr/yield/2168.php b/hphp/test/slow/yield/2168.php
similarity index 100%
rename from hphp/test/tcr/yield/2168.php
rename to hphp/test/slow/yield/2168.php
diff --git a/hphp/test/tcr/yield/2168.php.expect b/hphp/test/slow/yield/2168.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2168.php.expect
rename to hphp/test/slow/yield/2168.php.expect
diff --git a/hphp/test/tcr/yield/2168.php.hphp_opts b/hphp/test/slow/yield/2168.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2168.php.hphp_opts
rename to hphp/test/slow/yield/2168.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2168.php.opts b/hphp/test/slow/yield/2168.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2168.php.opts
rename to hphp/test/slow/yield/2168.php.opts
diff --git a/hphp/test/tcr/yield/2169.php b/hphp/test/slow/yield/2169.php
similarity index 100%
rename from hphp/test/tcr/yield/2169.php
rename to hphp/test/slow/yield/2169.php
diff --git a/hphp/test/tcr/yield/2169.php.expect b/hphp/test/slow/yield/2169.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2169.php.expect
rename to hphp/test/slow/yield/2169.php.expect
diff --git a/hphp/test/tcr/yield/2169.php.hphp_opts b/hphp/test/slow/yield/2169.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2169.php.hphp_opts
rename to hphp/test/slow/yield/2169.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2169.php.opts b/hphp/test/slow/yield/2169.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2169.php.opts
rename to hphp/test/slow/yield/2169.php.opts
diff --git a/hphp/test/tcr/yield/2170.php b/hphp/test/slow/yield/2170.php
similarity index 100%
rename from hphp/test/tcr/yield/2170.php
rename to hphp/test/slow/yield/2170.php
diff --git a/hphp/test/tcr/yield/2170.php.expect b/hphp/test/slow/yield/2170.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2170.php.expect
rename to hphp/test/slow/yield/2170.php.expect
diff --git a/hphp/test/tcr/yield/2170.php.hphp_opts b/hphp/test/slow/yield/2170.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2170.php.hphp_opts
rename to hphp/test/slow/yield/2170.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2170.php.opts b/hphp/test/slow/yield/2170.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2170.php.opts
rename to hphp/test/slow/yield/2170.php.opts
diff --git a/hphp/test/tcr/yield/2171.php b/hphp/test/slow/yield/2171.php
similarity index 100%
rename from hphp/test/tcr/yield/2171.php
rename to hphp/test/slow/yield/2171.php
diff --git a/hphp/test/tcr/yield/2171.php.expect b/hphp/test/slow/yield/2171.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2171.php.expect
rename to hphp/test/slow/yield/2171.php.expect
diff --git a/hphp/test/tcr/yield/2171.php.hphp_opts b/hphp/test/slow/yield/2171.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2171.php.hphp_opts
rename to hphp/test/slow/yield/2171.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2171.php.opts b/hphp/test/slow/yield/2171.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2171.php.opts
rename to hphp/test/slow/yield/2171.php.opts
diff --git a/hphp/test/tcr/yield/2172.php b/hphp/test/slow/yield/2172.php
similarity index 100%
rename from hphp/test/tcr/yield/2172.php
rename to hphp/test/slow/yield/2172.php
diff --git a/hphp/test/tcr/yield/2172.php.expect b/hphp/test/slow/yield/2172.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2172.php.expect
rename to hphp/test/slow/yield/2172.php.expect
diff --git a/hphp/test/tcr/yield/2172.php.hphp_opts b/hphp/test/slow/yield/2172.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2172.php.hphp_opts
rename to hphp/test/slow/yield/2172.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2172.php.opts b/hphp/test/slow/yield/2172.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2172.php.opts
rename to hphp/test/slow/yield/2172.php.opts
diff --git a/hphp/test/tcr/yield/2173.php b/hphp/test/slow/yield/2173.php
similarity index 100%
rename from hphp/test/tcr/yield/2173.php
rename to hphp/test/slow/yield/2173.php
diff --git a/hphp/test/tcr/yield/2173.php.expect b/hphp/test/slow/yield/2173.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2173.php.expect
rename to hphp/test/slow/yield/2173.php.expect
diff --git a/hphp/test/tcr/yield/2173.php.hphp_opts b/hphp/test/slow/yield/2173.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2173.php.hphp_opts
rename to hphp/test/slow/yield/2173.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2173.php.opts b/hphp/test/slow/yield/2173.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2173.php.opts
rename to hphp/test/slow/yield/2173.php.opts
diff --git a/hphp/test/tcr/yield/2174.php b/hphp/test/slow/yield/2174.php
similarity index 100%
rename from hphp/test/tcr/yield/2174.php
rename to hphp/test/slow/yield/2174.php
diff --git a/hphp/test/tcr/yield/2174.php.expect b/hphp/test/slow/yield/2174.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2174.php.expect
rename to hphp/test/slow/yield/2174.php.expect
diff --git a/hphp/test/tcr/yield/2174.php.hphp_opts b/hphp/test/slow/yield/2174.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2174.php.hphp_opts
rename to hphp/test/slow/yield/2174.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2174.php.opts b/hphp/test/slow/yield/2174.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2174.php.opts
rename to hphp/test/slow/yield/2174.php.opts
diff --git a/hphp/test/tcr/yield/2175.php b/hphp/test/slow/yield/2175.php
similarity index 100%
rename from hphp/test/tcr/yield/2175.php
rename to hphp/test/slow/yield/2175.php
diff --git a/hphp/test/tcr/yield/2175.php.expect b/hphp/test/slow/yield/2175.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2175.php.expect
rename to hphp/test/slow/yield/2175.php.expect
diff --git a/hphp/test/tcr/yield/2175.php.hphp_opts b/hphp/test/slow/yield/2175.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2175.php.hphp_opts
rename to hphp/test/slow/yield/2175.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2175.php.opts b/hphp/test/slow/yield/2175.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2175.php.opts
rename to hphp/test/slow/yield/2175.php.opts
diff --git a/hphp/test/tcr/yield/2176.php b/hphp/test/slow/yield/2176.php
similarity index 100%
rename from hphp/test/tcr/yield/2176.php
rename to hphp/test/slow/yield/2176.php
diff --git a/hphp/test/tcr/yield/2176.php.expect b/hphp/test/slow/yield/2176.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2176.php.expect
rename to hphp/test/slow/yield/2176.php.expect
diff --git a/hphp/test/tcr/yield/2176.php.hphp_opts b/hphp/test/slow/yield/2176.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2176.php.hphp_opts
rename to hphp/test/slow/yield/2176.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2176.php.opts b/hphp/test/slow/yield/2176.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2176.php.opts
rename to hphp/test/slow/yield/2176.php.opts
diff --git a/hphp/test/tcr/yield/2177.php b/hphp/test/slow/yield/2177.php
similarity index 100%
rename from hphp/test/tcr/yield/2177.php
rename to hphp/test/slow/yield/2177.php
diff --git a/hphp/test/tcr/yield/2177.php.expect b/hphp/test/slow/yield/2177.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2177.php.expect
rename to hphp/test/slow/yield/2177.php.expect
diff --git a/hphp/test/tcr/yield/2177.php.hphp_opts b/hphp/test/slow/yield/2177.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2177.php.hphp_opts
rename to hphp/test/slow/yield/2177.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2177.php.opts b/hphp/test/slow/yield/2177.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2177.php.opts
rename to hphp/test/slow/yield/2177.php.opts
diff --git a/hphp/test/tcr/yield/2178.php b/hphp/test/slow/yield/2178.php
similarity index 100%
rename from hphp/test/tcr/yield/2178.php
rename to hphp/test/slow/yield/2178.php
diff --git a/hphp/test/tcr/yield/2178.php.expect b/hphp/test/slow/yield/2178.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2178.php.expect
rename to hphp/test/slow/yield/2178.php.expect
diff --git a/hphp/test/tcr/yield/2178.php.hphp_opts b/hphp/test/slow/yield/2178.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2178.php.hphp_opts
rename to hphp/test/slow/yield/2178.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2178.php.opts b/hphp/test/slow/yield/2178.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2178.php.opts
rename to hphp/test/slow/yield/2178.php.opts
diff --git a/hphp/test/tcr/yield/2179.php b/hphp/test/slow/yield/2179.php
similarity index 100%
rename from hphp/test/tcr/yield/2179.php
rename to hphp/test/slow/yield/2179.php
diff --git a/hphp/test/tcr/yield/2179.php.expect b/hphp/test/slow/yield/2179.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2179.php.expect
rename to hphp/test/slow/yield/2179.php.expect
diff --git a/hphp/test/tcr/yield/2179.php.hphp_opts b/hphp/test/slow/yield/2179.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2179.php.hphp_opts
rename to hphp/test/slow/yield/2179.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2179.php.opts b/hphp/test/slow/yield/2179.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2179.php.opts
rename to hphp/test/slow/yield/2179.php.opts
diff --git a/hphp/test/tcr/yield/2180.php b/hphp/test/slow/yield/2180.php
similarity index 100%
rename from hphp/test/tcr/yield/2180.php
rename to hphp/test/slow/yield/2180.php
diff --git a/hphp/test/tcr/yield/2180.php.expect b/hphp/test/slow/yield/2180.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2180.php.expect
rename to hphp/test/slow/yield/2180.php.expect
diff --git a/hphp/test/tcr/yield/2180.php.hphp_opts b/hphp/test/slow/yield/2180.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2180.php.hphp_opts
rename to hphp/test/slow/yield/2180.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2180.php.opts b/hphp/test/slow/yield/2180.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2180.php.opts
rename to hphp/test/slow/yield/2180.php.opts
diff --git a/hphp/test/tcr/yield/2181.php b/hphp/test/slow/yield/2181.php
similarity index 100%
rename from hphp/test/tcr/yield/2181.php
rename to hphp/test/slow/yield/2181.php
diff --git a/hphp/test/tcr/yield/2181.php.expect b/hphp/test/slow/yield/2181.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2181.php.expect
rename to hphp/test/slow/yield/2181.php.expect
diff --git a/hphp/test/tcr/yield/2181.php.hphp_opts b/hphp/test/slow/yield/2181.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2181.php.hphp_opts
rename to hphp/test/slow/yield/2181.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2181.php.opts b/hphp/test/slow/yield/2181.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2181.php.opts
rename to hphp/test/slow/yield/2181.php.opts
diff --git a/hphp/test/tcr/yield/2182.php b/hphp/test/slow/yield/2182.php
similarity index 100%
rename from hphp/test/tcr/yield/2182.php
rename to hphp/test/slow/yield/2182.php
diff --git a/hphp/test/tcr/yield/2182.php.expect b/hphp/test/slow/yield/2182.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2182.php.expect
rename to hphp/test/slow/yield/2182.php.expect
diff --git a/hphp/test/tcr/yield/2182.php.hphp_opts b/hphp/test/slow/yield/2182.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2182.php.hphp_opts
rename to hphp/test/slow/yield/2182.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2182.php.opts b/hphp/test/slow/yield/2182.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2182.php.opts
rename to hphp/test/slow/yield/2182.php.opts
diff --git a/hphp/test/tcr/yield/2183.php b/hphp/test/slow/yield/2183.php
similarity index 100%
rename from hphp/test/tcr/yield/2183.php
rename to hphp/test/slow/yield/2183.php
diff --git a/hphp/test/tcr/yield/2183.php.expect b/hphp/test/slow/yield/2183.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2183.php.expect
rename to hphp/test/slow/yield/2183.php.expect
diff --git a/hphp/test/tcr/yield/2183.php.hphp_opts b/hphp/test/slow/yield/2183.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2183.php.hphp_opts
rename to hphp/test/slow/yield/2183.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2183.php.opts b/hphp/test/slow/yield/2183.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2183.php.opts
rename to hphp/test/slow/yield/2183.php.opts
diff --git a/hphp/test/tcr/yield/2184.php b/hphp/test/slow/yield/2184.php
similarity index 100%
rename from hphp/test/tcr/yield/2184.php
rename to hphp/test/slow/yield/2184.php
diff --git a/hphp/test/tcr/yield/2184.php.expect b/hphp/test/slow/yield/2184.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2184.php.expect
rename to hphp/test/slow/yield/2184.php.expect
diff --git a/hphp/test/tcr/yield/2184.php.hphp_opts b/hphp/test/slow/yield/2184.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2184.php.hphp_opts
rename to hphp/test/slow/yield/2184.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2184.php.opts b/hphp/test/slow/yield/2184.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2184.php.opts
rename to hphp/test/slow/yield/2184.php.opts
diff --git a/hphp/test/tcr/yield/2185.php b/hphp/test/slow/yield/2185.php
similarity index 100%
rename from hphp/test/tcr/yield/2185.php
rename to hphp/test/slow/yield/2185.php
diff --git a/hphp/test/tcr/yield/2185.php.expect b/hphp/test/slow/yield/2185.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2185.php.expect
rename to hphp/test/slow/yield/2185.php.expect
diff --git a/hphp/test/tcr/yield/2185.php.hphp_opts b/hphp/test/slow/yield/2185.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2185.php.hphp_opts
rename to hphp/test/slow/yield/2185.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2185.php.opts b/hphp/test/slow/yield/2185.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2185.php.opts
rename to hphp/test/slow/yield/2185.php.opts
diff --git a/hphp/test/tcr/yield/2186.php b/hphp/test/slow/yield/2186.php
similarity index 100%
rename from hphp/test/tcr/yield/2186.php
rename to hphp/test/slow/yield/2186.php
diff --git a/hphp/test/tcr/yield/2186.php.expect b/hphp/test/slow/yield/2186.php.expect
similarity index 100%
rename from hphp/test/tcr/yield/2186.php.expect
rename to hphp/test/slow/yield/2186.php.expect
diff --git a/hphp/test/tcr/yield/2186.php.hphp_opts b/hphp/test/slow/yield/2186.php.hphp_opts
similarity index 100%
rename from hphp/test/tcr/yield/2186.php.hphp_opts
rename to hphp/test/slow/yield/2186.php.hphp_opts
diff --git a/hphp/test/tcr/yield/2186.php.opts b/hphp/test/slow/yield/2186.php.opts
similarity index 100%
rename from hphp/test/tcr/yield/2186.php.opts
rename to hphp/test/slow/yield/2186.php.opts