From 3e805bbcc032d8b4365e95b5a0033b8b99790eae Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Fri, 15 Sep 2023 22:38:10 +0200 Subject: [PATCH 1/3] tdb: add up button (cherry-picked from commit bd5135a0fbcb93cddc70bebc4851fe7fbc077c57) --- .../TraceDebugger.class/instance/controlButtonSpecs.st | 5 +++-- .../TraceDebugger.class/methodProperties.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st b/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st index 1846d681..4f9eaa6d 100644 --- a/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st +++ b/packages/TraceDebugger.package/TraceDebugger.class/instance/controlButtonSpecs.st @@ -6,6 +6,7 @@ controlButtonSpecs ('Restart' restart 'rewind this context to its start (r)' canStepBackward) ('Into' stepInto 'step into next message send (e)' canStepForward) ('Over' stepOver 'step over next message send (t)' canStepForward) - ('Through' stepThrough 'step into next block/out of current block (T)' canStepForward) + ('Through' stepThrough 'step into next block/out of current block (T)' canStepForward) ('Back' stepBack 'rewind before previous message send (B)' canStepBackward) - ('Where' showWhere 'select next expression (w)' hasContextSelected)) \ No newline at end of file + ('Where' showWhere 'select next expression' hasContextSelected) + ('Up' jumpToSender 'jump to sender (w)' hasContextSelected)) \ No newline at end of file diff --git a/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json b/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json index 131b89e4..9f356ed1 100644 --- a/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json +++ b/packages/TraceDebugger.package/TraceDebugger.class/methodProperties.json @@ -124,7 +124,7 @@ "contextTreeKey:from:event:" : "ct 8/1/2022 01:10", "contextVariablesInspector" : "ct 11/20/2021 16:11", "contextVariablesInspectorClass" : "ct 3/19/2022 20:49", - "controlButtonSpecs" : "ct 2/21/2022 19:43", + "controlButtonSpecs" : "ct 9/15/2023 22:37", "controlButtonsFrame" : "ct 11/20/2021 15:33", "copyBugReportToClipboard" : "ct 3/12/2022 17:40", "currentCompiledMethod" : "ct 11/20/2021 21:08", From d4c88103c143a0017a41b18d13f5450f31a4d255 Mon Sep 17 00:00:00 2001 From: Christoph Thiede Date: Fri, 15 Sep 2023 22:41:28 +0200 Subject: [PATCH 2/3] help/tdb: mention up button (cherry-picked from commit fe9d35f7135c020f36e33ddd0555aed76a348471) --- .../TraceDebuggerHelp.class/class/basicBasicNavigation.st | 3 ++- .../TraceDebuggerHelp.class/class/figureButtonUp.st | 4 ++++ .../TraceDebuggerHelp.class/methodProperties.json | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st index 91e6849e..b686127a 100644 --- a/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st +++ b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/basicBasicNavigation.st @@ -17,9 +17,10 @@ You can use the stepping buttons to navigate through the program trace. The trac <#figureButtonThrough> Step to the next expression in the same method, including expressions in blocks. <#figureButtonBack> Step back the previous message send. <#figureButtonWhere> Select the expression that will be executed next. +<#figureButtonUp> Jump to the sender of the current context. Alternatively to the stepping buttons, you can also navigate through the context tree: Red-click any context to jump to the time where it was active. Shift + red-click any context to select its sender at its activation time.! -]style[(16 1 97 13 1257)a0b,a0,,i,!' readStream nextChunkText) +]style[(16 1 97 13 1318)a0b,a0,,i,!' readStream nextChunkText) key: #basicBasicNavigation; shouldStyle: false; yourself \ No newline at end of file diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st new file mode 100644 index 00000000..f55d76f7 --- /dev/null +++ b/packages/TraceDebugger.package/TraceDebuggerHelp.class/class/figureButtonUp.st @@ -0,0 +1,4 @@ +figures +figureButtonUp + + ^ self figureButtonNamed: 'Up' \ No newline at end of file diff --git a/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json b/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json index 508f8e6b..7d5144ac 100644 --- a/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json +++ b/packages/TraceDebugger.package/TraceDebuggerHelp.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "applyUserInterfaceTheme" : "ct 3/18/2022 20:45", "basicAdvancedNavigation" : "ct 8/1/2022 01:11", - "basicBasicNavigation" : "ct 6/18/2022 21:29", + "basicBasicNavigation" : "ct 9/15/2023 22:40", "basicContextFilters" : "ct 3/18/2022 20:43", "basicEntryPoints" : "ct 5/11/2022 22:54", "basicFindingContexts" : "ct 3/18/2022 20:32", @@ -28,6 +28,7 @@ "figureButtonProceed" : "ct 3/18/2022 19:36", "figureButtonRestart" : "ct 3/18/2022 19:38", "figureButtonThrough" : "ct 3/18/2022 19:38", + "figureButtonUp" : "ct 9/15/2023 22:40", "figureButtonWhere" : "ct 3/18/2022 19:38", "figureContextAddFilter" : "ct 3/18/2022 21:16", "figureContextToolTip" : "ct 3/18/2022 18:35", From 9d1175a29936b36142a8423891a7cad0b080be66 Mon Sep 17 00:00:00 2001 From: Christoph Thiede <38782922+LinqLover@users.noreply.github.com> Date: Tue, 26 Dec 2023 21:17:13 +0100 Subject: [PATCH 3/3] ci: use stable image/vm for squeak60 --- .github/workflows/tests.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9c1a3fe7..34758f9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,7 +3,7 @@ name: Tests & Benchmarks on: [push, workflow_dispatch] env: - SMALLTALK_IMAGE: Squeak64-Trunk + SMALLTALK_IMAGE: Squeak64-6.0 jobs: test: runs-on: ubuntu-latest @@ -13,11 +13,8 @@ jobs: uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ env.SMALLTALK_IMAGE }} - - id: download-vm - name: Download latest VM - run: scripts/download_vm.sh - name: Run tests - run: smalltalkci -s "${{ steps.smalltalkci.outputs.smalltalk-image }}" --vm "${{ steps.download-vm.outputs.vm-path }}" tests.smalltalk.ston + run: smalltalkci -s "${{ steps.smalltalkci.outputs.smalltalk-image }}" tests.smalltalk.ston timeout-minutes: 15 env: # for uploading coverage reports @@ -31,11 +28,8 @@ jobs: uses: hpi-swa/setup-smalltalkCI@v1 with: smalltalk-image: ${{ env.SMALLTALK_IMAGE }} - - id: download-vm - name: Download latest VM - run: scripts/download_vm.sh - name: Run benchmarks - run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} --vm "${{ steps.download-vm.outputs.vm-path }}" benchmarks.smalltalk.ston + run: smalltalkci -s ${{ steps.smalltalkci.outputs.smalltalk-image }} benchmarks.smalltalk.ston timeout-minutes: 15 env: TDB_BENCHMARK_RESULTS_PATH: ${{ runner.temp }}/benchmark-data.json