--- a/RegressionTests__CompilerTests2.st	Tue Jun 24 18:47:53 2014 +0200
+++ b/RegressionTests__CompilerTests2.st	Wed Jun 25 16:06:30 2014 +0200
@@ -3,7 +3,7 @@
 "{ NameSpace: RegressionTests }"
 
 TestCase subclass:#CompilerTests2
-	instanceVariableNames:'methods enabledJIT argAndVarNames'
+	instanceVariableNames:'methods enabledJIT argAndVarNames argAndVarNamesContext'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'tests-Regression'
@@ -108,18 +108,21 @@
     "Reported by Stefan"
 
     argAndVarNames := 1.
-    Smalltalk isStandAloneApp ifTrue:[
+    (Smalltalk isStandAloneApp | (argAndVarNames == 1)) ifTrue:[
         | ttt |
 
         ttt := 123.
-        argAndVarNames := thisContext argAndVarNames asArray.    
-    ]
+        argAndVarNames := (argAndVarNamesContext := thisContext) argAndVarNames asArray.    
+    ].
+    self halt.
+    
 
     "
     CompilerTests2 basicNew method_argAndVarNames_03
     "
 
     "Created: / 20-08-2013 / 09:22:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 25-06-2014 / 14:27:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 method_argAndVarNames_04
@@ -792,38 +795,6 @@
     "Created: / 06-01-2014 / 11:29:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!CompilerTests2 methodsFor:'tests - FFI'!
-
-test_external_function_call_01
-    "Test for stx bug for <cdecl> specs like
-
-        <cdecl: Cairo::FontFace 'cairo_get_font_face' ( Cairo::GraphicsContext ) >
-
-     i.e., when custom subclass of ExternalAddress is in namespace."
-    
-    | malloc  free |
-
-    malloc := 'malloc: size
-
-    <cdecl: RegressionTests::CompilerTests2ExternalBytes "malloc" ( int ) module: ''librun.so''>
-    self primitive failed'.
-    free := 'free: ptr
-
-    <cdecl: void "free" ( RegressionTests::CompilerTests2ExternalBytes ) module: ''librun.so''>
-    self primitive failed'.
-    #( #bc #stc ) do:[:mode | 
-        | ptr |
-
-        self compile:malloc mode:mode.
-        self compile:free mode:mode.
-        ptr := self perform:(mode , '_malloc:') asSymbol with:1.
-        self assert:ptr class == RegressionTests::CompilerTests2ExternalBytes.
-        self perform:(mode , 'free:') asSymbol with:ptr.
-    ]
-
-    "Created: / 06-01-2014 / 11:29:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !CompilerTests2 methodsFor:'tests - arg & var names'!
 
 test_argAndVarNames_01