From 68e3ecb78fd0e9743f4ea2232c3b92cc8d7dc4df Mon Sep 17 00:00:00 2001
From: actboy168 <actboy168@gmail.com>
Date: Sun, 9 May 2021 15:23:22 +0800
Subject: [PATCH] cleanup

---
 make.lua          | 21 +++++++--------------
 make/unittest.lua | 22 ----------------------
 2 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 make/unittest.lua

diff --git a/make.lua b/make.lua
index 5af7f1414..a77937707 100644
--- a/make.lua
+++ b/make.lua
@@ -1,18 +1,11 @@
 local lm       = require 'luamake'
 
-if lm.plat == "macos" then
-    lm.flags = {
-        "-mmacosx-version-min=10.13",
-    }
-end
-
 lm:import("3rd/bee.lua/make.lua", {
     EXE_RESOURCE = "../../make/lua-language-server.rc"
 })
 
-lm.rootdir = '3rd/'
-
 lm:lua_dll 'lpeglabel' {
+    rootdir = '3rd',
     sources = 'lpeglabel/*.c',
     visibility = 'default',
     defines = {
@@ -30,16 +23,16 @@ lm:build 'install' {
     }
 }
 
+local fs = require 'bee.filesystem'
+local pf = require 'bee.platform'
+local exe = pf.OS == 'Windows' and ".exe" or ""
 lm:build 'unittest' {
-    '$luamake', 'lua', 'make/unittest.lua',
+    fs.path 'bin' / pf.OS / ('lua-language-server' .. exe), 'test.lua', '-E',
+    pool = "console",
     deps = {
         'install',
         'test',
     }
 }
 
-lm:default {
-    'install',
-    'test',
-    'unittest',
-}
+lm:default 'unittest'
diff --git a/make/unittest.lua b/make/unittest.lua
deleted file mode 100644
index 1c2c2d6f0..000000000
--- a/make/unittest.lua
+++ /dev/null
@@ -1,22 +0,0 @@
-local fs = require 'bee.filesystem'
-local sp = require 'bee.subprocess'
-local pf = require 'bee.platform'
-local exe = pf.OS == 'Windows' and ".exe" or ""
-local CWD = fs.current_path()
-
-local process = assert(sp.spawn {
-    CWD / 'bin' / pf.OS / ('lua-language-server' .. exe),
-    CWD / 'test.lua',
-    '-E',
-    stdout = true,
-    stderr = true,
-})
-
-for line in process.stdout:lines 'l' do
-    print(line)
-end
-process:wait()
-local err = process.stderr:read 'a'
-if err ~= '' then
-    error(err)
-end
-- 
GitLab