aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/test
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-05 08:05:28 +0100
committermarha <marha@users.sourceforge.net>2011-12-05 08:05:28 +0100
commitfab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf (patch)
treec59c3e084f79bd1f6060f9a5cedb5c48d4da14ee /xorg-server/test
parent5d6e342b3c2d0d3607b184b1472b816228839e3f (diff)
parent528f5bd58a139174170c4130c67dca30193c9057 (diff)
downloadvcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.gz
vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.tar.bz2
vcxsrv-fab1dd1d0549bbb52c3598e57aad4f0bfa5e55cf.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/test')
-rw-r--r--xorg-server/test/misc.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/xorg-server/test/misc.c b/xorg-server/test/misc.c
index d98449ba0..1f6cb9a94 100644
--- a/xorg-server/test/misc.c
+++ b/xorg-server/test/misc.c
@@ -76,7 +76,6 @@ static void dix_update_desktop_dimensions(void)
#define assert_dimensions(_x, _y, _w, _h) \
update_desktop_dimensions(); \
- printf("%d %d %d %d\n", screenInfo.x, screenInfo.y, screenInfo.width, screenInfo.height); \
assert(screenInfo.x == _x); \
assert(screenInfo.y == _y); \
assert(screenInfo.width == _w); \
@@ -88,8 +87,6 @@ static void dix_update_desktop_dimensions(void)
screenInfo.screens[idx]->width = _w; \
screenInfo.screens[idx]->height = _h; \
- printf("Testing\n");
-
/* single screen */
screenInfo.numScreens = 1;
set_screen(0, x, y, w, h);