--- a/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Wed Dec 02 00:21:12 2009 +0000
@@ -21,9 +21,8 @@
markerfile = re.sub("(\\\\|\/|:|;| )", "_",
ReplaceEnvs("$(SBS_HOME)_test_smoke_suite_test_resources_simple_zip_export_archive.zip$(EPOCROOT)_epoc32_testunzip.unzipped"))
- result = SmokeTest.PASS
+ t = SmokeTest()
- t = SmokeTest()
t.id = "0024a"
t.name = "zip_export"
t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf"
@@ -32,32 +31,34 @@
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt",
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
+
+ t.id = "0024aa"
+ t.name = "zip_export_execute_permissions"
+ t.usebash = True
+ t.targets = []
+ t.command = "ls -l $(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin"
+ t.mustmatch = ["-[rw-]{2}x[rw-]{2}x[rw-]{2}x"]
+ t.run("linux")
t = AntiTargetSmokeTest()
t.id = "0024b"
t.name = "zip_export_reallyclean"
- t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf " \
- + "REALLYCLEAN"
+ t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf REALLYCLEAN"
t.antitargets = [
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile1.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt",
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
t.id = "24"
t.name = "zip_export_plus_clean"
- t.result = result
t.print_result()
return t