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

Diff for /pegasus/TestMakefile between version 1.52 and 1.59

version 1.52, 2005/12/14 22:20:28 version 1.59, 2006/02/14 22:17:39
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 316 
Line 318 
 ## ##
 ##  Configuration Options: forceProviderProcesses=true ##  Configuration Options: forceProviderProcesses=true
 ## ##
 ##  If PEGASUS_DEFAULT_OOP_ON is set, then tests are run with OOP disabled  ##  If PEGASUS_DEFAULT_ENABLE_OOP is set, then tests are run with OOP disabled
 ##  since tests have already been run with OOP enabled. ##  since tests have already been run with OOP enabled.
 ## ##
 ## ##
 ############################################################################### ###############################################################################
 ifeq ($(PEGASUS_DEFAULT_OOP_ON),true)  ifeq ($(PEGASUS_DEFAULT_ENABLE_OOP),true)
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=false
 else else
 OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true OOP_TS1_CONFIG_OPTIONS = forceProviderProcesses=true
Line 373 
Line 375 
  
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
 run_INDSSL_TS1:  ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
   run_INDSSL_TS1: FORCE
         $(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 382 
Line 385 
             TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"             TESTSUITE_CMDS="$(INDSSL_TS1b_TEST_CMDS)"
 else else
 run_INDSSL_TS1: FORCE run_INDSSL_TS1: FORCE
         @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"          @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_INDSSL_TS1"
   endif
   else
   run_INDSSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_INDSSL_TS1"
 endif endif
  
  
Line 403 
Line 410 
        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1        $(MAKE)@@--directory=$(PEGASUS_ROOT)/src/Clients/ssltrustmgr/tests@@SSLCertificateTest1
  
 ifdef PEGASUS_HAS_SSL ifdef PEGASUS_HAS_SSL
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \         $(MAKE) -f $(PEGASUS_ROOT)/TestMakefile runTestSuite \
             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \             CIMSERVER_CONFIG_OPTIONS="$(SSL_TS1_CONFIG_OPTIONS)" \
             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"             TESTSUITE_CMDS="$(SSL_TS1_TEST_CMDS)"
 else else
 run_SSL_TS1: FORCE run_SSL_TS1: FORCE
         @ $(ECHO) "PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"          @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping run_SSL_TS1"
   endif
   else
   run_SSL_TS1: FORCE
           @ $(ECHO) "+++++ PEGASUS_HAS_SSL not defined: Skipping run_SSL_TS1 poststarttest"
  
 endif endif
  
Line 806 
Line 818 
  
 list: tracesettings list: tracesettings
  
   #########################################################################
 # More options...  # standardtests
   #
   # More testing options...
   #
   # The standard test seem to contain additional test that may not be able
   # to run on all platforms so they have been grouped here for now rather than
   # being included in the serversuite rule.
   #
   # The test are:
   #      TestCimmof
   #      TestNoSecurity
   #      TestLocalSecurity
   #      TestRemoteSecurity
   #      TestAuthorization
   #
   # NOTE: The TestsNoSecurity test is comprised of DisableSecurity and
   #       TestNoSecurity.
   #
   # NOTE: The TestNoSecurity step runs the servertests which builds the
   #       the repository that is then left in place for the remaining tests.
   #       The cimof test must be before the TestNosecurity step as it removes
   #       the repository builds a new one with cimmofl and another one with
   #       cimmof and then compares them.
   #
   # NOTE: The Authentication test is comprised of EnableAuthentication,
   #       TestLocalSecurity and TestRemoteSecurity.
   #
   # NOTE: The Authorization test is comprised of EnableAuthorization and
   #       TestAuthorization.
   #
   # NOTE: The EnableAuthentication and EnableAuthorization steps require
   #       root access. Pegasus doesn't currently have the infrastructure
   #       in place to run the server as root and run the test as non-root.
   #       Rather than run everything, server, tests, providers, clients etc.
   #       as root many testers prefer to run the tests as non-root. Setting
   #       PEGASUS_DISABLE_PRIVILEGED_TESTS in the environment helps to
   #       facilitate that.
   #
  
 standardtests: FORCE standardtests: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile -i DisableSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestCimmof
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestNoSecurity
   ifndef PEGASUS_DISABLE_PRIVILEGED_TESTS
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthentication
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestLocalSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestRemoteSecurity
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile EnableAuthorization
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile TestAuthorization
   else
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthentication, TestLocalSecurity, and TestRemoteSecurity "
           @ $(ECHO) "+++++ PEGASUS_DISABLE_PRIVILEGED_TESTS defined: Skipping EnableAuthorization and TestAuthorization "
   endif
         @ $(ECHO) "+++++ TestMakefile standardtests complete"         @ $(ECHO) "+++++ TestMakefile standardtests complete"
  
 TestNoSecurity: TestNoSecurity:
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile tests          $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile servertests
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile startcimWithoutSSL
         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal         $(MAKE) --directory=$(PEGASUS_ROOT) -f TestMakefile RunTestClientLocal
  
Line 830 
Line 884 
         $(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:
         DeleteNamespace -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 876 
Line 930 
  
 ConfigureUsers: ConfigureUsers:
 ifndef PEGASUS_PAM_AUTHENTICATION ifndef PEGASUS_PAM_AUTHENTICATION
         cimuser -a -u guest -w guest          cimuser -a -u $(PEGASUS_TEST_USER_ID) -w $(PEGASUS_TEST_USER_PASS)
 endif endif
  
 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.52  
changed lines
  Added in v.1.59
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2