RegressionTests__Helper.st
changeset 1858 9a168b447a9d
parent 1840 225ecea83d23
child 1860 486d3a585f74
--- a/RegressionTests__Helper.st	Sat Oct 14 03:54:30 2017 +0000
+++ b/RegressionTests__Helper.st	Mon Oct 16 10:43:48 2017 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "{ Package: 'stx:goodies/regression' }"
 
 "{ NameSpace: RegressionTests }"
@@ -30,31 +32,23 @@
 !Helper class methodsFor:'queries'!
 
 packageDirectoryForRegressionTests
-    "
-        self 
-            packageDirectoryForClass:self
-            relativePath:'stx/goodies/regression'
-    "
+    ^ self workDirectory / 'stx' / 'regression'     
+!
+
+smalltalkDirectory
+    ^ self workDirectory / 'stx' / 'projects' / 'smalltalk'     
+!
 
-    |packageDirectory pathOfSTXExecutable|
+workDirectory
+    |directoryOfStandaloneBinary|
 
-    packageDirectory := self packageDirectory.
-    packageDirectory notNil ifTrue:[
-        ^ packageDirectory
+    directoryOfStandaloneBinary := OperatingSystem nameOfSTXExecutable asFilename directory.
+    (directoryOfStandaloneBinary pathName includesSubString:'quickSelfTest') ifTrue:[
+        "this test is called by /stx/goodies/builder/quickSelfTest"
+        ^ directoryOfStandaloneBinary directory directory directory directory
     ].
 
-    "/ packageDirectory is nil -> stc code
-    pathOfSTXExecutable := OperatingSystem pathOfSTXExecutable.
-    (pathOfSTXExecutable includesSubString:'quickSelfTest') ifTrue:[
-        "unit tests started from stx/goodies/builder/quickSelfTest/quickSelfTest"
-        ^ pathOfSTXExecutable asFilename    "/  stx/goodies/builder/quickSelfTest/quickSelfTest   
-            directory                       "/  stx/goodies/builder/quickSelfTest     
-                directory                   "/  stx/goodies/builder     
-                    directory               "/  stx/goodies     
-                        / 'regression'
-    ].
-
-    self error:'no package path'.
+    ^ directoryOfStandaloneBinary directory directory directory 
 ! !
 
 !Helper class methodsFor:'documentation'!