aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-11-25 02:49:23 +0100
committerSven Gothel <[email protected]>2011-11-25 02:49:23 +0100
commit05cd5e48fc5294709eaa6429913814f05ba14ab2 (patch)
treebc6f89911ea48b04da71912fe72bd744b0f40d8b
parentf8c906894a205a35feff018660278bd338f6d5fc (diff)
Fix native manual test 'displayMultiple02' for multiple X11 Display connection open/close in various order
XLockDisplay/XUnlockDisplay shall only be used if XInitThreads() was successful, otherwise it has no effect (X11 spec).
-rw-r--r--src/test/native/displayMultiple02.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/test/native/displayMultiple02.c b/src/test/native/displayMultiple02.c
index cc6a8155b..df6666aff 100644
--- a/src/test/native/displayMultiple02.c
+++ b/src/test/native/displayMultiple02.c
@@ -11,23 +11,19 @@
static void testOrder(int reverseDestroyOrder, const char * msg);
-static int useXInitThreads = 0;
static int useXLockDisplay = 0;
int main(int nargs, char **vargs) {
int arg=1;
while(arg<nargs) {
- if(0 == strcmp(vargs[arg], "-xthreads")) {
- useXInitThreads = 1;
- } else if(0 == strcmp(vargs[arg], "-xlock")) {
+ if(0 == strcmp(vargs[arg], "-xlock")) {
useXLockDisplay = 1;
}
arg++;
}
- fprintf(stderr, "-xthreads (XInitThreads): %d\n", useXInitThreads);
fprintf(stderr, "-xlock (XLockDisplay): %d\n", useXLockDisplay);
- if( useXInitThreads ) {
+ if( useXLockDisplay ) {
XInitThreads();
}
testOrder(0, "Normal order");