Moved working dir for test to test/assets to fix interferences with real world installs

Author: francisek

README.md

@@ -49,14 +49,14 @@ What does php-band is :
 + check the validity of the version
 + if it does not exist, attempts to download the php archive from a list of prefered sites
 + if the php source directory does not exist, extract it from the archive into src directory
-+ switches to php tource directory
-+ reads per-version configuration
-+ if not already, configures php:
++ switches to php source directory
++ reads per-version configuration 
++ if not already done or any configuration is newer that marker file, configures php:
     + runs the *pre_configure_php()* function
     + runs configure
     + runs the *post_configure_php()* function if configure was successfull
     + marks the version as configured
-+ if not already compiled
++ if not already compiled or configuration marker file is newer than built marker
     + runs the *pre_compile_php()* function
     + compiles php
     + runs the *post_compile_php()* function if compilation was successfull
@@ -84,7 +84,7 @@ To get it clear, look at this example of config tree:
 
 php-band will use first *./config/configure-php.sh* for any version.
 Then if major version is 5, *./config/5/configure-php.sh* overrides the previous configuration.
-Then if major version is 5 and minor version is 6, *.config/5/6/configure-php.sh* overrides the previous configuration.
+Then if major version is 5 and minor version is 6, *.config/5/6/configure-php.sh* definitions will overrides the previous configuration.
 And so on ...
 
 ## What you can do
@@ -100,7 +100,9 @@ Its default value is defined to "--disable-all".
 + *post_configure_php()* is called after a successfull php's *configure*
 + *pre_compile_php()* is called before php's *make*
 + *post_compile_php()* is called after a successfull php's *make*
-+ *post_install_php()* is called after a successfull php's *make install*
++ *post_install_php()* is called after a successfull php's *make install*, usefull to create default config files
+
+The pre_\* and post_\* functions are called with the working directory set to the php source directory.
 
 ## Readonly variables
 

bin/php-band

@@ -4,10 +4,11 @@ PHP_BAND_NAME=$(basename "$0")
 pushd "$(dirname $0)" > /dev/null
 PHP_BAND_ROOT_DIR=$(dirname $(pwd -P))
 popd > /dev/null
-PHP_BAND_ARCH_DIR=${PHP_BAND_ROOT_DIR}/archs
-PHP_BAND_INST_DIR=${PHP_BAND_ROOT_DIR}/inst
-PHP_BAND_CONFIG_DIR=${PHP_BAND_ROOT_DIR}/config
-PHP_BAND_SOURCE_DIR=${PHP_BAND_ROOT_DIR}/src
+PHP_BAND_ASSETS_DIR=${PHP_BAND_ASSETS_DIR:-$PHP_BAND_ROOT_DIR}
+PHP_BAND_ARCH_DIR=${PHP_BAND_ASSETS_DIR}/archs
+PHP_BAND_INST_DIR=${PHP_BAND_ASSETS_DIR}/inst
+PHP_BAND_CONFIG_DIR=${PHP_BAND_ASSETS_DIR}/config
+PHP_BAND_SOURCE_DIR=${PHP_BAND_ASSETS_DIR}/src
 # local vars
 php_band_command_to_run=
 php_band_source_archive_format="xz"

lib/core.sh

@@ -77,8 +77,12 @@ php_band_build_php_source_dirname() {
 php_band_check_newer() {
   local refFile="$1"
   local testFile="$2"
-  [ -f "${refFile}" ] || return
-  [ -f "${testFile}" ] || return
+  if [ ! -f "${refFile}" ]; then
+    return
+  fi
+  if [ ! -f "${testFile}" ]; then
+    return
+  fi
   if [ "${testFile}" -nt "${refFile}" ]; then
     rm "${refFile}"
   fi
@@ -97,7 +101,6 @@ get_per_version_config() {
     while [ $# -gt 0 -a "$1" != "" ]; do
         config_dir="$config_dir/$1"
         if [ -f "$config_dir/${base_config_file}" ]; then
-          echo "found config at $config_dir"
           source "$config_dir/${base_config_file}" $x
           php_band_check_newer "${refFile}" "${config_dir}/${base_config_file}"
         fi

test/10_core.bats

@@ -52,7 +52,7 @@ setup() {
 }
 
 @test "Test config per version from main config" {
-    local cfg="$BATS_TEST_DIRNAME/fixtures/test-config.sh"
+    local cfg="$PHP_BAND_ASSETS_DIR/config/test-config.sh"
 
     get_per_version_config "$cfg" "1" "20" "30" "RC40"
     assert_equals "$test_main" "test_main"
@@ -63,7 +63,7 @@ setup() {
 }
 
 @test "Test config per uncomplete version" {
-    local cfg="$BATS_TEST_DIRNAME/fixtures/test-config.sh"
+    local cfg="$PHP_BAND_ASSETS_DIR/config/test-config.sh"
 
     get_per_version_config "$cfg" 
     assert_equals "$test_main" "test_main"
@@ -74,7 +74,7 @@ setup() {
 }
 
 @test "Test config per version from specific config" {
-    local cfg="$BATS_TEST_DIRNAME/fixtures/test-config.sh"
+    local cfg="$PHP_BAND_ASSETS_DIR/config/test-config.sh"
 
     get_per_version_config "$cfg" "10" "20" "30" "RC40"
     assert_equals "$test_main" "test_main"
@@ -102,3 +102,21 @@ EOF
     result=$(cat "$filename")
     assert_equals "$result" "$expected"
 }
+
+@test "Check newer file" {
+  local file1="${BATS_TMPDIR}/check_newer_1"
+  local file2="${BATS_TMPDIR}/check_newer_2"
+  touch "$file2"
+  touch "$file1"
+  php_band_check_newer "$file1" "$file2"
+  [ -f "$file1" ]
+  [ -f "$file2" ]
+  touch "$file1"
+  php_band_check_newer "$file1" "$file2"
+  [ -f "$file1" ]
+  [ -f "$file2" ]
+  php_band_check_newer "qsddq" "$file2"
+  [ -f "$file2" ]
+  php_band_check_newer "$file1" "qsddq"
+  [ -f "$file1" ]
+}

test/10_simple_commands.bats

@@ -21,14 +21,14 @@ load test_helper
 }
 
 @test "List installed versions of php-band when none is installed" {
-    run bin/php-band --list-installed
+    PHP_BAND_ASSETS_DIR=$PHP_BAND_ASSETS_DIR run bin/php-band --list-installed
     assert_output ""
     assert_status 0
 }
 
 @test "List installed versions of php-band when some are installed" {
-    mkdir inst/5.6.10 inst/5.6.2
-    run bin/php-band --list-installed
+    mkdir ${PHP_BAND_ASSETS_DIR}/inst/5.6.10 ${PHP_BAND_ASSETS_DIR}/inst/5.6.2
+    PHP_BAND_ASSETS_DIR=$PHP_BAND_ASSETS_DIR run bin/php-band --list-installed
     assert_output "5.6.2
 5.6.10"
     assert_status 0

test/90_install.bats

@@ -3,30 +3,30 @@
 load test_helper
 
 @test "Call php-band to install an already downloaded archive" {
-    [ ! -f "archs/php-5.6.10.tar.xz" ]
-    cp $BATS_TEST_DIRNAME/fixtures/php-5.6.10.tar.xz archs/
-    [ -f "archs/php-5.6.10.tar.xz" ]
-    run bin/php-band --install 5.6.10
-    [ -f "archs/php-5.6.10.tar.xz" ]
-    [ -d "src/php-5.6.10" ]
-    [ -f "src/php-5.6.10/.configured" ]
-    [ -f "src/php-5.6.10/.built" ]
-    [ -f "inst/5.6.10/test" ]
+#    [ ! -f "archs/php-5.6.10.tar.xz" ]
+#    cp $BATS_TEST_DIRNAME/fixtures/php-5.6.10.tar.xz archs/
+    [ -f "${PHP_BAND_ASSETS_DIR}/archs/php-5.6.10.tar.xz" ]
+    PHP_BAND_ASSETS_DIR=$PHP_BAND_ASSETS_DIR run bin/php-band --install 5.6.10
+    [ -f "${PHP_BAND_ASSETS_DIR}/archs/php-5.6.10.tar.xz" ]
+    [ -d "${PHP_BAND_ASSETS_DIR}/src/php-5.6.10" ]
+    [ -f "${PHP_BAND_ASSETS_DIR}/src/php-5.6.10/.configured" ]
+    [ -f "${PHP_BAND_ASSETS_DIR}/src/php-5.6.10/.built" ]
+    [ -f "${PHP_BAND_ASSETS_DIR}/inst/5.6.10/test" ]
 }
 
 @test "Call php-band to install a valid version of an existing PHP" {
     if [ "x$PHP_BAND_TEST_COMPILATION" = "x" ]; then
         skip "We only compile if PHP_BAND_TEST_COMPILATION is set"
     fi
-    run bin/php-band --install 5.6.10
+    PHP_BAND_ASSETS_DIR=$PHP_BAND_ASSETS_DIR run bin/php-band --install 5.6.10
     assert_line_contains "PHP 5.6.10 has been downloaded"
     [ -f "archs/php-5.6.10.tar.xz" ]
     [ -d "src/php-5.6.10" ]
     [ -f "src/php-5.6.10/.configured" ]
     [ -f "src/php-5.6.10/.built" ]
     [ -f "inst/5.6.10/bin/php" ]
     assert_status 0
-    run inst/5.6.10/bin/php -v
+    run ${PHP_BAND_ASSETS_DIR}/inst/5.6.10/bin/php -v
     assert_line_contains "php 5.6.10"
     assert_status 0
 }