diff --git a/.travis.yml b/.travis.yml index e152e13ee..5b82e811a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -80,9 +80,7 @@ install: - bash .travis/install_sqlcl.sh - sudo mkdir -p /dev/pdbs - sudo chmod -R 777 /dev/pdbs - - df -h - if [[ ! $TRAVIS_TAG ]]; then bash .travis/start_db.sh; fi - - df -h before_script: - if [[ ! $TRAVIS_TAG ]]; then bash .travis/install.sh; fi diff --git a/.travis/install.sh b/.travis/install.sh index bb99a0e2d..7b799eaa0 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -2,60 +2,66 @@ cd source set -ev + #install core of utplsql -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off set verify off alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; +alter session set plsql_optimize_level=0; @install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD SQL -#uninstall core of utplsql -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -set verify off - -@uninstall_all.sql $UT3_OWNER -declare - v_leftover_objects_count integer; -begin - select sum(cnt) - into v_leftover_objects_count - from (select count(1) cnt from dba_objects where owner = '$UT3_OWNER' - union all - select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER' - ); - if v_leftover_objects_count > 0 then - raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); - end if; -end; -/ +#Run this step only on first job slave (11.2 - at it's fastest) +if [[ "${TRAVIS_JOB_NUMBER}" =~ \.1$ ]]; then + + #check code-style for errors + time "$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR @../development/utplsql_style_check.sql + + #test install/uninstall process + time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL + set feedback off + set verify off + + @uninstall_all.sql $UT3_OWNER + declare + v_leftover_objects_count integer; + begin + select sum(cnt) + into v_leftover_objects_count + from (select count(1) cnt from dba_objects where owner = '$UT3_OWNER' + union all + select count(1) cnt from dba_synonyms where table_owner = '$UT3_OWNER' + ); + if v_leftover_objects_count > 0 then + raise_application_error(-20000, 'Not all objects were successfully uninstalled - leftover objects count='||v_leftover_objects_count); + end if; + end; + / SQL -#reinstall core of utplsql -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off -set verify off + time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL + set feedback off + set verify off -alter session set plsql_warnings = 'ENABLE:ALL', 'DISABLE:(5004,5018,6000,6001,6003,6009,6010,7206)'; -@install.sql $UT3_OWNER + alter session set plsql_optimize_level=0; + @install.sql $UT3_OWNER SQL +fi + #additional privileges to run scripted tests -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback on --needed for Mystats script to work grant select any dictionary to $UT3_OWNER; --Needed for testing a coverage outside ut3_owner. grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; - -conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR -@../development/utplsql_style_check.sql SQL -#Create additional users -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +#Create user that will own the tests +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off @create_utplsql_owner.sql $UT3_TESTER $UT3_TESTER_PASSWORD $UT3_TABLESPACE @@ -70,29 +76,11 @@ grant create job to $UT3_TESTER; exit SQL -#additional privileges to run tests -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback on ---needed for Mystats script to work -grant select any dictionary to $UT3_OWNER; ---Needed for testing a coverage outside ut3_owner. -grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER; - -exit -SQL - -#Create additional users -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL +#Create additional UT3$USER# to test for special characters +time "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL set feedback off @create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE - -exit -SQL - -#Grant UT3 framework to UT3$USER# -"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL -set feedback off +--Grant UT3 framework to UT3$USER# @create_user_grants.sql $UT3_OWNER $UT3_USER - exit SQL diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh index f551ff9b5..889e098da 100644 --- a/.travis/install_utplsql_release.sh +++ b/.travis/install_utplsql_release.sh @@ -37,7 +37,7 @@ end; SQL "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <