[Gnash-commit] /srv/bzr/gnash/trunk r9595: make check fixes and mit-shm leak fix (bug #24068)

[Sandro Santilli]

------------------------------------------------------------
revno: 9595
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2008-08-15 10:50:59 +0200
message:
  make check fixes and mit-shm leak fix (bug #24068)
modified:
  gui/gtk_glue_agg.cpp
  testsuite/libnet.all/Makefile.am
  testsuite/misc-swfc.all/matrix_accuracy_test1.sc
    ------------------------------------------------------------
    revno: 9594.1.1
    author: Craig Kelley <address@hidden>
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-08-15 10:45:27 +0200
    message:
      Fix shared memory segment leak when using MIT-SHM
    modified:
      gui/gtk_glue_agg.cpp
    ------------------------------------------------------------
    revno: 9594.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-08-15 10:47:48 +0200
    message:
      Temporarely disable test_rtmp (doesn't work in its current form).
      To be re-enabled when rob merges the missing parts.
    modified:
      testsuite/libnet.all/Makefile.am
    ------------------------------------------------------------
    revno: 9594.1.3
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-08-15 10:49:47 +0200
    message:
      xcheck -> check (after matrix parameters caching)
    modified:
      testsuite/misc-swfc.all/matrix_accuracy_test1.sc

=== modified file 'gui/gtk_glue_agg.cpp'
--- a/gui/gtk_glue_agg.cpp      2008-07-23 08:16:16 +0000
+++ b/gui/gtk_glue_agg.cpp      2008-08-15 08:45:27 +0000
@@ -201,6 +201,9 @@
         destroy_shm_image();
         return;
     }
+
+    // mark segment for automatic destruction after last process detaches
+    shmctl(_shm_info->shmid, IPC_RMID, 0);
   
     //log_debug("create_shm_image() OK"); // <-- remove this
 #endif // ENABLE_MIT_SHM

=== modified file 'testsuite/libnet.all/Makefile.am'
--- a/testsuite/libnet.all/Makefile.am  2008-07-22 21:24:49 +0000
+++ b/testsuite/libnet.all/Makefile.am  2008-08-15 08:47:48 +0000
@@ -47,16 +47,17 @@
 check_PROGRAMS = \
        test_cque \
        test_handler \
-       test_http \
-       test_rtmp 
+       test_http 
+
+#test_rtmp 
 
 test_http_SOURCES = test_http.cpp
 test_http_LDADD = $(AM_LDFLAGS) 
 test_http_DEPENDENCIES = site-update
 
-test_rtmp_SOURCES = test_rtmp.cpp
-test_rtmp_LDADD = $(AM_LDFLAGS) 
-test_rtmp_DEPENDENCIES = site-update
+#test_rtmp_SOURCES = test_rtmp.cpp
+#test_rtmp_LDADD = $(AM_LDFLAGS) 
+#test_rtmp_DEPENDENCIES = site-update
 
 test_cque_SOURCES = test_cque.cpp
 test_cque_LDADD = $(AM_LDFLAGS) 

=== modified file 'testsuite/misc-swfc.all/matrix_accuracy_test1.sc'
--- a/testsuite/misc-swfc.all/matrix_accuracy_test1.sc  2008-06-13 08:17:26 
+0000
+++ b/testsuite/misc-swfc.all/matrix_accuracy_test1.sc  2008-08-15 08:49:47 
+0000
@@ -38,13 +38,13 @@
         check_equals(mc1._xscale, 100);
         check_equals(mc1._yscale, 100);
         mc1._rotation = 30;
-        xcheck_equals(mc1._xscale, 100);
-        xcheck_equals(mc1._yscale, 100);
+        check_equals(mc1._xscale, 100);
+        check_equals(mc1._yscale, 100);
         mc1._rotation = 60;
-        xcheck_equals(mc1._xscale, 100);
-        xcheck_equals(mc1._yscale, 100);
+        check_equals(mc1._xscale, 100);
+        check_equals(mc1._yscale, 100);
         mc1._xscale = 200;
-        xcheck_equals(mc1._rotation, 60);
+        check_equals(mc1._rotation, 60);
         
         // reset mc1 to normal status for later tests.
         mc1._xscale = 100; 
@@ -60,10 +60,10 @@
         mc1._x = mc1._y = 100;
         
         mc1._xscale = -1;
-        xcheck_equals(mc1._xscale, -1);
+        check_equals(mc1._xscale, -1);
         mc1._xscale = 4294967295.0; // (unsigned)(0xffffffff);
-        xcheck_equals(mc1._xscale, 4294967295.0);
-        xcheck_equals(mc1._width, 2359295);
+        check_equals(mc1._xscale, 4294967295.0);
+        check_equals(mc1._width, 2359295);
         check_equals(mc1._height, 30);
         mc1._yscale = 65536 * 100;
         check_equals(mc1._height, 0);