diff options
| author | Micael Karlberg <[email protected]> | 2010-12-10 17:50:38 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2010-12-10 17:50:38 +0100 |
| commit | 8e9ef38dd36c771dff0d477fa7999d34b72e8a7a (patch) | |
| tree | d63bda2457bd06b75b2dfd6dd2152733d608711d /lib/snmp/test/test_config/Makefile | |
| parent | a0e4728a5e8e366c83e8229cefc63ba92151a86d (diff) | |
| download | otp-8e9ef38dd36c771dff0d477fa7999d34b72e8a7a.tar.gz otp-8e9ef38dd36c771dff0d477fa7999d34b72e8a7a.tar.bz2 otp-8e9ef38dd36c771dff0d477fa7999d34b72e8a7a.zip | |
Added counter (variables) for usm.
Also added config file for usm.
And more sed'ing...
Diffstat (limited to 'lib/snmp/test/test_config/Makefile')
| -rw-r--r-- | lib/snmp/test/test_config/Makefile | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/lib/snmp/test/test_config/Makefile b/lib/snmp/test/test_config/Makefile index c02bb5c601..4953de7fe8 100644 --- a/lib/snmp/test/test_config/Makefile +++ b/lib/snmp/test/test_config/Makefile @@ -94,6 +94,22 @@ ifeq ($(SYS_NAME),) SYS_NAME = FOO endif +ifeq ($(AGENT_ENGINE_ID),) +AGENT_ENGINE_ID = Agent engine of $(USER) +endif + +ifeq ($(AGENT_USM_ENGINE_ID),) +AGENT_USM_ENGINE_ID = $(AGENT_ENGINE_ID) +endif + +ifeq ($(MANAGER_ENGINE_ID),) +MANAGER_ENGINE_ID = Manager engine of $(USER) +endif + +ifeq ($(MANAGER_USM_ENGINE_ID),) +MANAGER_USM_ENGINE_ID = $(MANAGER_ENGINE_ID) +endif + # ---------------------------------------------------- @@ -119,11 +135,15 @@ agent/%.conf: agent/%.conf.src -e 's?%SYS_CONTACT%?$(SYS_CONTACT)? ' \ -e 's?%SYS_LOCATION%?$(SYS_LOCATION)? ' \ -e 's?%SYS_NAME%?$(SYS_NAME)? ' \ - -e 's?%TARGET_NAME_PRE%?$(TARGET_NAME_PRE)? ' < $< > $@ + -e 's?%TARGET_NAME_PRE%?$(TARGET_NAME_PRE)? ' \ + -e 's?%ENGINE_ID%?\"$(AGENT_ENGINE_ID)\"? ' \ + -e 's?%USM_ENGINE_ID%?\"$(AGENT_USM_ENGINE_ID)\"? ' < $< > $@ manager/%.conf: manager/%.conf.src @echo "$< -> $@" - $(PERL) -p -e 's?%ADDR%?$(ADDR)? ' < $< > $@ + sed -e 's?%ADDR%?$(ADDR)? ' \ + -e 's?%ENGINE_ID%?\"$(MANAGER_ENGINE_ID)\"? ' \ + -e 's?%USM_ENGINE_ID%?\"$(MANAGER_USM_ENGINE_ID)\"? ' < $< > $@ # ---------------------------------------------------- @@ -133,7 +153,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: -release_tests_spec: opt +release_tests_spec: clean opt $(INSTALL_DIR) $(RELSYSDIR) chmod -f -R u+w $(RELSYSDIR) $(INSTALL_DIR) $(RELSYSDIR)/agent |