travis - dotnet 3.1, fixes cwd

build/install_dependencies_ubuntu.sh

@@ -12,7 +12,7 @@ sudo dpkg -i packages-microsoft-prod.deb
 sudo apt-get update
 sudo apt-get install apt-transport-https
 sudo apt-get update
-sudo apt-get install dotnet-sdk-3.0 -y
+sudo apt-get install dotnet-sdk-3.1 -y
 
 # Install Python Pip and icdiff (http://www.jefftk.com/icdiff)
 

build/runtests.sh

@@ -3,7 +3,7 @@
 
 # Absolute paths - https://stackoverflow.com/a/246128/2105235
 TESTS_DIR=$PWD/tests
-OUTPUT_DIR="$TESTS_DIR/bin/Release/netcoreapp3.0"
+OUTPUT_DIR="$TESTS_DIR/bin/Release/netcoreapp3.1"
 
 PHP_TMP_FILE=$OUTPUT_DIR/php.out
 PEACH_TMP_FILE=$OUTPUT_DIR/peach.out
@@ -19,9 +19,8 @@ for PHP_FILE in $(find $TESTS_DIR -name *.php)
 do
   # Run each file in the directory it is contained in (in order for relative paths to work)
   PHP_FILE_DIR=$(dirname $PHP_FILE)
-  cd $PHP_FILE_DIR
 
-  # Obtain the relative path to the PHP file so that the inclusion in Peachpie works properly
+  # Obtain the relative path for the log
   CUT_START=$((${#TESTS_DIR} + 2))
   PHP_FILE_REL=$(echo $PHP_FILE | cut -c $CUT_START-)
 
@@ -34,8 +33,10 @@ do
     continue;
   fi
 
+  cd TESTS_DIR
+
   PHP_OUTPUT="$(php -d display_errors=Off -d log_errors=Off $PHP_FILE)"
-  PEACH_OUTPUT="$(dotnet $OUTPUT_DIR/Tests.dll $PHP_FILE_REL)"
+  PEACH_OUTPUT="$(dotnet $OUTPUT_DIR/Tests.dll $PHP_FILE_DIR $PHP_FILE)"
 
   # .. or if either Peachpie or PHP returned a special string
   if [ "$PHP_OUTPUT" = "***SKIP***" -o "$PEACH_OUTPUT" = "***SKIP***" ] ; then

tests/Tests.msbuildproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <StartupObject>program.phpx</StartupObject>
 	<DisableImplicitPeachpieReferences>true</DisableImplicitPeachpieReferences>
   </PropertyGroup>

tests/program.phpx

@@ -1,3 +1,4 @@
 <?php
 
-include $argv[1];
+chdir($argv[1]);
+include $argv[2];