A lot of changes to switch to the new name, might be horribly broken.
This commit is contained in:
6
test/harness/.gitignore
vendored
6
test/harness/.gitignore
vendored
@ -1,5 +1,5 @@
|
||||
orca-customizations.py
|
||||
orca-customizations.pyc
|
||||
cthulhu-customizations.py
|
||||
cthulhu-customizations.pyc
|
||||
user-settings.conf
|
||||
utils.pyc
|
||||
*.debug
|
||||
@ -7,4 +7,4 @@ utils.pyc
|
||||
*.braille
|
||||
*.out
|
||||
app-settings
|
||||
orca-scripts
|
||||
cthulhu-scripts
|
15
test/harness/cthulhu-customizations.py.in
Normal file
15
test/harness/cthulhu-customizations.py.in
Normal file
@ -0,0 +1,15 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Contains settings that should apply to all runs of the Orca
|
||||
# test harness.
|
||||
|
||||
import cthulhu.debug
|
||||
cthulhu.debug.debugLevel = cthulhu.debug.LEVEL_ALL
|
||||
|
||||
import cthulhu.settings
|
||||
cthulhu.settings.enableRemoteLogging = True
|
||||
cthulhu.settings.enableSpeech = True
|
||||
cthulhu.settings.speechFactoryModules = []
|
||||
cthulhu.settings.speechServerFactory = None
|
||||
cthulhu.settings.asyncMode = False
|
||||
cthulhu.settings.progressBarUpdateInterval = 0
|
@ -2,10 +2,10 @@
|
||||
"keyboardLayout": 2,
|
||||
"magSourceDisplay": ":0.0",
|
||||
"magTargetDisplay": ":0.0",
|
||||
"orcaModifierKeys": ["Caps_Lock, Shift_Lock"],
|
||||
"cthulhuModifierKeys": ["Caps_Lock, Shift_Lock"],
|
||||
"profile": ["Laptop", "laptop"],
|
||||
"quitOrcaNoConfirmation": true,
|
||||
"speechServerFactory": "orca.speechdispatcherfactory",
|
||||
"speechServerFactory": "cthulhu.speechdispatcherfactory",
|
||||
"speechServerInfo": ["Sintetizador predeterminado", "default"],
|
||||
"verbalizePunctuationStyle": 2
|
||||
}
|
||||
|
@ -1,15 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Contains settings that should apply to all runs of the Orca
|
||||
# test harness.
|
||||
|
||||
import orca.debug
|
||||
orca.debug.debugLevel = orca.debug.LEVEL_ALL
|
||||
|
||||
import orca.settings
|
||||
orca.settings.enableRemoteLogging = True
|
||||
orca.settings.enableSpeech = True
|
||||
orca.settings.speechFactoryModules = []
|
||||
orca.settings.speechServerFactory = None
|
||||
orca.settings.asyncMode = False
|
||||
orca.settings.progressBarUpdateInterval = 0
|
@ -98,7 +98,7 @@ then
|
||||
mkdir -p $coverageDir
|
||||
cp $harnessDir/user-settings.conf.in user-settings.conf
|
||||
#echo $harnessDir/user-settings.conf.in
|
||||
trace2html.py -o $coverageDir -w orca -r $harnessDir/runorca.py &
|
||||
trace2html.py -o $coverageDir -w cthulhu -r $harnessDir/runcthulhu.py &
|
||||
trace_pid=$!
|
||||
sleep 10
|
||||
fi
|
||||
@ -193,7 +193,7 @@ do
|
||||
|
||||
if [ "$runOrcaOnce" -eq 0 ]
|
||||
then
|
||||
# Copy the results (.orca) file to the output directory.
|
||||
# Copy the results (.cthulhu) file to the output directory.
|
||||
# This is the file that will be used for regression
|
||||
# testing.
|
||||
newResultsFile=`basename $testFile .py`
|
||||
@ -240,8 +240,8 @@ then
|
||||
rm -f user-settings.conf
|
||||
mkdir -p ../profile
|
||||
profileFilePrefix=../profile/`date +%Y-%m-%d_%H:%M:%S`
|
||||
python -c "import pstats; pstats.Stats('orcaprof').sort_stats('cumulative').print_stats()" > $profileFilePrefix.txt
|
||||
mv orcaprof $profileFilePrefix.orcaprof
|
||||
python -c "import pstats; pstats.Stats('cthulhuprof').sort_stats('cumulative').print_stats()" > $profileFilePrefix.txt
|
||||
mv cthulhuprof $profileFilePrefix.cthulhuprof
|
||||
echo ...finished generating profile information.
|
||||
fi
|
||||
|
||||
|
@ -10,13 +10,13 @@ import dbus
|
||||
import dbus.service
|
||||
import sys
|
||||
|
||||
from orca import orca
|
||||
from cthulhu import cthulhu
|
||||
from dbus.mainloop.glib import DBusGMainLoop
|
||||
|
||||
class LoggerService(dbus.service.Object):
|
||||
|
||||
def __init__(self, filePrefix):
|
||||
self._logger = orca.getLogger()
|
||||
self._logger = cthulhu.getLogger()
|
||||
self._logNames = ['braille', 'speech']
|
||||
self._filePrefix = filePrefix
|
||||
|
||||
@ -42,22 +42,22 @@ class LoggerService(dbus.service.Object):
|
||||
return contents
|
||||
|
||||
def main():
|
||||
sys.argv[0] = 'orca'
|
||||
sys.argv[0] = 'cthulhu'
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-u", "--user-prefs", action="store")
|
||||
parser.add_argument("--debug-file", action="store")
|
||||
args = parser.parse_args()
|
||||
|
||||
orca.debug.debugFile = open('%s.debug' % args.debug_file, 'w')
|
||||
cthulhu.debug.debugFile = open('%s.debug' % args.debug_file, 'w')
|
||||
|
||||
manager = orca.getSettingsManager()
|
||||
manager = cthulhu.getSettingsManager()
|
||||
manager.activate(args.user_prefs)
|
||||
sys.path.insert(0, manager.getPrefsDir())
|
||||
|
||||
service = LoggerService(args.debug_file)
|
||||
|
||||
return orca.main()
|
||||
return cthulhu.main()
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
@ -4,8 +4,8 @@ useage()
|
||||
{
|
||||
echo './runone.sh keystroke_file.py [application_name] [0|1]'
|
||||
echo 'application_name is the name of the application to run'
|
||||
echo '0 = start and stop orca inside this shell script'
|
||||
echo '1 = assume orca is already running'
|
||||
echo '0 = start and stop cthulhu inside this shell script'
|
||||
echo '1 = assume cthulhu is already running'
|
||||
echo " " # for a blank line
|
||||
echo 'See http://live.gnome.org/Orca/RegressionTesting for more info.'
|
||||
|
||||
@ -36,11 +36,11 @@ fi
|
||||
|
||||
debugFile=`basename $1 .py`
|
||||
|
||||
cp `dirname $0`/orca-customizations.py.in orca-customizations.py
|
||||
cp `dirname $0`/cthulhu-customizations.py.in cthulhu-customizations.py
|
||||
CUSTOMIZATIONS_FILE=`dirname $1`/$debugFile.customizations
|
||||
if [ -f $CUSTOMIZATIONS_FILE ]
|
||||
then
|
||||
cat $CUSTOMIZATIONS_FILE >> orca-customizations.py
|
||||
cat $CUSTOMIZATIONS_FILE >> cthulhu-customizations.py
|
||||
fi
|
||||
|
||||
SETTINGS_FILE=`dirname $1`/$debugFile.settings
|
||||
@ -73,14 +73,14 @@ ARGS=""
|
||||
if [ -n "$3" ]
|
||||
then
|
||||
APP_NAME=$2
|
||||
orcaRunning=$3
|
||||
cthulhuRunning=$3
|
||||
else
|
||||
APP_NAME=gtk-demo
|
||||
if [ -n "$2" ]
|
||||
then
|
||||
orcaRunning=$2
|
||||
cthulhuRunning=$2
|
||||
else
|
||||
orcaRunning=0
|
||||
cthulhuRunning=0
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -125,9 +125,9 @@ then
|
||||
ARGS="--working-directory=$TERMINAL_WORKING_DIR"
|
||||
fi
|
||||
|
||||
if [ $orcaRunning -eq 0 ]
|
||||
if [ $cthulhuRunning -eq 0 ]
|
||||
then
|
||||
$harnessDir/runorca.py --user-prefs `pwd` --debug-file $debugFile &
|
||||
$harnessDir/runcthulhu.py --user-prefs `pwd` --debug-file $debugFile &
|
||||
sleep 4
|
||||
fi
|
||||
|
||||
@ -142,9 +142,9 @@ APP_PID=$!
|
||||
#
|
||||
python3 $1
|
||||
|
||||
if [ $orcaRunning -eq 0 ]
|
||||
if [ $cthulhuRunning -eq 0 ]
|
||||
then
|
||||
pkill -9 orca > /dev/null 2>&1
|
||||
pkill -9 cthulhu > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
# Terminate the running application
|
||||
|
@ -2,5 +2,5 @@ try:
|
||||
import cProfile as myprofiler
|
||||
except:
|
||||
import profile as myprofiler
|
||||
import orca.orca
|
||||
myprofiler.run('orca.orca.main()', 'orcaprof')
|
||||
import cthulhu.cthulhu
|
||||
myprofiler.run('cthulhu.cthulhu.main()', 'cthulhuprof')
|
||||
|
@ -1,4 +1,4 @@
|
||||
from orca import settings_manager
|
||||
from cthulhu import settings_manager
|
||||
from json import load, dump
|
||||
from pprint import pprint
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
"pronunciations": {},
|
||||
"profiles": {
|
||||
"default": {
|
||||
"speechServerFactory": "orca.speechdispatcherfactory",
|
||||
"speechServerFactory": "cthulhu.speechdispatcherfactory",
|
||||
"profile": [
|
||||
"Default",
|
||||
"default"
|
||||
@ -47,7 +47,7 @@
|
||||
"enableSpeechIndentation": false,
|
||||
"skipBlankCells": false,
|
||||
"enableDiacriticalKeys": false,
|
||||
"orcaModifierKeys": [
|
||||
"cthulhuModifierKeys": [
|
||||
"Insert",
|
||||
"KP_Insert"
|
||||
],
|
||||
|
Reference in New Issue
Block a user