@@ -62,6 +62,10 @@ public class Basic {
62
62
/* used for AIX only */
63
63
static final String libpath = System .getenv ("LIBPATH" );
64
64
65
+ /* Used for regex String matching for long error messages */
66
+ static final String PERMISSION_DENIED_ERROR_MSG = "(Permission denied|error=13)" ;
67
+ static final String NO_SUCH_FILE_ERROR_MSG = "(No such file|error=2)" ;
68
+
65
69
/**
66
70
* Returns the number of milliseconds since time given by
67
71
* startNanoTime, which must have been previously returned from a
@@ -295,7 +299,7 @@ static void checkPermissionDenied(ProcessBuilder pb) {
295
299
} catch (IOException e ) {
296
300
String m = e .getMessage ();
297
301
if (EnglishUnix .is () &&
298
- ! matches (m , "Permission denied" ))
302
+ ! matches (m , PERMISSION_DENIED_ERROR_MSG ))
299
303
unexpected (e );
300
304
} catch (Throwable t ) { unexpected (t ); }
301
305
}
@@ -403,7 +407,7 @@ public static void main(String args[]) throws Throwable {
403
407
} catch (IOException e ) {
404
408
String m = e .getMessage ();
405
409
if (EnglishUnix .is () &&
406
- ! matches (m , "No such file" ))
410
+ ! matches (m , NO_SUCH_FILE_ERROR_MSG ))
407
411
unexpected (e );
408
412
} catch (Throwable t ) { unexpected (t ); }
409
413
@@ -416,7 +420,7 @@ public static void main(String args[]) throws Throwable {
416
420
} catch (IOException e ) {
417
421
String m = e .getMessage ();
418
422
if (EnglishUnix .is () &&
419
- ! matches (m , "No such file" ))
423
+ ! matches (m , NO_SUCH_FILE_ERROR_MSG ))
420
424
unexpected (e );
421
425
} catch (Throwable t ) { unexpected (t ); }
422
426
@@ -1854,7 +1858,7 @@ public void doIt(Map<String,String> environ) {
1854
1858
} catch (IOException e ) {
1855
1859
String m = e .getMessage ();
1856
1860
if (EnglishUnix .is () &&
1857
- ! matches (m , "No such file or directory" ))
1861
+ ! matches (m , NO_SUCH_FILE_ERROR_MSG ))
1858
1862
unexpected (e );
1859
1863
} catch (Throwable t ) { unexpected (t ); }
1860
1864
@@ -1871,7 +1875,7 @@ public void doIt(Map<String,String> environ) {
1871
1875
Pattern p = Pattern .compile (programName );
1872
1876
if (! matches (m , programName )
1873
1877
|| (EnglishUnix .is ()
1874
- && ! matches (m , "No such file or directory" )))
1878
+ && ! matches (m , NO_SUCH_FILE_ERROR_MSG )))
1875
1879
unexpected (e );
1876
1880
} catch (Throwable t ) { unexpected (t ); }
1877
1881
@@ -1887,7 +1891,7 @@ public void doIt(Map<String,String> environ) {
1887
1891
String m = e .getMessage ();
1888
1892
if (! matches (m , "in directory" )
1889
1893
|| (EnglishUnix .is () &&
1890
- ! matches (m , "No such file or directory" )))
1894
+ ! matches (m , NO_SUCH_FILE_ERROR_MSG )))
1891
1895
unexpected (e );
1892
1896
} catch (Throwable t ) { unexpected (t ); }
1893
1897
@@ -2122,7 +2126,7 @@ public void run() {
2122
2126
new File ("./emptyCommand" ).delete ();
2123
2127
String m = e .getMessage ();
2124
2128
if (EnglishUnix .is () &&
2125
- ! matches (m , "Permission denied" ))
2129
+ ! matches (m , PERMISSION_DENIED_ERROR_MSG ))
2126
2130
unexpected (e );
2127
2131
} catch (Throwable t ) { unexpected (t ); }
2128
2132
0 commit comments