Skip to content

Commit ffe4ab0

Browse files
committed
Fix GDB MultiThread test app on Windows hosts
The Windows implementation of JoinThread() does not accept a null ThreadRet* parameter.
1 parent 3f6b56c commit ffe4ab0

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.cdt.tests.dsf.gdb;singleton:=true
5-
Bundle-Version: 2.3.100.qualifier
5+
Bundle-Version: 2.3.200.qualifier
66
Bundle-Activator: org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin
77
Bundle-Vendor: %providerName
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.34.0,4.0.0)",

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/data/launch/src/MultiThread.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ static ThreadRet THREAD_CALL_CONV PrintHello(void *void_arg)
4646
int main(int argc, char *argv[])
4747
{
4848
ThreadHandle threads[NUM_THREADS];
49+
ThreadRet thread_ret;
4950
struct PrintHelloArgs args[NUM_THREADS];
5051
const char *thread_names[NUM_THREADS] = {"monday", "tuesday", "wednesday", "thursday", "friday"};
5152

@@ -99,7 +100,7 @@ int main(int argc, char *argv[])
99100
for (int t = 0; t < NUM_THREADS; t++)
100101
{
101102
printf("In main, joining thread #%d\n", t);
102-
JoinThread(threads[t], NULL);
103+
JoinThread(threads[t], &thread_ret);
103104
}
104105

105106
ThreadBarrierDestroy(&barrier_start);

dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2012, 2021 Contributors to the Eclipse Foundation
3+
Copyright (c) 2012, 2026 Contributors to the Eclipse Foundation
44
55
This program and the accompanying materials
66
are made available under the terms of the Eclipse Public License 2.0
@@ -21,7 +21,7 @@
2121
<relativePath>../../pom.xml</relativePath>
2222
</parent>
2323

24-
<version>2.3.100-SNAPSHOT</version>
24+
<version>2.3.200-SNAPSHOT</version>
2525
<artifactId>org.eclipse.cdt.tests.dsf.gdb</artifactId>
2626
<packaging>eclipse-test-plugin</packaging>
2727

0 commit comments

Comments
 (0)