Merge lp:~mikemc/ubuntuone-client/fix-1013268 into lp:ubuntuone-client

[Mike McCracken]

- Ignore linux-only tests in run-mac-tests. (LP: #1013268)

- Ignore linux-only tests in run-mac-tests. (LP: #1013268)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'run-mac-tests'
--- run-mac-tests	2012-05-16 14:47:14 +0000
+++ run-mac-tests	2012-06-27 20:07:24 +0000
@@ -27,7 +27,7 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 
-PYTHONPATH=../ubuntu-sso-client/:$PYTHONPATH
+PYTHONPATH=../ubuntu-sso-client/:../ubuntuone-storage-protocol:../ubuntuone-dev-tools:$PYTHONPATH
 
 set -e
 if [ $# -ne 0 ]; then
@@ -42,6 +42,6 @@
 cp windows/clientdefs.py ubuntuone/clientdefs.py
 cp windows/logging.conf data/logging.conf
 # execute the tests with a number of ignored linux only modules
-python $u1trial --reactor=twisted -i "test_linux.py,test_windows.py" "$MODULE"
+python $u1trial --reactor=twisted -i "test_linux.py,test_windows.py" -p tests/platform/linux "$MODULE"
 rm -rf _trial_temp
 rm -rf build