Changeset 55bbe0b2 in sasview for build_tools


Ignore:
Timestamp:
Aug 19, 2016 4:51:09 AM (3 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
09afe90
Parents:
1686a333
git-author:
Piotr Rozyczko <rozyczko@…> (08/19/16 04:50:48)
git-committer:
Piotr Rozyczko <rozyczko@…> (08/19/16 04:51:09)
Message:

Updated deployment test script

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build_tools/sasview_deploy_test.au3

    r1cecc91 r55bbe0b2  
    66; 
    77; 0 - OK 
    8 ; 1 - Download failure 
    9 ; 2 - Installer failure 
    10 ; 3 - Problems running SasView (simple fitting) 
    11 ; 4 - Uninstaller failure 
     8; 1 - Installer failure 
     9; 2 - Problems running SasView (simple fitting) 
     10; 3 - Uninstaller failure 
    1211 
    1312#include <Constants.au3> 
    1413#include <FileConstants.au3> 
    1514#include <MsgBoxConstants.au3> 
    16 #include <InetConstants.au3> 
    1715#include <WinAPIFiles.au3> 
    1816 
    19 ; Custom error handler 
    20 ;Global $oMyError = ObjEvent("AutoIt.Error","MyErrFunc") 
    21  
    2217; Modifiable globals 
    23 if $CmdLine[0] == 0 Then 
    24    ; Expected command line with the build number as argument 
    25    Exit (-1) 
     18Global $fInstallerLocation = @TempDir & "\setupSasView.exe" 
     19if $CmdLine[0] > 0 Then 
     20   ; If argument present - use it as local download path 
     21   $fInstallerLocation = $CmdLine[1] 
    2622EndIf 
    2723 
    28 Local $lBuildNumber = $CmdLine[1] 
    29 ;Global $fInstallerLocation = "C:\util\setupSasView.exe" ; debug and testing location 
    30 Global $fInstallerLocation = @TempDir & "\setupSasView.exe" 
    31 Global $fRemoteInstallerLocation = "https://jenkins.esss.dk/sasview/job/SasView_Win7_Test/" & $lBuildNumber & "/artifact/sasview/dist/setupSasView.exe" 
    3224Global $fUninstallerLocation = "C:\Program Files (x86)\SasView\unins000.exe" 
    3325Global $lTimeout = 10          ; 10 sec timeout for waiting on windows 
     
    3729Global $installerPID = 0 
    3830 
    39  
    4031;; MAIN SCRIPT 
    41 Download() 
    4232Install() 
    4333RunSasView() 
    4434Uninstall() 
    45  
    4635Exit(0) 
    4736 
    4837;============================================================== 
    49 Func Download() 
    50    ; Download the file in the background with the selected option of 'force a reload from the remote site.' 
    51    ConsoleWrite("Downloading...." & @CRLF) 
    52    Local $iFailFlag = 1 
    53    Local $hDownload = InetGet($fRemoteInstallerLocation, $fInstallerLocation, $INET_FORCERELOAD) 
    54  
    55     ; Close the handle returned by InetGet. 
    56     InetClose($hDownload) 
    57         Assert($hDownload, $iFailFlag) 
    58         ConsoleWrite("Installer downloaded successfully to " & $fInstallerLocation & @CRLF) 
    59  
    60 EndFunc 
    6138 
    6239Func Install() 
    6340   ;;;;; APPLICATION INSTALLED ;;;;;;; 
    6441   Local $sSetupWindow = "Setup - SasView" 
    65    Local $iFailFlag = 2 
     42   Local $iFailFlag = 1 
    6643   ; Run setup 
    6744   if FileExists($fInstallerLocation) Then 
     
    7552 
    7653   ; License click through 
    77    WinActivate($sSetupWindow) ; <-- REQUIRED when connecting from another host 
     54   WinActivate($sSetupWindow) 
    7855   Local $test = WinWaitActive($sSetupWindow, "License Agreement", $lTimeout) 
    7956   ;ConsoleWrite("license agreement: " & $test) 
Note: See TracChangeset for help on using the changeset viewer.