fix SlowRepo tests

Yay, back to the glory days of having repo tests.

The problem was that we weren't being smart about ##__DIR__.'/some/string'## during the compile step. Now we are.

hphp/compiler/expression/include_expression.cpp

@@ -163,6 +163,11 @@ string IncludeExpression::CheckInclude(ConstructPtr includeExp,
   parse_string_arg(fileExp, var, lit);
   if (lit.empty()) return lit;
 
+  if (var == "__DIR__") {
+    var = "";
+    lit = Util::safe_dirname(container) + lit;
+  }
+
   string included = get_include_file_path(container, var, lit,
                                           documentRoot, relative);
   if (!included.empty()) {

hphp/test/sample_dir/fix_mtimes.inc

@@ -12,3 +12,6 @@ touch($dir.'empty', $base++);
 touch($dir.'file', $base++);
 touch($dir.'symlink', $base++);
 touch($dir.'fix_mtimes.inc', $base++);
+
+// Tests that include this like to work out of the 'hphp' dir
+chdir($dir.'../..');

hphp/test/slow/directory/1702.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $d = dir("test/sample_dir/");
 echo "Path: " . $d->path . "\n";

hphp/test/slow/ext_iterator/1798.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $files = array();
 foreach (new DirectoryIterator('test/sample_dir/') as $file) {

hphp/test/slow/ext_iterator/1798.php.expectf

@@ -131,7 +131,7 @@ fix_mtimes.inc
 1234567895
 %d
 33188
-375
+459
 file
 
 

hphp/test/slow/ext_iterator/1799.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $dir = new DirectoryIterator('test/sample_dir');
 $files = array(); // order changes per machine

hphp/test/slow/ext_iterator/1800.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $ite=new RecursiveDirectoryIterator('test/sample_dir/');
 $bytestotal=0;

hphp/test/slow/ext_iterator/1800.php.expect

@@ -9,10 +9,10 @@ array(5) {
   string(26) "test/sample_dir/file => 3
 "
   [3]=>
-  string(38) "test/sample_dir/fix_mtimes.inc => 375
+  string(38) "test/sample_dir/fix_mtimes.inc => 459
 "
   [4]=>
   string(29) "test/sample_dir/symlink => 3
 "
 }
-Total: 5 files, 4,477 bytes
+Total: 5 files, 4,561 bytes

hphp/test/slow/ext_iterator/1801.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $ite=new RecursiveDirectoryIterator('test/sample_dir/');
 $bytestotal=0;

hphp/test/slow/ext_iterator/1801.php.expect

@@ -9,10 +9,10 @@ array(5) {
   string(26) "test/sample_dir/file => 3
 "
   [3]=>
-  string(38) "test/sample_dir/fix_mtimes.inc => 375
+  string(38) "test/sample_dir/fix_mtimes.inc => 459
 "
   [4]=>
   string(29) "test/sample_dir/symlink => 3
 "
 }
-Total: 5 files, 381 bytes
+Total: 5 files, 465 bytes

hphp/test/slow/ext_iterator/1802.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $path = "test/sample_dir/";
 $files = array(); // order changes per machine

hphp/test/slow/ext_iterator/1803.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $directory = "test/sample_dir";
 $fileSPLObjects = new RecursiveIteratorIterator(

hphp/test/slow/ext_iterator/1804.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 function getFiles(&$rdi,$depth=0) {
   if (!is_object($rdi)) return;

hphp/test/slow/ext_spl_file/1795.php

@@ -1,7 +1,6 @@
 <?php
 
-chdir(__DIR__.'/../../..');
-require 'test/sample_dir/fix_mtimes.inc';
+include __DIR__.'/../../../test/sample_dir/fix_mtimes.inc';
 
 $info = new SplFileInfo('test/sample_dir');
 if (!$info->isFile()) {