x86_64: update successful-boot test

arch/x86_64/test/check-results

@@ -24,13 +24,10 @@ def successful_boot(boot_log, out):
         log(out, "Kernel rebooted during test!")
         return 1
 
-    nr_finish = boot_log.count("ld finished")
+    nr_finish = boot_log.count("exiting (Inappropriate file type or format)")
-    if nr_finish == 0:
+    if nr_finish != 2:
         log(out, "Didn't reach end of boot sequence!")
         return 1
-    if nr_finish > 1:
-        log(out, "Boot sequence performed multiple times!")
-        return 1
 
     return 0
 

arch/x86_64/test/successful-boot

@@ -34,15 +34,10 @@ initrd=$5
 while true; do
 	log "Test $count"
 	result_file="$log_dir/$count.log"
-	$qemu \
+	ninja run-cdrom-bochs > $result_file &
-		-kernel $kernel \
-		-initrd $initrd \
-		-serial file:$result_file \
-		-cpu qemu64,+rdrand \
-		--append kernel.early-console=ttyS0 -s > /dev/null &
 	qemu_id=$!
 
-	sleep 1.2
+	sleep 5
 
 	$python $validation_script successful-boot $result_file $logfile
 	result=$?
@@ -54,12 +49,9 @@ while true; do
 	else
 		mv $result_file "$result_file.FAIL"
 		fail=$fail+1
-		lldb \
-			-o "file kernel/mango_kernel.debug" \
-			-o "gdb-remote localhost:1234"
 	fi
 
-	kill -INT $qemu_id
+	killall -9 bochs
 
 	log "---------------"
 	log "Total tests: $count"