Author: Lars Wassermann <[email protected]>
Branch:
Changeset: r429:6952fbe9d073
Date: 2013-05-31 10:29 +0200
http://bitbucket.org/pypy/lang-smalltalk/changeset/6952fbe9d073/
Log: committed Squeak changes for testing, etc.
diff --git a/SPy-Benchmarks.package/Integer.extension/instance/runTests.st
b/SPy-Benchmarks.package/Integer.extension/instance/runTests.st
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/Integer.extension/instance/runTests.st
@@ -0,0 +1,3 @@
+*SPy-Benchmarks
+runTests
+ ^SPyRunner runKernelTests
\ No newline at end of file
diff --git a/SPy-Benchmarks.package/Integer.extension/methodProperties.json
b/SPy-Benchmarks.package/Integer.extension/methodProperties.json
--- a/SPy-Benchmarks.package/Integer.extension/methodProperties.json
+++ b/SPy-Benchmarks.package/Integer.extension/methodProperties.json
@@ -2,4 +2,5 @@
"class" : {
},
"instance" : {
- "runSPyBenchmarks" : "lw 4/29/2013 13:20" } }
+ "runSPyBenchmarks" : "lw 4/29/2013 13:20",
+ "runTests" : "lw 5/30/2013 18:02" } }
diff --git a/SPy-Benchmarks.package/SPyRunner.class/class/runKernelTests.st
b/SPy-Benchmarks.package/SPyRunner.class/class/runKernelTests.st
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/SPyRunner.class/class/runKernelTests.st
@@ -0,0 +1,15 @@
+benchmarks
+runKernelTests
+ "self runTests"
+ | result suite |
+ suite := TestSuite named: 'RSqueakVM-Tests'.
+ "To add later: MethodPragmaTest . WeakMessageSendTest"
+ {IntegerTest . InstructionClientTest . FractionTest . DelayTest .
CompiledMethodTest . BehaviorTest . StopwatchTest . YearTest . TimeTest .
AllocationTest . ProcessTest . ClassDescriptionTest . SmallIntegerTest .
MethodContextTest . CompiledMethodComparisonTest . YearMonthWeekTest .
TimespanTest . DependentsArrayTest . CategorizerTest . IntegerDigitLogicTest .
SemaphoreTest . PromiseTest . DateTest . DateAndTimeEpochTest .
InstVarRefLocatorTest . DateAndTimeTest . BasicBehaviorClassMetaclassTest .
ExtendedNumberParserTest . TrueTest . UndefinedObjectTest . ComplexTest .
ScheduleTest . CompiledMethodTrailerTest . LargePositiveIntegerTest .
ScaledDecimalTest . ClassBuilderTest . SqNumberParserTest . ProtoObjectTest .
NumberParsingTest . RandomTest . DateAndTimeLeapTest . TimespanDoTest .
ClassTest . TimespanDoSpanAYearTest . BlockContextTest . TimeStampTest .
GradientFillStyleTest . MethodPropertiesTest . WeekTest . ObjectTest .
DurationTest . NumberTest . MonthTest . FalseTest . Ins
tructionPrinterTest . MonitorTest . BooleanTest . BlockClosureTest . FloatTest
. ProcessSpecificTest . LargeNegativeIntegerTest} do: [ :each | each
addToSuiteFromSelectors: suite].
+ suite
+ tests: (suite tests
+ reject: [ :eachTestCase |
+ "Those tests lead to VM-Assertion Errors, etc."
+ #(testBenchFib testMultiProcessWaitOnSameDelay
testBehaviornewnewShouldNotCrash testAllNamedFromTo testChange
testAtomicSuspend testWaitTimeoutMSecs
testMonitorNotGainingUnwantedSignalsDuringUnwinding
testDegreeCosForExceptionalValues testDegreeSinForExceptionalValues
testInfinity1 testInfinity2)
+ includes: eachTestCase selector]).
+ result := suite run.
+ ^result asString
\ No newline at end of file
diff --git a/SPy-Benchmarks.package/SPyRunner.class/methodProperties.json
b/SPy-Benchmarks.package/SPyRunner.class/methodProperties.json
--- a/SPy-Benchmarks.package/SPyRunner.class/methodProperties.json
+++ b/SPy-Benchmarks.package/SPyRunner.class/methodProperties.json
@@ -2,6 +2,7 @@
"class" : {
"format:" : "lw 4/29/2013 17:13",
"run" : "lw 4/29/2013 17:51",
+ "runKernelTests" : "lw 5/30/2013 18:03",
"runShootout" : "lw 5/3/2013 14:43",
"runTinyBenchmarks" : "lw 4/29/2013 17:39" },
"instance" : {
diff --git a/SPy-Benchmarks.package/TestSuite.extension/instance/run..st
b/SPy-Benchmarks.package/TestSuite.extension/instance/run..st
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/TestSuite.extension/instance/run..st
@@ -0,0 +1,6 @@
+*SPy-Benchmarks
+run: aResult
+ self tests do: [:each |
+ self changed: each.
+ SPyVM print: 'Running Test ', (each asString padded: #right to:
62 with: $ ), String tab, '(', aResult asString, ')'.
+ each run: aResult].
\ No newline at end of file
diff --git a/SPy-Benchmarks.package/TestSuite.extension/instance/tests..st
b/SPy-Benchmarks.package/TestSuite.extension/instance/tests..st
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/TestSuite.extension/instance/tests..st
@@ -0,0 +1,3 @@
+*SPy-Benchmarks
+tests: someTestCaseObjects
+ tests := someTestCaseObjects
\ No newline at end of file
diff --git a/SPy-Benchmarks.package/TestSuite.extension/methodProperties.json
b/SPy-Benchmarks.package/TestSuite.extension/methodProperties.json
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/TestSuite.extension/methodProperties.json
@@ -0,0 +1,6 @@
+{
+ "class" : {
+ },
+ "instance" : {
+ "run:" : "lw 5/30/2013 11:19",
+ "tests:" : "lw 5/29/2013 20:14" } }
diff --git a/SPy-Benchmarks.package/TestSuite.extension/properties.json
b/SPy-Benchmarks.package/TestSuite.extension/properties.json
new file mode 100644
--- /dev/null
+++ b/SPy-Benchmarks.package/TestSuite.extension/properties.json
@@ -0,0 +1,2 @@
+{
+ "name" : "TestSuite" }
diff --git a/SPy-Benchmarks.package/monticello.meta/version
b/SPy-Benchmarks.package/monticello.meta/version
--- a/SPy-Benchmarks.package/monticello.meta/version
+++ b/SPy-Benchmarks.package/monticello.meta/version
@@ -1,1 +1,1 @@
-(name 'SPy-Benchmarks-lw.5' message 'added another benchmark' id
'cfe2797f-9dd9-4073-aa6e-86cda0ba3dbf' date '3 May 2013' time '2:43:39.36 pm'
author 'lw' ancestors ((name 'SPy-Benchmarks-lw.4' message 'changed the test
running and collecting to work with the current spy vm
removed two of the shootout tests due to failure on spy' id
'9d1c1e0a-0209-45d3-8e0a-220919ab5701' date '29 April 2013' time '6:07:26.686
pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.3' message 'added tiny
benchmarks' id 'c8214449-4009-4a64-8284-3c58395fe2bc' date '29 April 2013' time
'2:15:43.242 pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.2' message
'second try for an initial commit with shootout tests' id
'e538d5dc-ff13-4753-a166-bb95af0c7e0b' date '29 April 2013' time '1:41:50.098
pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.1' message 'initial commit
with existing Shootout tests' id '67ba6a6a-5476-4dc0-892f-de76933491e8' date
'29 April 2013' time '1:40:20.34 pm' author 'lw' ancestors () stepChildren ()))
stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
\ No newline at end of file
+(name 'SPy-Benchmarks-lw.6' message 'added testing messages and modified
TestSuite to print stuff' id '72f3d7a3-5e09-43e5-a783-fb7c29117a52' date '31
May 2013' time '9:35:44.102 am' author 'lw' ancestors ((name
'SPy-Benchmarks-lw.5' message 'added another benchmark' id
'cfe2797f-9dd9-4073-aa6e-86cda0ba3dbf' date '3 May 2013' time '2:43:39.36 pm'
author 'lw' ancestors ((name 'SPy-Benchmarks-lw.4' message 'changed the test
running and collecting to work with the current spy vm
removed two of the shootout tests due to failure on spy' id
'9d1c1e0a-0209-45d3-8e0a-220919ab5701' date '29 April 2013' time '6:07:26.686
pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.3' message 'added tiny
benchmarks' id 'c8214449-4009-4a64-8284-3c58395fe2bc' date '29 April 2013' time
'2:15:43.242 pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.2' message
'second try for an initial commit with shootout tests' id
'e538d5dc-ff13-4753-a166-bb95af0c7e0b' date '29 April 2013' time '1:41:50.098
pm' author 'lw' ancestors ((name 'SPy-Benchmarks-lw.1' message 'initial commit
with existing Shootout tests' id '67ba6a6a-5476-4dc0-892f-de76933491e8' date
'29 April 2013' time '1:40:20.34 pm' author 'lw' ancestors () stepChildren ()))
stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ()))
stepChildren ())
\ No newline at end of file
diff --git a/SPy-Debugging.package/AutoStart.extension/class/startUp..st
b/SPy-Debugging.package/AutoStart.extension/class/startUp..st
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/AutoStart.extension/class/startUp..st
@@ -0,0 +1,29 @@
+*SPy-Debugging
+startUp: resuming
+ "The image is either being newly started (resuming is true), or it's
just been snapshotted.
+ If this has just been a snapshot, skip all the startup stuff."
+
+ | startupParameters launchers |
+ self active ifTrue: [^self].
+ self active: true.
+ resuming ifFalse: [^self].
+ HTTPClient determineIfRunningInBrowser.
+ startupParameters := AbstractLauncher extractParameters.
+ (startupParameters includesKey: 'apiSupported' asUppercase )
+ ifTrue: [
+ HTTPClient browserSupportsAPI: ((startupParameters at:
'apiSupported' asUppercase) asUppercase = 'TRUE').
+ HTTPClient isRunningInBrowser
+ ifFalse: [HTTPClient isRunningInBrowser: true]].
+ SPyVM stopUIProcess ifTrue: [
+ "This is used when executing benchmarks or tests"
+ SPyVM print: 'Image startup process going to sleep.'.
+ Processor activeProcess terminate].
+ self checkForUpdates
+ ifTrue: [^self].
+ self checkForPluginUpdate.
+ launchers := self installedLaunchers collect: [:launcher |
+ launcher new].
+ launchers do: [:launcher |
+ launcher parameters: startupParameters].
+ launchers do: [:launcher |
+ Smalltalk at: #WorldState ifPresent: [ :ws | ws
addDeferredUIMessage: [launcher startUp]]]
\ No newline at end of file
diff --git a/SPy-Debugging.package/AutoStart.extension/methodProperties.json
b/SPy-Debugging.package/AutoStart.extension/methodProperties.json
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/AutoStart.extension/methodProperties.json
@@ -0,0 +1,5 @@
+{
+ "class" : {
+ "startUp:" : "lw 5/30/2013 15:27" },
+ "instance" : {
+ } }
diff --git a/SPy-Debugging.package/AutoStart.extension/properties.json
b/SPy-Debugging.package/AutoStart.extension/properties.json
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/AutoStart.extension/properties.json
@@ -0,0 +1,2 @@
+{
+ "name" : "AutoStart" }
diff --git a/SPy-Debugging.package/SPyVM.class/class/isRunning.st
b/SPy-Debugging.package/SPyVM.class/class/isRunning.st
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/SPyVM.class/class/isRunning.st
@@ -0,0 +1,4 @@
+as yet unclassified
+isRunning
+ <primitive: 'isRSqueak' module: 'VMDebugging'>
+ ^false
\ No newline at end of file
diff --git a/SPy-Debugging.package/SPyVM.class/class/isTranslated.st
b/SPy-Debugging.package/SPyVM.class/class/isTranslated.st
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/SPyVM.class/class/isTranslated.st
@@ -0,0 +1,4 @@
+as yet unclassified
+isTranslated
+ <primitive: 'isVMTranslated' module: 'VMDebugging'>
+ ^true
\ No newline at end of file
diff --git a/SPy-Debugging.package/SPyVM.class/class/print..st
b/SPy-Debugging.package/SPyVM.class/class/print..st
--- a/SPy-Debugging.package/SPyVM.class/class/print..st
+++ b/SPy-Debugging.package/SPyVM.class/class/print..st
@@ -1,3 +1,4 @@
as yet unclassified
print: aString
- <primitive: 'debugPrint' module: 'VMDebugging'>
\ No newline at end of file
+ <primitive: 'debugPrint' module: 'VMDebugging'>
+ Transcript show: aString; cr
\ No newline at end of file
diff --git a/SPy-Debugging.package/SPyVM.class/class/stopUIProcess.st
b/SPy-Debugging.package/SPyVM.class/class/stopUIProcess.st
new file mode 100644
--- /dev/null
+++ b/SPy-Debugging.package/SPyVM.class/class/stopUIProcess.st
@@ -0,0 +1,4 @@
+as yet unclassified
+stopUIProcess
+ <primitive: 'stopUIProcess' module: 'VMDebugging'>
+ ^false
\ No newline at end of file
diff --git a/SPy-Debugging.package/SPyVM.class/methodProperties.json
b/SPy-Debugging.package/SPyVM.class/methodProperties.json
--- a/SPy-Debugging.package/SPyVM.class/methodProperties.json
+++ b/SPy-Debugging.package/SPyVM.class/methodProperties.json
@@ -1,7 +1,10 @@
{
"class" : {
"halt" : "lw 4/30/2013 12:44",
- "print:" : "lw 5/21/2013 11:00",
+ "isRunning" : "lw 5/29/2013 18:21",
+ "isTranslated" : "lw 5/29/2013 18:21",
+ "print:" : "lw 5/29/2013 20:08",
+ "stopUIProcess" : "lw 5/30/2013 15:27",
"trace" : "lw 4/30/2013 12:44",
"untrace" : "lw 4/30/2013 12:44" },
"instance" : {
diff --git a/SPy-Debugging.package/monticello.meta/version
b/SPy-Debugging.package/monticello.meta/version
--- a/SPy-Debugging.package/monticello.meta/version
+++ b/SPy-Debugging.package/monticello.meta/version
@@ -1,1 +1,1 @@
-(name 'SPy-Debugging-lw.2' message 'added printing' id
'26ffba4f-b747-480c-b7de-2517367fad07' date '21 May 2013' time '4:12:24.874 pm'
author 'lw' ancestors ((name 'SPy-Debugging-lw.1' message 'added class for
starting vm-tracing, etc.' id 'e6eeab78-6e5c-43bf-9dbc-dfdad29756bd' date '30
April 2013' time '3:54:48.262 pm' author 'lw' ancestors () stepChildren ()))
stepChildren ())
\ No newline at end of file
+(name 'SPy-Debugging-lw.3' message 'added some new primitives as understood by
the VM' id '0ce41f18-522d-4600-84f3-66119c403f3b' date '31 May 2013' time
'9:36:10.166 am' author 'lw' ancestors ((name 'SPy-Debugging-lw.2' message
'added printing' id '26ffba4f-b747-480c-b7de-2517367fad07' date '21 May 2013'
time '4:12:24.874 pm' author 'lw' ancestors ((name 'SPy-Debugging-lw.1' message
'added class for starting vm-tracing, etc.' id
'e6eeab78-6e5c-43bf-9dbc-dfdad29756bd' date '30 April 2013' time '3:54:48.262
pm' author 'lw' ancestors () stepChildren ())) stepChildren ())) stepChildren
())
\ No newline at end of file
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
