ts: sort modules in JSON output as done on regular output

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

testsuite/config/base-config.exp

@@ -813,63 +813,6 @@ proc _test_err {test_shell cmd answer failcmd} {
 	}
 }
 
-proc _test_err_json {test_shell cmd answer failcmd} {
-	global comp_error
-	global verbose
-    set errdiff 0
-
-    # newline is expected at end of answer
-    if {$answer ne {}} {
-        append answer \n
-    }
-
-    set comp_error_list [split $comp_error \n]
-    set answer_list [split $answer \n]
-
-    # compare start and end structure of the document
-    if {[lindex $comp_error_list 0] ne [lindex $answer_list 0]} {
-        set errdiff 1
-    }
-    if {[lindex $comp_error_list end] ne [lindex $answer_list end]} {
-        set errdiff 1
-    }
-    # sort document core content to compare it
-    set comp_last_entry [lindex $comp_error_list end-2]
-    set answer_last_entry [lindex $answer_list end-2]
-    if {[string range $comp_last_entry end-2 end] ne [string range\
-        $answer_last_entry end-2 end]} {
-        set errdiff 1
-    }
-    # make last content line with same structure as other lines (finishing by "\},")
-    if {[string index $comp_last_entry end] eq "\}"} {
-        append comp_last_entry ,
-        append answer_last_entry ,
-    } else {
-        set comp_last_entry [string replace $comp_last_entry end-1 end ,]
-        set answer_last_entry [string replace $answer_last_entry end-1 end ,]
-    }
-    set comp_error_list [lreplace $comp_error_list end-2 end-2 $comp_last_entry]
-    set answer_list [lreplace $answer_list end-2 end-2 $answer_last_entry]
-
-    set comp_error_sort [join [lsort $comp_error_list] \n]
-    set answer_sort [join [lsort $answer_list] \n]
-
-    if {$comp_error_sort ne $answer_sort} {
-        set errdiff 1
-    }
-
-	if {$errdiff} {
-		$failcmd "$cmd ($test_shell)"
-		set ol [string length $comp_error_sort]
-		set oe [string length $answer_sort]
-		send_user "ERR\[$ol\]: '$comp_error_sort'#>\n"
-		send_user "EXP\[$oe\]: '$answer_sort'#>\n"
-		return 0;
-	} else {
-		return 1;
-	}
-}
-
 proc _test_err_re {test_shell cmd answer force_nl failcmd} {
 	global comp_error
 	global verbose
@@ -1175,25 +1118,6 @@ proc testouterr_cmd {test_shell cmd answer anserr {failcmd {fail}}} {
     }
 }
 
-#
-# Test procedure for full text matching with the stdout and json stderr
-#
-
-proc testouterrjson_cmd {test_shell cmd answer anserr {failcmd {fail}}} {
-    if {$test_shell eq "ALL"} {
-        global supported_shells
-        foreach shell $supported_shells {
-            testouterrjson_cmd $shell $cmd $answer $anserr
-        }
-    } else {
-        _test_sub $test_shell "$cmd"
-        if { [_test_out $test_shell "$cmd" "$answer" $failcmd]
-        &&   [_test_err_json $test_shell "$cmd" "$anserr" $failcmd] } {
-            _test_ok $test_shell "$cmd"
-        }
-    }
-}
-
 #
 # Test procedure for full text matching with stdout and specified file
 #

testsuite/modules.51-scan/020-avail_output-variant.exp

@@ -377,20 +377,20 @@ testouterr_cmd sh {avail -t --no-indepth variant/} OK $tserr
 setenv_var TESTSUITE_VARIANT 13
 
 set tserr "{\"$mp\": {
-\"variant/6.0\": { \"name\": \"variant/6.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/6.0\", \"via\": \"\"},
-\"variant/5.1\": { \"name\": \"variant/5.1\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/5.1\", \"via\": \"\"},
-\"variant/7.0\": { \"name\": \"variant/7.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/7.0\", \"via\": \"\"},
-\"variant/7.1\": { \"name\": \"variant/7.1\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/7.1\", \"via\": \"\"},
-\"variant/8.0\": { \"name\": \"variant/8.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/8.0\", \"via\": \"\"},
-\"variant/w s\": { \"name\": \"variant/w s\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/w s\", \"via\": \"\"},
 \"variant/1.0\": { \"name\": \"variant/1.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/1.0\", \"via\": \"\"},
 \"variant/2.0\": { \"name\": \"variant/2.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/2.0\", \"via\": \"\"},
-\"variant/3.0\": { \"name\": \"variant/3.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/3.0\", \"via\": \"\"},
 \"variant/2.1/2/1\": { \"name\": \"variant/2.1/2/1\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/2.1/2/1\", \"via\": \"\"},
+\"variant/3.0\": { \"name\": \"variant/3.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/3.0\", \"via\": \"\"},
 \"variant/4.0\": { \"name\": \"variant/4.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/4.0\", \"via\": \"\"},
-\"variant/5.0\": { \"name\": \"variant/5.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/5.0\", \"via\": \"\"}
+\"variant/5.0\": { \"name\": \"variant/5.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/5.0\", \"via\": \"\"},
+\"variant/5.1\": { \"name\": \"variant/5.1\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/5.1\", \"via\": \"\"},
+\"variant/6.0\": { \"name\": \"variant/6.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/6.0\", \"via\": \"\"},
+\"variant/7.0\": { \"name\": \"variant/7.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/7.0\", \"via\": \"\"},
+\"variant/7.1\": { \"name\": \"variant/7.1\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/7.1\", \"via\": \"\"},
+\"variant/8.0\": { \"name\": \"variant/8.0\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/8.0\", \"via\": \"\"},
+\"variant/w s\": { \"name\": \"variant/w s\", \"type\": \"modulefile\", \"symbols\": \[\], \"tags\": \[\], \"pathname\": \"$mp/variant/w s\", \"via\": \"\"}
 }}"
-testouterrjson_cmd sh {avail -j variant} OK $tserr
+testouterr_cmd sh {avail -j variant} OK $tserr
 
 set tserr "{\"errors\": \[
 { \"severity\": \"ERROR\", \"message\": \[ \"Unsupported option '-o' on json output mode\" \] } \]