Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/jsoncpp/test/cleantests.py b/lib/jsoncpp/test/cleantests.py
new file mode 100644
index 0000000000..c38fd8ffdd
--- /dev/null
+++ b/lib/jsoncpp/test/cleantests.py
@@ -0,0 +1,10 @@
+# removes all files created during testing
+import glob
+import os
+
+paths = []
+for pattern in [ '*.actual', '*.actual-rewrite', '*.rewrite', '*.process-output' ]:
+    paths += glob.glob( 'data/' + pattern )
+
+for path in paths:
+    os.unlink( path )