mirror of
				https://github.com/Telecominfraproject/wlan-lanforge-scripts.git
				synced 2025-11-03 20:27:54 +00:00 
			
		
		
		
	regression: tail needs a lowercase n, not an uppercase n to grab the last n lines
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
		@@ -530,8 +530,7 @@ function test() {
 | 
				
			|||||||
  FILESIZE=$(stat -c%s "${FILENAME}_stderr.txt") || 0
 | 
					  FILESIZE=$(stat -c%s "${FILENAME}_stderr.txt") || 0
 | 
				
			||||||
  # Check to see if the error is due to LANforge
 | 
					  # Check to see if the error is due to LANforge
 | 
				
			||||||
  ERROR_DATA=$(cat "${FILENAME}_stderr.txt")
 | 
					  ERROR_DATA=$(cat "${FILENAME}_stderr.txt")
 | 
				
			||||||
  if [[ $ERROR_DATA =~ "LANforge Error Messages" ]]
 | 
					  if [[ $ERROR_DATA =~ "LANforge Error Messages" ]]; then
 | 
				
			||||||
  then
 | 
					 | 
				
			||||||
    LANforgeError="Lanforge Error"
 | 
					    LANforgeError="Lanforge Error"
 | 
				
			||||||
    echo "LANforge Error"
 | 
					    echo "LANforge Error"
 | 
				
			||||||
  else
 | 
					  else
 | 
				
			||||||
@@ -542,16 +541,14 @@ function test() {
 | 
				
			|||||||
  TEXT=$(cat "${FILENAME}".txt)
 | 
					  TEXT=$(cat "${FILENAME}".txt)
 | 
				
			||||||
  STDERR=""
 | 
					  STDERR=""
 | 
				
			||||||
  LOGGING=""
 | 
					  LOGGING=""
 | 
				
			||||||
  if [[ $TEXT =~ "tests failed" ]]
 | 
					  if [[ $TEXT =~ "tests failed" ]]; then
 | 
				
			||||||
  then 
 | 
					 | 
				
			||||||
    TEXTCLASS="partial_failure"
 | 
					    TEXTCLASS="partial_failure"
 | 
				
			||||||
    TDTEXT="Partial Failure"
 | 
					    TDTEXT="Partial Failure"
 | 
				
			||||||
    echo "Partial Failure"
 | 
					    echo "Partial Failure"
 | 
				
			||||||
    mkdir "${LOG_DIR}/${NAME}"
 | 
					    mkdir "${LOG_DIR}/${NAME}"
 | 
				
			||||||
    LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>"
 | 
					    LOGGING="<a href=\"${URL2}/logs\" target=\"_blank\">Logging directory</a>"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  elif [[ $TEXT =~ "FAILED" ]]
 | 
					  elif [[ $TEXT =~ "FAILED" ]]; then
 | 
				
			||||||
  then
 | 
					 | 
				
			||||||
    TEXTCLASS="partial_failure"
 | 
					    TEXTCLASS="partial_failure"
 | 
				
			||||||
    TDTEXT="ERROR"
 | 
					    TDTEXT="ERROR"
 | 
				
			||||||
    echo "ERROR"
 | 
					    echo "ERROR"
 | 
				
			||||||
@@ -562,8 +559,7 @@ function test() {
 | 
				
			|||||||
    echo "No errors detected"
 | 
					    echo "No errors detected"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if (( FILESIZE > 0))
 | 
					  if (( FILESIZE > 0)); then
 | 
				
			||||||
  then
 | 
					 | 
				
			||||||
    TEXTCLASS="failure"
 | 
					    TEXTCLASS="failure"
 | 
				
			||||||
    TDTEXT="Failure"
 | 
					    TDTEXT="Failure"
 | 
				
			||||||
    STDERR="<a href=\"${URL2}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a>"
 | 
					    STDERR="<a href=\"${URL2}/${NAME}_stderr.txt\" target=\"_blank\">STDERR</a>"
 | 
				
			||||||
@@ -578,7 +574,7 @@ function test() {
 | 
				
			|||||||
      sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}"
 | 
					      sshpass -p "lanforge" scp lanforge@"${MGR}":~/lanforge_log* "${LOG_DIR}/${NAME}"
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
    LINE=$(grep -n 'Starting Scenario' "${LOG_DIR}/${NAME}/lanforge_log_0.txt" | awk -F: '{print $1}' | tail -1)
 | 
					    LINE=$(grep -n 'Starting Scenario' "${LOG_DIR}/${NAME}/lanforge_log_0.txt" | awk -F: '{print $1}' | tail -1)
 | 
				
			||||||
    LOG_TEXT=$(tail -N+"${LINE}" "${LOG_DIR}/${NAME}/lanforge_log_0.txt")
 | 
					    LOG_TEXT=$(tail -n+"${LINE}" "${LOG_DIR}/${NAME}/lanforge_log_0.txt")
 | 
				
			||||||
    $LOG_TEXT >> "${LOG_DIR}/${NAME}/lanforge_log_0.txt"
 | 
					    $LOG_TEXT >> "${LOG_DIR}/${NAME}/lanforge_log_0.txt"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user