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

Diff for /pegasus/TestMakefile between version 1.54.2.1 and 1.54.2.2

version 1.54.2.1, 2006/02/10 16:08:59 version 1.54.2.2, 2006/03/07 18:45:36
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 686 
Line 707 
  
 usagetrace: FORCE usagetrace: FORCE
         $(USAGE)         $(USAGE)
         $(USAGE)"TestMakefile Trace Commands: (cimserver should be running)"          $(USAGE)"TestMakefile Trace Commands: "
         $(USAGE)          $(USAGE)"  The cimserver must be running when using W=c which is the default for W"
         $(USAGE)         $(USAGE)
         $(USAGE)" traceon:                  Enables all tracing."          $(USAGE)" traceon  W=[current/planned(c,p):   Enables all tracing."
         $(USAGE)" traceoff:                 Disables all tracing."          $(USAGE)" traceoff W=[current/planned(c,p):   Disables all tracing."
         $(USAGE)" tracesettings:            Displays trace settings."          $(USAGE)" tracesettings:                      Displays all trace settings."
         $(USAGE)" tracecomp:                Displays a trace componenets list."         $(USAGE)" tracecomp:                Displays a trace componenets list."
         $(USAGE)" traceon-CL C=[comp] L=[level(1,2,3,4)]:  "          $(USAGE)" traceon-CL C=[comp] L=[level(1,2,3,4)] W=[current/planned(c,p): "
         $(USAGE)"                           Enables tracing on component C at trace level L."         $(USAGE)"                           Enables tracing on component C at trace level L."
         $(USAGE)"                           Usage example:"          $(USAGE)
         $(USAGE)"                           Turns tracing on for DiscardedData at level 3"          $(USAGE)" W defaults to c in the above commands where W can be specified"
         $(USAGE)"                           traceon-CL C=DiscardedData L=3"          $(USAGE)
           $(USAGE)"  Usage examples:"
           $(USAGE)"   traceon       turns on trace in current server config"
           $(USAGE)"   traceon W=c   turns on trace in current server config"
           $(USAGE)"   traceon W=p   turns on trace in planned server config"
           $(USAGE)"   traceoff      turns on trace in current server config"
           $(USAGE)"   traceoff W=c  turns on trace in current server config"
           $(USAGE)"   traceoff W=p  turns on trace in planned server config"
           $(USAGE)
           $(USAGE)"   traceon-CL C=DiscardedData L=3 W=c"
           $(USAGE)"     Turns on trace for DiscardedData at level 3 in current server config"
           $(USAGE)"   traceon-CL C=DiscardedData L=3 W=p"
           $(USAGE)"     Turns on trace for DiscardedData at level 3 in planned server config"
         $(USAGE)         $(USAGE)
         $(USAGE)         $(USAGE)
  
 traceon: FORCE traceon: FORCE
         @ cimconfig -s traceComponents=ALL          @ cimconfig -s traceComponents=ALL -$W
         @ cimconfig -s traceLevel=3 -c          @ cimconfig -s traceLevel=3 -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
 traceoff: FORCE traceoff: FORCE
         @ cimconfig -s traceComponents=          @ cimconfig -s traceComponents=  -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
  
 tracesettings: FORCE tracesettings: FORCE
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceComponents          cimconfig -g traceComponents -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceLevel          cimconfig -g traceLevel -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
         cimconfig -g traceFilePath          cimconfig -g traceFilePath -c -p
         @ $(ECHO) " "         @ $(ECHO) " "
  
 traceon-CL: FORCE traceon-CL: FORCE
         @ cimconfig -s traceComponents=$C -c          @ cimconfig -s traceComponents=$C -$W
         @ cimconfig -s traceLevel=$L -c          @ cimconfig -s traceLevel=$L -$W
         @ cimconfig -g traceComponents          $(MAKE) -f $(ROOT)/TestMakefile tracesettings
         @ cimconfig -g traceLevel  
  
 tracecomp: FORCE tracecomp: FORCE
         $(USAGE)         $(USAGE)
Line 884 
Line 915 
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest -f Makefile poststarttests HOSTNAME= PORT= USER= PASSWORD= SECURITY_ENABLED=true
  
 TestRemoteSecurity: TestRemoteSecurity:
         TestClient -user guest -password guest $(system):5988          TestClient -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS) $(system):5988
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-u$(PEGASUS_TEST_USER_ID) PASSWORD=-w$(PEGASUS_TEST_USER_PASS) SECURITY_ENABLED=true
  
 TestAuthorization: TestAuthorization:
         TestPegClientDeleteNamespace -a -user guest -password guest          TestPegClientDeleteNamespace -a -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS)
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
         TestClient -user guest -password guest $(system):5988          TestClient -user $(PEGASUS_TEST_USER_ID) -password $(PEGASUS_TEST_USER_PASS) $(system):5988
         $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-uguest PASSWORD=-wguest SECURITY_ENABLED=true          $(MAKE) --directory=$(PEGASUS_ROOT)/test/wetest/static -f Makefile poststarttests HOSTNAME=-h$(system) USER=-u$(PEGASUS_TEST_USER_ID) PASSWORD=-w$(PEGASUS_TEST_USER_PASS) SECURITY_ENABLED=true
  
 TestSubscriptions: TestSubscriptions:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile DisableSecurity
Line 912 
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 928 
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 guest -w guest          -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 guest -n test/cimv2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/cimv2 -R -W
         cimauth -a -u guest -n root/cimv2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/cimv2 -R -W
         cimauth -a -u guest -n root/PG_Internal -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/PG_Internal -R -W
         cimauth -a -u guest -n root/PG_InterOp -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/PG_InterOp -R -W
         cimauth -a -u guest -n root/benchmark -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/benchmark -R -W
         cimauth -a -u guest -n root/sampleprovider -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/sampleprovider -R -W
         cimauth -a -u guest -n test/static -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test/static -R -W
         cimauth -a -u guest -n root/SampleProvider -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root/SampleProvider -R -W
         cimauth -a -u guest -n root -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n root -R -W
         cimauth -a -u guest -n test1 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1 -R -W
         cimauth -a -u guest -n test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test2 -R -W
         cimauth -a -u guest -n test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test3 -R -W
         cimauth -a -u guest -n test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test4 -R -W
         cimauth -a -u guest -n test5 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test5 -R -W
         cimauth -a -u guest -n test6 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test6 -R -W
         cimauth -a -u guest -n test1/test2 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2 -R -W
         cimauth -a -u guest -n test1/test2/test3 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5 -R -W
         cimauth -a -u guest -n test1/test2/test3/test4/test5/test6 -R -W          cimauth -a -u $(PEGASUS_TEST_USER_ID) -n test1/test2/test3/test4/test5/test6 -R -W
  
 startcimWithoutSSL: FORCE startcimWithoutSSL: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i cimstart

Legend:
Removed from v.1.54.2.1  
changed lines
  Added in v.1.54.2.2
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2