Changeset 1164

Timestamp:

05/14/08 06:18:23 (2 months ago)

Author:

fraserofthenight

Message:

Added support to disable stack tracing in flute (since it makes Ddbg segfault).

Files:

• trunk/descent.unittest/flute/src/org/dsource/descent/flute/flute.d (modified) (3 diffs)
• trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d (modified) (8 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/launcher/IUnittestLaunchConfigurationAttributes.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfiguration.java (modified) (7 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfigurationTab.java (modified) (6 diffs)
• trunk/descent.unittest/src/descent/internal/unittest/model/TestRunSession.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.java (modified) (1 diff)
• trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.properties (modified) (2 diffs)

trunk/descent.unittest/flute/src/org/dsource/descent/flute/flute.d

@@ -308 +308 @@
-    import std.c.stdlib: exit, EXIT_SUCCESS, EXIT_FAILURE;
-    import std.c.string : strlen;
-find, 
+
-    import std.ctype : isdigit;
-    import std.asserterror : AssertError;
@@ -347 +347 @@
-/// A string containing version information, printed at the start of the application
-private const char[] VERSION_STRING = "flute 0.1";
+
+/**
+ * The config attribute representing whether stacktraces should be used, either
+ * "on" or "off"
+ */
+private const string STACKTRACE_ATTR = "stacktrace";
-
-/*
@@ -921 +927 @@
-private void fluteMain()
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    io.write(VERSION_STRING ~ "\r\n");
+    
+    // Initialize the test registry (find all the tests)
-    initRegistry();
+    
+    // Go into the main loop
-    if(!commandLoop())
-        fluteExit();

trunk/descent.unittest/flute/src/org/dsource/descent/flute/io.d

@@ -5 +5 @@
- * provide socket I/O.
- * 
-
-
-
-
-
-
+
+
- */
-module org.dsource.descent.flute.io;
@@ -20 +16 @@
-else
-{
+    public import std.string : find;
+    
+    import std.c.stdlib : exit, EXIT_SUCCESS, EXIT_FAILURE;
+    import std.file : exists, read;
+
-    version(FluteCommandLine)
-    {
@@ -26 +27 @@
-    else
-    {
-        import std.c.stdlib : exit, EXIT_SUCCESS, EXIT_FAILURE;
-        import std.ctype : isdigit;
-        import std.file : exists, read;
-        import std.socket : Socket, TcpSocket, AddressFamily, InternetAddress,
-            SocketShutdown, SocketException;
@@ -43 +42 @@
- * socket on the same port more than once will obviously not work too well).
- */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**
@@ -77 +95 @@
-}
-
+private const string CONFIG_FILE_NAME = ".fluteconfig";
+private const string PORT_ATTR = "port";
+
-version(Tango)
-{
@@ -83 +104 @@
-else
-{
+    string[string] readConfig()
+    {
+        if(!exists(CONFIG_FILE_NAME))
+        {
+            writef("Couldn't open config file %s\n", CONFIG_FILE_NAME);
+            exit(EXIT_FAILURE);
+        }
+        
+        string contents = cast(string) read(CONFIG_FILE_NAME);
+        return parseConfigFile(contents);
+    }
+    
-    version(FluteCommandLine)
-    {
-        private final class IOProviderImpl : IOProvider
-
+
+
+
+
+
+
-            public void write(string str)
-            {
@@ -110 +148 @@
-            Stream stream;
-            
-
+string[string] config
-            {   
-                try
-                {
+                    string* portStr = PORT_ATTR in config;
+                    if(!portStr)
+                    {
+                        writef("No port defined in config file\n");
+                        exit(EXIT_FAILURE);
+                    }
+                    uint port = atoi(*portStr);
+                    
-                    serv = new TcpSocket(AddressFamily.INET);
-getPort()
+port
-                    serv.listen(0);
-                    Socket conn = serv.accept();
@@ -156 +202 @@
-                return stream.readLine();
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/descent.unittest/src/descent/internal/unittest/launcher/IUnittestLaunchConfigurationAttributes.java

@@ -22 +22 @@
-     */
-    public static final String INCLUDE_SUBPACKAGES_ATTR= DescentUnittestPlugin.PLUGIN_ID+".INCLUDE_SUBPACKAGES"; //$NON-NLS-1$
+    
+    /**
+     * If this attribute is defined, it sets whether stack tracing should be enabled
+     * in the fluted executable. It must be one of:
+     * 
+     * {@link #STACKTRACING_ENABLED} - Stack tracing is enabled
+     * {@link #STACKTRACING_DISABLED_IN_DEBUG_MODE} - Stack tracing is disabled
+     *     if this launch configuration is launched in debug mode
+     * {@link #STACKTRACING_DISABLED} - Stack tracing is disabled
+     */
+    public static final String ENABLE_STACKTACING_ATTR= DescentUnittestPlugin.PLUGIN_ID+".ENABLE_STACKTRACING"; //$NON-NLS-1$
+    
+    /**
+     * Constant used for {@link #ENABLE_STACKTACING_ATTR}. Stack tracing is enabled.
+     * 
+     * @see #ENABLE_STACKTACING_ATTR
+     */
+    public static final String STACKTRACING_ENABLED= "enabled"; //$NON-NLS-1$
+    
+    /**
+     * Constant used for {@link #ENABLE_STACKTACING_ATTR}. Stack tracing is enabled
+     * except in debug mode.
+     * 
+     * @see #ENABLE_STACKTACING_ATTR
+     */
+    public static final String STACKTRACING_DISABLED_IN_DEBUG_MODE= "disabled_in_debug_mode"; //$NON-NLS-1$
+    
+    /**
+     * Constant used for {@link #ENABLE_STACKTACING_ATTR}. Stack tracing is disabled.
+     * 
+     * @see #ENABLE_STACKTACING_ATTR
+     */
+    public static final String STACKTRACING_DISABLED= "disabled"; //$NON-NLS-1$
-}

trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfiguration.java

@@ -27 +27 @@
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.ILaunchManager;
-
-import descent.core.IJavaElement;
@@ -57 +58 @@
-     * stack frame and trying to read the arguments like that).
-     */
-PORT_FILENAME = ".fluteport
+CONFIG_FILENAME = ".fluteconfig
-    
-    @Override
-    public void launch(ILaunchConfiguration config, String mode,
-            ILaunch launch, IProgressMonitor monitor) throws CoreException
-
-
-
+
-        if (monitor == null)
-            monitor = new NullProgressMonitor();
@@ -82 +81 @@
-            if(monitor.isCanceled())
-                return;
-
+
-            // Get the port
-
-
-
-
+
+
+
+
+
+
+
-            if(monitor.isCanceled())
-                return;
-            
-            // Create the file with the port
-            String portFilePath = getPortFilePath(config);
-            File portFile = createFile(portFilePath);
-            writeToFile(Integer.toString(port), portFile);
-            monitor.worked(15); // 55
-            
@@ -165 +162 @@
-    }
-    
+    private void createConfigFile(ILaunchConfiguration config, String mode, 
+            int port) throws CoreException
+    {   
+        // Get whether stack tracing is enabled
+        boolean stackTrace;
+        String stackTraceStr = config.getAttribute(IUnittestLaunchConfigurationAttributes.ENABLE_STACKTACING_ATTR,
+                IUnittestLaunchConfigurationAttributes.STACKTRACING_DISABLED_IN_DEBUG_MODE);
+        if(IUnittestLaunchConfigurationAttributes.STACKTRACING_ENABLED.equals(stackTraceStr))
+            stackTrace = true;
+        else if(IUnittestLaunchConfigurationAttributes.STACKTRACING_DISABLED.equals(stackTraceStr))
+            stackTrace = false;
+        else
+            stackTrace = !mode.equals(ILaunchManager.DEBUG_MODE);
+        
+        // Generate the string which should be written to the file
+        StringBuilder contents = new StringBuilder();
+        contents.append("port="); //$NON-NLS-1$
+        contents.append(Integer.toString(port));
+        contents.append("\nstacktrace="); //$NON-NLS-1$
+        contents.append(stackTrace ? "on\n" : "off\n"); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        // Generate and write the file
+        String configFilePath = getConfigFilePath(config);
+        File configFile = createFile(configFilePath);
+        writeToFile(contents.toString(), configFile);
+    }
+    
-    private static int getPort(String portStr) throws CoreException
-    {
@@ -174 +198 @@
-        catch(NumberFormatException e) { }
-        
- 1024
+= 0
-            port = findFreePort();
-        
@@ -204 +228 @@
-    }
-    
+    private String getConfigFilePath(ILaunchConfiguration config) throws CoreException
+    {
+        File dirFile = verifyWorkingDirectory(config);
+        String dirPath;
+        if(null != dirFile)
+        {
+            dirPath = dirFile.getPath();
+        }
+        else
+        {
+            File exe = new File(verifyProgramPath(config).toOSString());
+            if(!exe.exists() || !exe.isFile())
+                throw error(JUnitMessages.UnittestLaunchConfiguration_program_does_not_exist);
+            dirPath = exe.getParent();
+        }
+        return dirPath + File.separator + CONFIG_FILENAME;
+    }
+    
-    private static File createFile(String path) throws CoreException
-    {
@@ -239 +281 @@
-        }
-    }
-    
-    private String getPortFilePath(ILaunchConfiguration config) throws CoreException
-    {
-        File dirFile = verifyWorkingDirectory(config);
-        String dirPath;
-        if(null != dirFile)
-        {
-            dirPath = dirFile.getPath();
-        }
-        else
-        {
-            File exe = new File(verifyProgramPath(config).toOSString());
-            if(!exe.exists() || !exe.isFile())
-                throw error(JUnitMessages.UnittestLaunchConfiguration_program_does_not_exist);
-            dirPath = exe.getParent();
-        }
-        return dirPath + File.separator + PORT_FILENAME;
-    }
-
-    @Override

trunk/descent.unittest/src/descent/internal/unittest/launcher/UnittestLaunchConfigurationTab.java

@@ -75 +75 @@
-        createTestSelection(comp);
-        createPortSelection(comp);
+        createTraceSelection(comp);
-
-        Dialog.applyDialogFont(comp);
@@ -409 +410 @@
-        }
-        
- 1024
+= 0
-        {
-            return JUnitMessages.UnittestLaunchConfigurationTab_error_port_number;
@@ -416 +417 @@
-        return null;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //--------------------------------------------------------------------------
-    // Initialization
@@ -424 +542 @@
-        updateTestContainerFromConfig(config);
-        updatePortFromConfig(config);
+        updateTraceFromConfig(config);
-    }
-
@@ -475 +594 @@
-        config.setAttribute(IUnittestLaunchConfigurationAttributes.INCLUDE_SUBPACKAGES_ATTR,
-                fIncludeSubpackagesCheckbox.getSelection() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
-
+
+
-        // TODO get the fluted program executable
-        config.setAttribute(IDescentLaunchConfigurationConstants.ATTR_PROGRAM_NAME,
@@ -498 +618 @@
-        config.setAttribute(IDescentLaunchConfigurationConstants.ATTR_PROJECT_NAME, project);
-        config.setAttribute(IUnittestLaunchConfigurationAttributes.PORT_ATTR, ""); //$NON-NLS-1$
+        config.setAttribute(IUnittestLaunchConfigurationAttributes.ENABLE_STACKTACING_ATTR, IUnittestLaunchConfigurationAttributes.STACKTRACING_DISABLED_IN_DEBUG_MODE);
-    }
-

trunk/descent.unittest/src/descent/internal/unittest/model/TestRunSession.java

@@ -130 +130 @@
-                    if(fTestRunnerClient.isConnected())
-                        fTestRunnerClient.run();
+                    fTestRunnerClient.terminate();
-                }
-            }

trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.java

@@ -107 +107 @@
-    public static String UnittestLaunchConfigurationTab_label_test_container_selection;
-    public static String UnittestLaunchConfigurationTab_label_use_specified_port;
+    public static String UnittestLaunchConfigurationTab_stack_tacing_group;
+    public static String UnittestLaunchConfigurationTab_stacktrace_always_disabled;
+    public static String UnittestLaunchConfigurationTab_stacktrace_always_enabled;
+    public static String UnittestLaunchConfigurationTab_stacktrace_disabled_in_debug;
+    public static String UnittestLaunchConfigurationTab_stacktrace_info;
-    public static String UnittestLaunchConfigurationTab_tab_label;
-    

trunk/descent.unittest/src/descent/internal/unittest/ui/JUnitMessages.properties

@@ -67 +67 @@
-UnittestLaunchConfigurationTab_label_test_container=Test container:
-UnittestLaunchConfigurationTab_label_include_subpackages=Include subpackages if a package is selected
+UnittestLaunchConfigurationTab_stacktrace_always_enabled=Enable stack tracing
+UnittestLaunchConfigurationTab_stacktrace_always_disabled=Always disable stack tracing
-UnittestLaunchConfigurationTab_default_package=(default package)
+UnittestLaunchConfigurationTab_stacktrace_info=The mechanism used to generate stack traces can cause issues when using some debuggers, flectioned, or other backtrace hacks. In particular, it causes Ddbg to segfault, so should always be turned off under Ddbg. If problems are encountered, try turning off stack tracing.
-UnittestLaunchConfigurationTab_label_test_container_selection=Select a project, package, or module from which all unit tests will be run
+UnittestLaunchConfigurationTab_stacktrace_disabled_in_debug=Disable stack tracing in debug mode only
-UnittestLaunchConfigurationTab_label_automatically_choose_port=Automatically select an available port
-UnittestLaunchConfigurationTab_label_use_specified_port=Use the specified port
@@ -84 +88 @@
-UnittestLaunchConfigurationTab_error_test_container_does_not_exist=Test container does not exist
-UnittestLaunchConfigurationTab_error_invalid_port=Invalid port number
+UnittestLaunchConfigurationTab_stack_tacing_group=Stack tracing
-UnittestLaunchConfiguration_program_does_not_exist=Program file does not exist
-024
+
-UnittestLaunchConfigurationTab_tab_label=Test
-UnittestLaunchConfigurationTab_group_port=Port for test runner