Uniquify suffixes added to module names (#14920)
This commit is contained in:
		
				
					committed by
					
						
						Todd Gamblin
					
				
			
			
				
	
			
			
			
						parent
						
							b02981f10c
						
					
				
				
					commit
					f3a1a8c6fe
				
			@@ -428,6 +428,7 @@ def suffixes(self):
 | 
			
		||||
        for constraint, suffix in self.conf.get('suffixes', {}).items():
 | 
			
		||||
            if constraint in self.spec:
 | 
			
		||||
                suffixes.append(suffix)
 | 
			
		||||
        suffixes = sorted(set(suffixes))
 | 
			
		||||
        if self.hash:
 | 
			
		||||
            suffixes.append(self.hash)
 | 
			
		||||
        return suffixes
 | 
			
		||||
 
 | 
			
		||||
@@ -5,3 +5,4 @@ tcl:
 | 
			
		||||
    suffixes:
 | 
			
		||||
      '+debug': foo
 | 
			
		||||
      '~debug': bar
 | 
			
		||||
      '^mpich': foo
 | 
			
		||||
 
 | 
			
		||||
@@ -215,9 +215,10 @@ def test_suffixes(self, module_configuration, factory):
 | 
			
		||||
 | 
			
		||||
        writer, spec = factory('mpileaks+debug arch=x86-linux')
 | 
			
		||||
        assert 'foo' in writer.layout.use_name
 | 
			
		||||
        assert 'foo-foo' not in writer.layout.use_name
 | 
			
		||||
 | 
			
		||||
        writer, spec = factory('mpileaks~debug arch=x86-linux')
 | 
			
		||||
        assert 'bar' in writer.layout.use_name
 | 
			
		||||
        assert 'bar-foo' in writer.layout.use_name
 | 
			
		||||
 | 
			
		||||
    def test_setup_environment(self, modulefile_content, module_configuration):
 | 
			
		||||
        """Tests the internal set-up of run-time environment."""
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user