Commits

Anonymous committed 41a02ed

DEV300 masterfix: #i111084#: fix smoketest for setsolar based child workspaces

  • Participants
  • Parent commits 5bde020

Comments (0)

Files changed (3)

smoketestoo_native/makefile.mk

     $(COPY) $< $@
 
 .IF "$(OS)" != "WNT"
-$(installationtest_instpath).flag : \
-        $(shell ls $(installationtest_instset)/OOo_*_install_*.tar.gz)
+$(installationtest_instpath).flag : $(shell ls \
+        $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz)
     $(RM) -r $(installationtest_instpath)
     $(MKDIRHIER) $(installationtest_instpath)
-    cd $(installationtest_instpath) && \
-        $(GNUTAR) xfz $(installationtest_instset)/OOo_*_install_*.tar.gz
-    $(MV) $(installationtest_instpath)/OOo_*_install_* \
+    cd $(installationtest_instpath) && $(GNUTAR) xfz \
+        $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz
+    $(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \
         $(installationtest_instpath)/opt
     $(TOUCH) $@
 cpptest : $(installationtest_instpath).flag

solenv/bin/modules/installer/download.pm

 	
 	my $type = "";
 	
-	my $cwsproduct = 0;
-	# the environment variable CWS_WORK_STAMP is set only in CWS
-	if ( $ENV{'CWS_WORK_STAMP'} ) { $cwsproduct = 1; }
-	
 	if ( $installer::globals::languagepack )
 	{
 		$type = "langpack";
 			$type = $type . "-deb";
 		}
 		
-		if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct ))
+		if ( $installer::globals::packageformat eq "archive" )
 		{
 			$type = $type . "-arc";			
 		}
 			$type = $type . "-deb";
 		}
 		
-		if (( $installer::globals::packageformat eq "archive" ) && ( $cwsproduct ))
+		if ( $installer::globals::packageformat eq "archive" )
 		{
 			$type = $type . "-arc";			
 		}

solenv/inc/installationtest.mk

 # smoketestoo_native:
 .IF "$(OS)" == "WNT"
 $(MISC)/$(TARGET)/installation.flag : $(shell \
-        ls $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip)
+        ls $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip)
     $(MKDIRHIER) $(@:d)
     my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
-    unzip $(installationtest_instset)/OOo_*_install_$(defaultlangiso).zip \
+    unzip $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).zip \
         -d "$$my_tmp" && \
-    mv "$$my_tmp"/OOo_*_install_$(defaultlangiso) "$$my_tmp"/opt && \
+    mv "$$my_tmp"/OOo_*_install-arc_$(defaultlangiso) "$$my_tmp"/opt && \
     echo "$$my_tmp" > $@
 .END