mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-11-04 00:05:35 -05:00 
			
		
		
		
	This removes a change which was placed when removing chrooted tests, this
was an unecessary change and permanently made chrooted tests 0. Also noted how sys could be used for verbosity 3.
This commit is contained in:
		
							parent
							
								
									9496c72553
								
							
						
					
					
						commit
						1c435dfadc
					
				@ -1600,6 +1600,8 @@ sub start_logging_output {
 | 
			
		||||
sub sys {
 | 
			
		||||
    my $error;
 | 
			
		||||
 | 
			
		||||
    ##info(1,"@_\n");  # This could be verbosity 3, i.e. 2.
 | 
			
		||||
    
 | 
			
		||||
    # when using sys on yard_chrooted_tests
 | 
			
		||||
    my $dont = pop @_;
 | 
			
		||||
    if ($dont ne "TESTING") {
 | 
			
		||||
@ -2755,7 +2757,7 @@ sub check_termcap {
 | 
			
		||||
  # We assume a terminfo file is not being used .. hum
 | 
			
		||||
  if (-d "$mount_point/etc/terminfo") {
 | 
			
		||||
 | 
			
		||||
      # There should at least be a linux entry, and infocmp needs to exist.x
 | 
			
		||||
      # There should at least be a linux entry, and infocmp needs to exist.
 | 
			
		||||
      my $infocmp = "infocmp -A $mount_point/etc/terminfo -C linux|";
 | 
			
		||||
     
 | 
			
		||||
      open(TERMCAP, "$infocmp") or
 | 
			
		||||
 | 
			
		||||
@ -724,11 +724,12 @@ sub test {
 | 
			
		||||
    # Need to know whether genext2fs is being used
 | 
			
		||||
    my $fs_type = (split(/\s/,$main::makefs))[0];
 | 
			
		||||
 | 
			
		||||
    if ( $fs_type ne "genext2fs" ) {
 | 
			
		||||
	$tests{30}{test_fstab} = 0;
 | 
			
		||||
	$tests{31}{test_inittab} = 0;
 | 
			
		||||
	$tests{32}{test_scripts} = 0;
 | 
			
		||||
    }
 | 
			
		||||
    # unecessary logic
 | 
			
		||||
##    if ( $fs_type ne "genext2fs" ) {
 | 
			
		||||
##	$tests{30}{test_fstab} = 0;
 | 
			
		||||
##	$tests{31}{test_inittab} = 0;
 | 
			
		||||
##	$tests{32}{test_scripts} = 0;
 | 
			
		||||
##    }
 | 
			
		||||
 | 
			
		||||
    my $error = which_tests(\%tests); 
 | 
			
		||||
    return if $error && $error eq "ERROR";
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user