reverse the sense of check for en_US.UTF-8 vs en_US.utf8:
the latter is required by HP-sUX, okay, and apparently the preferred one by glibc (GNU libdrepper?), but breaks on al- most all other systems I have access to (Slowlaris, Midnight DragonFly NetBSD, Darwin, at least)
This commit is contained in:
		
							
								
								
									
										23
									
								
								check.t
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								check.t
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| # $MirOS: src/bin/mksh/check.t,v 1.203 2008/07/08 20:08:02 tg Exp $ | # $MirOS: src/bin/mksh/check.t,v 1.204 2008/07/08 20:54:33 tg Exp $ | ||||||
| # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ | # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ | ||||||
| # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ | # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ | ||||||
| # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ | # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ | ||||||
| @@ -4393,9 +4393,24 @@ expected-stdout: | |||||||
| 	off | 	off | ||||||
| 	on | 	on | ||||||
| --- | --- | ||||||
| name: utf8opt-1 | name: utf8opt-1a | ||||||
| description: | description: | ||||||
| 	Check that the utf8-hack flag is not set at non-interactive startup | 	Check that the utf8-hack flag is not set at non-interactive startup | ||||||
|  | category: !os:gnu,!os:hpux,!os:linux | ||||||
|  | env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8! | ||||||
|  | stdin: | ||||||
|  | 	if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then | ||||||
|  | 		print is set | ||||||
|  | 	else | ||||||
|  | 		print is not set | ||||||
|  | 	fi | ||||||
|  | expected-stdout: | ||||||
|  | 	is not set | ||||||
|  | --- | ||||||
|  | name: utf8opt-1b | ||||||
|  | description: | ||||||
|  | 	Check that the utf8-hack flag is not set at non-interactive startup | ||||||
|  | category: os:gnu,os:hpux,os:linux | ||||||
| env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! | env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! | ||||||
| stdin: | stdin: | ||||||
| 	if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then | 	if [[ $(set +o) = *@(-o utf8-hack)@(| *) ]]; then | ||||||
| @@ -4409,7 +4424,7 @@ expected-stdout: | |||||||
| name: utf8opt-2a | name: utf8opt-2a | ||||||
| description: | description: | ||||||
| 	Check that the utf8-hack flag is set at interactive startup | 	Check that the utf8-hack flag is set at interactive startup | ||||||
| category: os:solaris,os:darwin,os:netbsd | category: !os:gnu,!os:hpux,!os:linux | ||||||
| arguments: !-i! | arguments: !-i! | ||||||
| env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8! | env-setup: !PS1=!PS2=!LC_CTYPE=en_US.UTF-8! | ||||||
| stdin: | stdin: | ||||||
| @@ -4426,7 +4441,7 @@ expected-stderr-pattern: | |||||||
| name: utf8opt-2b | name: utf8opt-2b | ||||||
| description: | description: | ||||||
| 	Check that the utf8-hack flag is set at interactive startup | 	Check that the utf8-hack flag is set at interactive startup | ||||||
| category: !os:solaris,!os:darwin,!os:netbsd | category: os:gnu,os:hpux,os:linux | ||||||
| arguments: !-i! | arguments: !-i! | ||||||
| env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! | env-setup: !PS1=!PS2=!LC_CTYPE=en_US.utf8! | ||||||
| stdin: | stdin: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user