Changeset 2690

Timestamp:

Nov 15, 2011 5:21:53 AM (19 months ago)

Author:

quozl

Message:

OLPC trac 11427 - test-all stopped working at the first device that had no reg property, caused by stack imbalance in most-tests premature exit paths

File:

• ofw/core/ofwcore.fth (modified) (3 diffs)

ofw/core/ofwcore.fth

@@ -3279 +3279 @@
 
 : most-tests  ( -- exit? )
-   " selftest"  current-device  (search-wordlist)  if  ( xt )
-
-      drop                                              (  )
+   " selftest"  current-device  (search-wordlist)  if   ( xt )
+
+      drop                                              ( )
 
       \ We only want to execute the selftest routine if the device has
@@ -3287 +3287 @@
       \ routines for "wildcard" devices like st and sd.
 
-      " reg"  get-property  if  exit  then 2drop        (  )
+      " reg"  get-property  if  false exit  then 2drop  ( )
 
       \ We sometimes want to skip the testing of certain devices.
-      current-device skip-test?  if  exit  then         ( )
+      current-device skip-test?  if  false exit  then   ( )
 
       ??cr ." Testing "  pwd
@@ -3318 +3318 @@
 ;
 
-\ "action-acf" is executed for each device node in the subtree
-\ rooted at dev-addr,len , with current-device set to the
-\ node in question.  "action-acf" can perform arbitrary tests
-\ on the node to determine if that node is appropriate for
-\ the action that it wished to undertake.
-
 : test-subtree  ( dev-addr,len -- )
    current-device >r                ( dev-addr,len r: phandle )
-   find-device                      ( r: phandle xt )
-   ['] most-tests  ['] (search-preorder)  catch  2drop  ( r: phandle xt )
+   find-device                      ( r: phandle )
+   ['] most-tests  ['] (search-preorder)  catch  2drop  ( r: phandle )
    r> push-device                   ( )
 ;