Add test_main() functions to various tests where it was simple to do. Done so
that regrtest can execute the test_main() directly instead of relying on import
side-effects.
diff --git a/Lib/test/test_cd.py b/Lib/test/test_cd.py
index d856211..daad223 100755
--- a/Lib/test/test_cd.py
+++ b/Lib/test/test_cd.py
@@ -14,7 +14,7 @@
# attributes. More comprehensive examples can be found in Demo/cd and
# require that you have a CD and a CD ROM drive
-def main():
+def test_main():
# touch all the attributes of cd without doing anything
if verbose:
print 'Touching cd module attributes...'
@@ -23,4 +23,7 @@
print 'touching: ', attr
getattr(cd, attr)
-main()
+
+
+if __name__ == '__main__':
+ test_main()