Merge pull request #748 from cs136/staging

Re-enable offline mode in staging/stable.

Author: e45lee

CMakeLists.txt

@@ -61,7 +61,7 @@ ELSE()
   SET(GIT_DIRTY True)
 ENDIF()
 
-set(SEASHELL_VERSION "3.0.2")
+set(SEASHELL_VERSION "3.0.3")
 if(GIT_DIRTY)
   set(GIT_COMMIT_HASH "${GIT_COMMIT_HASH}-dirty")
 endif()

doc/release/3.0.3.scrbl

@@ -0,0 +1,9 @@
+#lang scribble/manual
+@(require "../utils.rkt")
+
+@seashell-title[#:tag "build-3.0.3"]{v.3.0.3}
+Summary:
+@itemlist[
+  @item{Re-enable offline mode.}
+  @item{Fix issue with Racket listening on two TCP/IP sockets (which caused socket unavailable issues).}
+]

doc/release/main.scrbl

@@ -22,3 +22,4 @@ version of Seashell.
 @include-section["3.0.0.scrbl"]
 @include-section["3.0.1.scrbl"]
 @include-section["3.0.2.scrbl"]
+@include-section["3.0.3.scrbl"]

src/collects/seashell-config.rkt.in

@@ -175,6 +175,8 @@
       (cons 'project-settings-filename     (string->path ".project-settings.txt"))
 
       ;; These flags can be overridden by the configuration file.
+      ;; Listen IP (default ::0)
+      (cons 'listen-ip                     "::0")
       ;; Default compiler flags.
       (cons 'compiler-flags               '(;; Warning flags.
                                             "-Wall" "-Werror=int-conversion" "-Werror=int-to-pointer-cast" "-Werror=return-type" "-Werror=import-preprocessor-directive-pedantic" "-Werror=incompatible-pointer-types"

src/collects/seashell/backend/dispatch.rkt

@@ -115,7 +115,7 @@
            [(list pid test-name "error" exit-code stderr stdout asan-output)
             (send-message connection `#hash((id . -4) (success . #t)
                                            (result . #hash((pid . ,pid) (test_name . ,test-name) (result . "error")
-                                                                        (exit_code . ,exit-code)
+                                                                        (status . ,exit-code)
                                                                         (stderr . ,(bytes->string/utf-8 stderr #\?))
                                                                         (stdout . ,(bytes->string/utf-8 stdout #\?))
                                                                         (asan_output . ,(bytes->string/utf-8 asan-output #\?))))))]

src/collects/seashell/backend/server.rkt

@@ -318,7 +318,7 @@
                  #:dispatch seashell-dispatch
                  #:port 0
                  #:dispatch-server-connect@ ssl-unit
-                 #:listen-ip #f
+                 #:listen-ip (read-config 'listen-ip)
                  #:confirmation-channel conf-chan))
           (define start-result (async-channel-get conf-chan))
           (when (exn? start-result)

src/frontend/frontend/console.js

@@ -69,6 +69,10 @@ angular.module('frontend-app')
       // frame: column, file, frame#, function, function_offset, line, module, offset
       // raw message
       maybe_log(err);
+      if(!err) {
+        self.write("AddressSanitizer output is not available.\n");
+        return;
+      }
       if(err.error_type == "unknown" && err.raw_message === "") { return; }
       var to_print = [];
       to_print.push("Memory error occurred! Type of error: " + err.error_type);
@@ -201,7 +205,11 @@ angular.module('frontend-app')
         self.write(res.stdout);
         self.write('---\n');
         self.write('Expected output (stdout):\n');
-        printExpectedFromDiff(res);
+        if('diff' in res) {
+            printExpectedFromDiff(res);
+        } else if('expect' in res) {
+            self.write(res.expect);
+        }
         self.write('---\n');
         self.write('Produced errors (stderr):\n');
         self.write(res.stderr);
@@ -211,7 +219,7 @@ angular.module('frontend-app')
         }
       } else if(res.result==="error") {
         self.write('----------------------------------\n');
-        self.write(sprintf("Test \"%s\" caused an error (with return code %d)!\n", res.test_name, res.exit_code));
+        self.write(sprintf("Test \"%s\" caused an error (with return code %d)!\n", res.test_name, res.status));
         self.write('Produced output (stdout):\n');
         self.write(res.stdout);
         self.write('---\n');

src/frontend/frontend/file.js

@@ -661,7 +661,7 @@ angular.module('frontend-app')
               if (conts.data.length === 0) self.loaded = true;
               self.project.updateMostRecentlyUsed(self.question, self.folder, self.file);
               self.editor.clearHistory();
-              if (conts.history.slice(1).length > 1) {
+              if (conts.history && conts.history.slice(1).length > 1) {
                 self.undoHistory = JSON.parse(conts.history);
                 self.editor.setHistory(self.undoHistory);
               } else {

src/frontend/frontend/modals.js

@@ -273,10 +273,10 @@ angular.module('frontend-app')
                   // Write default contents.
                   if (extension === 'c' || extension === 'h') {
                       result = project.createFile($scope.new_file_folder, question, filename,
-                                        sprintf("/**\n File: %s\nEnter a description for this file.\n*/\n", filename));
+                                        sprintf("/**\n File: %s\n Enter a description for this file.\n*/\n", filename));
                   } else if (extension === 'rkt') {
                       result = project.createFile($scope.new_file_folder, question, filename,
-                                        sprintf("#lang racket\n;; File %s\n;;Enter a description for this file.\n", filename));
+                                        sprintf("#lang racket\n;; File %s\n;; Enter a description for this file.\n", filename));
                   } else {
                       result = project.createFile($scope.new_file_folder, question, filename);
                   }

src/frontend/frontend/templates/settings-template.html

@@ -59,11 +59,11 @@ <h4 class="modal-title">
         Disabled
       </label>
       <label class="radio-inline">
-        <input name="offline-mode" type="radio" ng-model="temp.offline_mode" ng-value="1" disabled>
+        <input name="offline-mode" type="radio" ng-model="temp.offline_mode" ng-value="1">
         Enabled
       </label>
       <label class="radio-inline">
-        <input name="offline-mode" type="radio" ng-model="temp.offline_mode" ng-value="2" disabled>
+        <input name="offline-mode" type="radio" ng-model="temp.offline_mode" ng-value="2">
         Forced
       </label>
 </div>