fixed a bug and a test bug
This commit is contained in:
		| @@ -1307,7 +1307,7 @@ def satisfies(self, other, deps=True, strict=False): | |||||||
|             if not self.compiler.satisfies(other.compiler, strict=strict): |             if not self.compiler.satisfies(other.compiler, strict=strict): | ||||||
|                 return  False |                 return  False | ||||||
|         elif strict and (other.compiler and not self.compiler): |         elif strict and (other.compiler and not self.compiler): | ||||||
|             return True |             return False | ||||||
|  |  | ||||||
|         if not self.variants.satisfies(other.variants, strict=strict): |         if not self.variants.satisfies(other.variants, strict=strict): | ||||||
|             return False |             return False | ||||||
|   | |||||||
| @@ -20,3 +20,16 @@ compilers: | |||||||
|       modules: |       modules: | ||||||
|         - PrgEnv-gnu |         - PrgEnv-gnu | ||||||
|         - gcc/5.2.0 |         - gcc/5.2.0 | ||||||
|  |     intel@15.0.1: | ||||||
|  |       cc: cc | ||||||
|  |       ccx: CC | ||||||
|  |       f77: ftn | ||||||
|  |       fc: ftn | ||||||
|  |       modules: | ||||||
|  |       - PrgEnv-intel | ||||||
|  |       - intel/15.0.1 | ||||||
|  |     intel@15.1.2: | ||||||
|  |       cc: /path/to/icc | ||||||
|  |       cxx: /path/to/ic++ | ||||||
|  |       f77: /path/to/ifort | ||||||
|  |       fc: /path/to/ifort | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Gregory Becker
					Gregory Becker