Changeset 966

Show
Ignore:
Timestamp:
07/25/08 11:21:41 (3 months ago)
Author:
arnoschn
Message:

Ci-tests: fixing "typo" in postgres testing config

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/arnoschn/cache/CiReportTask.php

    r965 r966  
    6161            $environments[]=$environment; 
    6262            $this->setInFile($file); 
    63             $this->log("Report available in:\n\n".$dir.DIRECTORY_SEPARATOR."phpunit2-noframes.html"); 
     63             
    6464            parent::main(); 
    6565        } 
    …… 
    6969         
    7070        file_put_contents($summaryFile, $contents); 
     71        $this->log("Reports available in:\n\n".$summaryFile); 
    7172    } 
    7273    /** 

  • branches/arnoschn/cache/build-test.xml

    r963 r966  
    144144                <phingCall target="generate-config-file"> 
    145145                        <param name="type" value="mysql" /> 
    146  
     146                        <param name="name" value="mysql" /> 
    147147                        <param name="testing.url" value="${testing.url}" /> 
    148148                </phingCall> 
    …… 
    150150        <target name="generate-config-postgres"> 
    151151                <phingCall target="generate-config-file"> 
    152                         <param name="type" value="postgres" /> 
    153  
     152                        <param name="type" value="pgsql" /> 
     153                        <param name="name" value="postgres" /> 
    154154                        <param name="testing.url" value="${testing.url}" /> 
    155155                </phingCall> 
    …… 
    158158                <phingCall target="generate-config-file"> 
    159159                        <param name="type" value="sqlite" /> 
     160                        <param name="name" value="sqlite" /> 
    160161                        <param name="file.based" value="1" /> 
    161162                        <param name="testing.url" value="${testing.url}" /> 
    …… 
    167168                        <equals arg1="${file.based}" arg2="1" /> 
    168169                        <then> 
    169                                 <input propertyname="file" message="[${type}] Please provide which database-file should be used" promptChar=":" defaultValue="" /> 
     170                                <input propertyname="file" message="[${name}] Please provide which database-file should be used" promptChar=":" defaultValue="" /> 
    170171                                <property name="database" value="" /> 
    171172                                <property name="host" value="" /> 
    …… 
    175176 
    176177                        <else> 
    177                                 <input propertyname="host" message="[${type}] Please provide which host should be used" promptChar=":" defaultValue="localhost" /> 
     178                                <input propertyname="host" message="[${name}] Please provide which host should be used" promptChar=":" defaultValue="localhost" /> 
    178179                                <property name="file" value="" /> 
    179                                 <input propertyname="database" message="[${type}] Please provide which database should be used" promptChar=":" defaultValue="framework_tests" /> 
    180                                 <input propertyname="user" message="[${type}] Please provide which user should be used" promptChar=":" defaultValue="akelos" /> 
    181                                 <input propertyname="password" message="[${type}] Please provide which password should be used" promptChar=":" /> 
     180                                <input propertyname="database" message="[${name}] Please provide which database should be used" promptChar=":" defaultValue="framework_tests" /> 
     181                                <input propertyname="user" message="[${name}] Please provide which user should be used" promptChar=":" defaultValue="akelos" /> 
     182                                <input propertyname="password" message="[${name}] Please provide which password should be used" promptChar=":" /> 
    182183                        </else> 
    183184                </if> 
    184185 
    185186 
    186                 <copy file="${config.dir}/TPL-config-testing.php" tofile="${config.dir}/${type}-testing.php" overwrite="true"> 
     187                <copy file="${config.dir}/TPL-config-testing.php" tofile="${config.dir}/${name}-testing.php" overwrite="true"> 
    187188                        <filterchain> 
    188189                                <expandproperties />