(file) Return to TestMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/TestMakefile between version 1.60 and 1.61

version 1.60, 2006/02/17 21:28:39 version 1.61, 2006/02/17 22:28:09
Line 232 
Line 232 
  
 servertestssetup: FORCE servertestssetup: FORCE
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 # The association between user names and certificates is stored in the repository.  If the  #
 # repository is recreated, we also need to re-initialize the trust store directories.  # The association between user names and certificates is stored in the
 # Otherwise, the truststore content will be out-of-sync with the mapping stored in the  # repository.  If the repository is recreated, we also need to re-initialize
 # repository.  # the trust store directories. Otherwise, the truststore content will be
   # out-of-sync with the mapping stored in the repository.
   #
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile removeSSLTrustDirectories
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Server -f Makefile createSSLTrustDirectories
 endif endif
Line 243 
Line 245 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository         $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile testrepository
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile cimstart
         $(SLEEP) 5         $(SLEEP) 5
 ifdef PEGASUS_HAS_SSL          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
 ifdef PEGASUS_TEST_USER_DEFINED          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
         ssltrustmgr -a -c pegtest -f $(PEGASUS_HOME)/server.pem  
 endif  
 endif  
  
 servertests: servertestsclean servertestssetup serversuite servertests: servertestsclean servertestssetup serversuite
         @ $(ECHO) "+++++ TestMakefile servertests suites complete"         @ $(ECHO) "+++++ TestMakefile servertests suites complete"
Line 376 
Line 376 
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_INDSSL_TS1: FORCE  run_INDSSL_TS1: EnableUsers Create_SSL_Certificate_ignore
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(INDSSL_TS1a_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1a_TEST_CMDS)"
Line 425 
Line 425 
  
 endif endif
  
   ############################################################################
   #
   # Create_SSL_Certificate
   #
   # create a certificate that can be used for certification testing.
   # It is currently used by the following tests:
   #            -run_INDSSL_TS1
   #
   Create_SSL_Certificate_ignore: FORCE
           -$(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile Create_SSL_Certificate
   
   Create_SSL_Certificate: FORCE
   ifdef PEGASUS_HAS_SSL
   ifdef PEGASUS_TEST_USER_DEFINED
           $(ECHO) "Creating SSL certificate for test"
           ssltrustmgr -a -c $(PEGASUS_TEST_USER_ID) -f $(PEGASUS_HOME)/server.pem
   endif
   else
           $(ECHO) "PEGASUS_HAS_SSL not defined - Not Creating SSL certificate for test"
   endif
   
 ############################################################################### ###############################################################################
 ##  G11N Test Suite 1: Globalization Tests ##  G11N Test Suite 1: Globalization Tests
 ## ##
Line 922 
Line 943 
         cimconfig -s enableAuthentication=false -p         cimconfig -s enableAuthentication=false -p
         cimconfig -s enableNamespaceAuthorization=false -p         cimconfig -s enableNamespaceAuthorization=false -p
  
   EnableUsers:
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
           $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile ConfigureUsers
   
 EnableAuthentication: EnableAuthentication:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         cimconfig -s enableAuthentication=true -p         cimconfig -s enableAuthentication=true -p
Line 938 
Line 964 
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstop
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithSSL
  
   #
   # ConfigureUsers
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
         cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)          cimuser -l
           -cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)
 endif endif
  
   #
   # ConfigureAuthorizations rule
   #
   # The server must be running prior to invoking this rule
   #
 ConfigureAuthorizations: ConfigureAuthorizations:
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W
         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W         cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W


Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2