Merge lp:~aacid/unity-2d/unity-2d-shell_get_shape_builddir into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

[test] Use the proper way to get the path to the built binary

[Gerry Boland (gerboland)]

Would be cleaner to have the binary_dir in run-tests.rb a global constant so all tests can use it.

You can use the 'system' call, because we need to figure out a way to have additional test utilities on the system-under-test, so enforcing $SUT.execute_shell_command is pointless just now in this case.

review: Needs Fixing

[Albert Astals Cid (aacid)]

I converted binary_dir into a constant so it can be used in input_shaping.rb

[lp:~aacid/unity-2d/unity-2d-shell_get_shape_builddir]

945. By Albert Astals Cid on 2012-01-30

Make binary_dir a constant

946. By Albert Astals Cid on 2012-01-30

remove "warning: already initialized constant BINARY_DIR"

[Gerry Boland (gerboland)]

Nice! Thank you!

review: Approve

=== modified file 'tests/run-tests.rb'
--- tests/run-tests.rb	2012-01-27 08:53:59 +0000
+++ tests/run-tests.rb	2012-01-30 08:59:27 +0000
@@ -42,12 +42,13 @@
 # installed applications instead
 binary_dir_file = $library_path + '/../binary_dir.txt'
 if File.exists?(binary_dir_file)
-    binary_dir = File.open(binary_dir_file).first.strip
-    puts 'Running tests on applications contained within ' + binary_dir
-    UNITY_2D_SHELL = binary_dir + '/shell/app/unity-2d-shell'
-    UNITY_2D_PANEL = binary_dir + '/panel/app/unity-2d-panel'
-    UNITY_2D_SPREAD = binary_dir + '/spread/app/unity-2d-spread'
+    BINARY_DIR = File.open(binary_dir_file).first.strip
+    puts 'Running tests on applications contained within ' + BINARY_DIR
+    UNITY_2D_SHELL = BINARY_DIR + '/shell/app/unity-2d-shell'
+    UNITY_2D_PANEL = BINARY_DIR + '/panel/app/unity-2d-panel'
+    UNITY_2D_SPREAD = BINARY_DIR + '/spread/app/unity-2d-spread'
 else
+    BINARY_DIR = ""
     puts 'NOTICE: source not configured, tests will be carried out on *installed* applications!'
     UNITY_2D_SHELL = 'unity-2d-shell'
     UNITY_2D_PANEL = 'unity-2d-panel'

=== modified file 'tests/shell/input_shaping.rb'
--- tests/shell/input_shaping.rb	2012-01-20 13:32:37 +0000
+++ tests/shell/input_shaping.rb	2012-01-30 08:59:27 +0000
@@ -56,7 +56,7 @@
 
     # Get the shape of the shell window using our custom tool
     maskpath = tempfilename('shape', '.png')
-    out = %x{#{pwd}/../getshape/getshape #{shell_id} #{maskpath}}
+    out = %x{#{BINARY_DIR}/tests/getshape/getshape #{shell_id} #{maskpath}}
     assert($?.exitstatus == 0, "Failed to call getshape to get the shape of the window")
     return maskpath
 end