This closes a long-time bug that allowed builds to hang Nix indefinitely (regardless of timeouts) simply by doing exec > /dev/null 2>&1; while true; do true; done Now, on EOF, we just send SIGKILL to the child to make sure it's really gone.
		
			
				
	
	
		
			31 lines
		
	
	
	
		
			759 B
		
	
	
	
		
			Bash
		
	
	
	
	
	
			
		
		
	
	
			31 lines
		
	
	
	
		
			759 B
		
	
	
	
		
			Bash
		
	
	
	
	
	
| # Test the `--timeout' option.
 | ||
| 
 | ||
| source common.sh
 | ||
| 
 | ||
| failed=0
 | ||
| messages="`nix-build -Q timeout.nix -A infiniteLoop --timeout 2 2>&1 || failed=1`"
 | ||
| if [ $failed -ne 0 ]; then
 | ||
|     echo "error: ‘nix-store’ succeeded; should have timed out"
 | ||
|     exit 1
 | ||
| fi
 | ||
| 
 | ||
| if ! echo "$messages" | grep -q "timed out"; then
 | ||
|     echo "error: build may have failed for reasons other than timeout; output:"
 | ||
|     echo "$messages" >&2
 | ||
|     exit 1
 | ||
| fi
 | ||
| 
 | ||
| if nix-build -Q timeout.nix -A infiniteLoop --option build-max-log-size 100; then
 | ||
|     echo "build should have failed"
 | ||
|     exit 1
 | ||
| fi
 | ||
| 
 | ||
| if nix-build timeout.nix -A silent --max-silent-time 2; then
 | ||
|     echo "build should have failed"
 | ||
|     exit 1
 | ||
| fi
 | ||
| 
 | ||
| if nix-build timeout.nix -A closeLog; then
 | ||
|     echo "build should have failed"
 | ||
|     exit 1
 | ||
| fi
 |