From b62035e3d0deed65ac8254fca14d6de89f913552 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Tue, 31 Mar 2020 13:46:46 +0300
Subject: [PATCH] solaris & termux: fix both, using the more portable termios.h

---
 .gitignore                         | 4 ++++
 cmd/tools/modules/testing/common.v | 6 +++---
 vlib/term/term_nix.v               | 2 ++
 vlib/term/term_solaris.v           | 5 -----
 vlib/v/tests/live_test.v           | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)
 delete mode 100644 vlib/term/term_solaris.v

diff --git a/.gitignore b/.gitignore
index e5126f7f4f..32afe8529f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,7 @@ cachegrind.out.*
 
 .gdb_history
 /thirdparty/pg
+exe
+vlib/v/tests/inout/hello.v
+vlib/v/tests/inout/hello_devs.v
+vlib/v/tests/inout/os.v
diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
index 7e8b35d7c9..5c1ecc0618 100644
--- a/cmd/tools/modules/testing/common.v
+++ b/cmd/tools/modules/testing/common.v
@@ -24,10 +24,10 @@ pub fn new_test_session(_vargs string) TestSession {
     mut skip_files := []string
 	skip_files << '_non_existing_'
 	$if solaris {
-		skip_files << "examples/gg2.v"
+		skip_files << "examples/gg/gg2.v"
 		skip_files << "examples/pico/pico.v"
-		skip_files << "examples/sokol_examples/fonts.v"
-		skip_files << "examples/sokol_examples/drawing.v"
+		skip_files << "examples/sokol/fonts.v"
+		skip_files << "examples/sokol/drawing.v"
 	}
 	vargs := _vargs.replace('-silent', '')
 	vexe := pref.vexe_path()
diff --git a/vlib/term/term_nix.v b/vlib/term/term_nix.v
index 251b4c8190..2d955a52e2 100644
--- a/vlib/term/term_nix.v
+++ b/vlib/term/term_nix.v
@@ -4,6 +4,8 @@ import os
 
 #include <sys/ioctl.h>
 
+#include <termios.h> // TIOCGWINSZ
+
 pub struct C.winsize {
 pub:
 	ws_row    u16
diff --git a/vlib/term/term_solaris.v b/vlib/term/term_solaris.v
deleted file mode 100644
index 0ef5cb0caf..0000000000
--- a/vlib/term/term_solaris.v
+++ /dev/null
@@ -1,5 +0,0 @@
-module term
-
-#include <unistd.h> // ioctl
-
-#include <sys/termios.h> // TIOCGWINSZ
diff --git a/vlib/v/tests/live_test.v b/vlib/v/tests/live_test.v
index fb9edd5f86..a8144ddfb1 100755
--- a/vlib/v/tests/live_test.v
+++ b/vlib/v/tests/live_test.v
@@ -28,7 +28,7 @@ fn main() {
 //
 
 fn testsuite_begin(){
-	if os.user_os() != 'linux' && os.getenv('FORCE_LIVE_TEST').len == 0 {
+	if !(os.user_os() in ['linux', 'solaris']) && os.getenv('FORCE_LIVE_TEST').len == 0 {
 		eprintln('Testing the runtime behaviour of -live mode,')
 		eprintln('is reliable only on Linux for now.')
 		eprintln('You can still do it by setting FORCE_LIVE_TEST=1 .')