From 3f14a1325c77c78c0e61eab565fda23ca532cec8 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 5 Aug 2008 20:27:17 +0000
Subject: [PATCH] all drs test suites now passing except module language

svn: r11091
---
 .../english-string-constants.ss               |  6 ++---
 collects/tests/drscheme/language-test.ss      | 10 ++++----
 collects/tests/drscheme/repl-test.ss          | 24 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/collects/string-constants/english-string-constants.ss b/collects/string-constants/english-string-constants.ss
index ead1d150c9..53810673f8 100644
--- a/collects/string-constants/english-string-constants.ss
+++ b/collects/string-constants/english-string-constants.ss
@@ -847,11 +847,11 @@ please adhere to these guidelines:
  (scheme-menu-name "S&cheme")
  (execute-menu-item-label "Run")
  (execute-menu-item-help-string "Restart the program in the definitions window")
- (ask-quit-menu-item-label "Ask the program to quit")
+ (ask-quit-menu-item-label "Ask the Program to Quit")
  (ask-quit-menu-item-help-string "Uses break-thread to stop the primary thread of the current evaluation")
- (force-quit-menu-item-label "Force the program to quit")
+ (force-quit-menu-item-label "Force the Program to Quit")
  (force-quit-menu-item-help-string "Uses custodian-shutdown-all to abort the current evaluation")
- (limit-memory-menu-item-label "Limit memory...")
+ (limit-memory-menu-item-label "Limit Memory...")
  (limit-memory-msg-1 "The limit will take effect the next time the program")
  (limit-memory-msg-2 "is Run, and it must be at least 100 megabytes.")
  (limit-memory-unlimited "Unlimited")
diff --git a/collects/tests/drscheme/language-test.ss b/collects/tests/drscheme/language-test.ss
index 830ac07f95..b5c28efa6e 100644
--- a/collects/tests/drscheme/language-test.ss
+++ b/collects/tests/drscheme/language-test.ss
@@ -1353,11 +1353,11 @@ the settings above should match r5rs
                     (printf ">> finished ~a\n" (syntax->datum #'arg))))]))
 
 (define (run-test)
-  ;(go pretty-big)
+  (go pretty-big)
   (go r5rs)
-  ;(go beginner)
-  ;(go beginner/abbrev)
-  ;(go intermediate)
-  ;(go intermediate/lambda)
+  (go beginner)
+  (go beginner/abbrev)
+  (go intermediate)
+  (go intermediate/lambda)
   (go advanced)
   )
diff --git a/collects/tests/drscheme/repl-test.ss b/collects/tests/drscheme/repl-test.ss
index 89f4238dd5..795b3d7087 100644
--- a/collects/tests/drscheme/repl-test.ss
+++ b/collects/tests/drscheme/repl-test.ss
@@ -1321,18 +1321,21 @@ This produces an ACK message
       (let/ec escape 
         (for-each (run-single-test (get-int-pos) escape raw?) test-data))))
   
+  (define kill-menu-item "Force the Program to Quit")
+  
   (define (kill-tests)
+    
+    (next-test)
     (clear-definitions drscheme-frame)
     (do-execute drscheme-frame)
-    
-    (test:menu-select "Scheme" "Kill")
-    
+    (test:menu-select "Scheme" kill-menu-item)
     (let ([win (wait-for-new-frame drscheme-frame)])
       (test:button-push "OK")
       (let ([drs2 (wait-for-new-frame win)])
         (unless (eq? drs2 drscheme-frame)
           (error 'kill-test1 "expected original drscheme frame to come back to the front"))))
     
+    (next-test)
     (type-in-definitions drscheme-frame "(kill-thread (current-thread))")
     (do-execute drscheme-frame #f)
     (let ([win (wait-for-new-frame drscheme-frame)])
@@ -1341,6 +1344,7 @@ This produces an ACK message
         (unless (eq? drs2 drscheme-frame)
           (error 'kill-test2 "expected original drscheme frame to come back to the front"))))
     
+    (next-test)
     (clear-definitions drscheme-frame)
     (do-execute drscheme-frame)
     (type-in-definitions
@@ -1348,7 +1352,7 @@ This produces an ACK message
      "(define (f) (queue-callback f) (error 'ouch)) (f)")
     (do-execute drscheme-frame #f)
     (sleep 1/2)
-    (test:menu-select "Scheme" "Kill")
+    (test:menu-select "Scheme" kill-menu-item)
     (let ([win (wait-for-new-frame drscheme-frame null 360)])
       (test:button-push "OK")
       (let ([drs2 (wait-for-new-frame win)])
@@ -1378,10 +1382,10 @@ This produces an ACK message
       
       (let* ([end (- (get-int-pos) 1)]
              [output (fetch-output drscheme-frame start end)]
-             [expected "reference to undefined identifier: x"])
+             [expected "{stop-multi.png} {stop-22x22.png} reference to undefined identifier: x"])
         (unless (equal? output expected)
           (failure)
-          (fprintf (current-error-port) "callcc-test: expected ~s, got ~s" expected output)))))
+          (fprintf (current-error-port) "callcc-test: expected ~s, got ~s\n" expected output)))))
   
   (define (random-seed-test)
     (define expression
@@ -1449,10 +1453,10 @@ This produces an ACK message
   
   (run-test-in-language-level #f)
   (run-test-in-language-level #t)
-  ;(kill-tests)
-  ;(callcc-test)
-  ;(top-interaction-test)
-  ;(final-report)
+  (kill-tests)
+  (callcc-test)
+  (top-interaction-test)
+  (final-report)
   )