add tests for install & uninstall #115

ghost · 2017-05-23T13:31:45Z

add tests for install & uninstall, with/without sudo

I also fix the $(xmake) so that it will be always correct. See details at commit message

Have some problem on mac os on travis-ci

$(xmake) is set to join(_PROGRAM_DIR, 'xmake') that is wrong when XMAKE_PROGRAM_DIR is set to another program dir (like developing dir) with no executable so use system-special ways to get absolution path of executable file always

waruqi · 2017-05-23T15:13:32Z

@titansnow Using $(xmake) has some of the following issues:

If the path has spaces (on windows. .e.g "C:\Program Files\xmake\xmake.exe"), double quotes are required, for example:

os.run("\"$(xmake)\" f -c")

If users don't see the document, they don't know if they have this variable: $(xmake), then they will still run it directly. os.run("xmake")

So, I'm going to remove $(xmake) and use os.run("xmake") directly and add the executable path of xmake to PATH env. for example:

function main()
        ..
        os.addenv("PATH", xmake._EXECUTABLE_DIR)

I think it's easier to use, and users don't have to care about the path of xmake.

to fix build on macos `sudo luarocks install` will install to global package tree that running as all users could find

This reverts commit f2e0d82.

codecov · 2017-05-23T22:59:36Z

Codecov Report

Merging #115 into dev will increase coverage by 1.65%.
The diff coverage is 60%.

@@            Coverage Diff             @@
##              dev     #115      +/-   ##
==========================================
+ Coverage   68.13%   69.79%   +1.65%     
==========================================
  Files         246      250       +4     
  Lines       10032    10424     +392     
==========================================
+ Hits         6835     7275     +440     
+ Misses       3197     3149      -48

Impacted Files	Coverage Δ
core/src/xmake/readline/readline.c	`0% <0%> (ø)`	⬆️
core/src/xmake/machine.c	`93.75% <100%> (+7.81%)`	⬆️
xmake/core/sandbox/modules/os.lua	`77.58% <100%> (+1.58%)`	⬆️
xmake/modules/privilege/sudo.lua	`53.06% <50%> (+14.28%)`	⬆️
xmake/platforms/windows/check.lua	`78.85% <0%> (ø)`
xmake/tools/lib.lua	`96.42% <0%> (ø)`
xmake/tools/link.lua	`78.57% <0%> (ø)`
xmake/tools/cl.lua	`51.12% <0%> (ø)`
xmake/core/main.lua	`75.3% <0%> (+1.23%)`	⬆️
xmake/actions/package/main.lua	`83.82% <0%> (+1.47%)`	⬆️
... and 19 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3768a82...67a5ad7. Read the comment docs.

ghost · 2017-05-23T23:00:30Z

Great! 👍

ghost · 2017-05-23T23:39:26Z

There is a situation that needs $(xmake). That is, sudo $(xmake). sudo will delete environment var so that the path of xmake must be known

ghost · 2017-05-24T00:11:46Z

luacov.runner not found on macos. Wired

waruqi · 2017-05-24T00:45:52Z

@titansnow

There is a situation that needs $(xmake). That is, sudo $(xmake). sudo will delete environment var so that the path of xmake must be known.

You can use sudo -E xmake or os.sudo(os.run, "xmake f -c")(in os.lua).

Pass -E argument will preserve user environment when running sudo command. So I think $(xmake) is not necessary.

ghost · 2017-05-24T00:50:21Z

no use @waruqi

$ xmake l
> os.getenv("PATH")
/home/ts/.local/share/xmake:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/ts/.local/bin
> os.sudo(os.exec,"sh -c 'echo $PATH'")
[sudo] password for ts: 
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
> os.exec("sudo -E sh -c 'echo $PATH'")
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin

waruqi · 2017-05-24T01:29:32Z

@titansnow

It works on my machine(macOS and archlinux).

xmake l
> os.addenv("PATH", "/tmp/test")
> os.getenv("PATH")
/tmp/test:/Users/ruki/.cargo/bin:/Users/ruki/.rvm/gems/ruby-2.2.2/bin:/Users/ruki/.rvm/gems/ruby-2.2.2@global/bin:/Users/ruki/.rvm/rubies/ruby-2.2.2/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/ruki/.rvm/bin
> os.exec("sudo -E xmake l --root -c 'print(os.getenv(\"PATH\"))'")
/tmp/test:/Users/ruki/.cargo/bin:/Users/ruki/.rvm/gems/ruby-2.2.2/bin:/Users/ruki/.rvm/gems/ruby-2.2.2@global/bin:/Users/ruki/.rvm/rubies/ruby-2.2.2/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/ruki/.rvm/bin
> os.sudo(os.exec, "xmake l --root -c 'print(os.getenv(\"PATH\"))'")
/tmp/test:/Users/ruki/.cargo/bin:/Users/ruki/.rvm/gems/ruby-2.2.2/bin:/Users/ruki/.rvm/gems/ruby-2.2.2@global/bin:/Users/ruki/.rvm/rubies/ruby-2.2.2/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/ruki/.rvm/bin
> os.exec("sudo -E sh -c 'echo $PATH'")
/tmp/test:/Users/ruki/.cargo/bin:/Users/ruki/.rvm/gems/ruby-2.2.2/bin:/Users/ruki/.rvm/gems/ruby-2.2.2@global/bin:/Users/ruki/.rvm/rubies/ruby-2.2.2/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/ruki/.rvm/bin
> os.sudo(os.exec,"sh -c 'echo $PATH'")
/tmp/test:/Users/ruki/.cargo/bin:/Users/ruki/.rvm/gems/ruby-2.2.2/bin:/Users/ruki/.rvm/gems/ruby-2.2.2@global/bin:/Users/ruki/.rvm/rubies/ruby-2.2.2/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/ruki/.rvm/bin

ghost · 2017-05-24T02:00:22Z

I found some info on stackoverflow. Seems ubuntu's behavior on sudo is different from others 😓

As travis-ci uses ubuntu, we have no way to drop $(xmake)

waruqi · 2017-05-24T02:17:09Z

@titansnow I am going to try adding detect.tool.find_sudo and privilege.sudo extension modules in xmake/modules dir to handle these differences

waruqi · 2017-05-24T06:38:07Z

@titansnow I have removed the $(xmake) variable and and even if sudo cannot inherit the parent environment, the path of xmake is always in the $PATH because I'll add it's directory to $PATH in the main entry function.

function main.init()

    -- add the directory of the program file (xmake) to $PATH environment
    local programfile = os.programfile()
    if programfile and os.isfile(programfile) then
        os.addenv("PATH", path.directory(programfile))
    else
        os.addenv("PATH", os.programdir())
    end

ghost · 2017-05-24T07:12:29Z

So how to deal with build error on travis-ci? The trouble is sudo cannot find xmake not xmake cannot find itself

waruqi · 2017-05-24T07:26:05Z

@titansnow Can you give me your failed travis-ci links?

ghost · 2017-05-24T07:28:38Z

Below ⬇️ 😃

waruqi · 2017-05-24T07:57:26Z

@titansnow

So how to deal with build error on travis-ci?

This seems like another problem about luacov.runner. I will look at it.

The trouble is sudo cannot find xmake not xmake cannot find itself

I think xmake can find itself from os.programfile() and I see travis has passed

ghost · 2017-05-24T08:02:07Z

I think xmake can find itself from os.programfile() and I see travis has passed

That is because 962b99c 😓

waruqi · 2017-05-24T08:07:18Z

@titansnow Ok, I will look at it.

waruqi · 2017-05-24T11:45:02Z

@titansnow I'm doing some tests on travis-ci

The path of xmake already exists when running sudo sh -c "echo $PATH". => /home/travis/bin

But xmake still not found,I don't know why. 😢

$ which xmake
/home/travis/bin/xmake

$ sudo sh -c "echo $PATH"
/home/travis/bin:/home/travis/.local/bin:/home/travis/.pyenv/shims:/home/travis/.phpenv/shims:/home/travis/gopath/bin:/home/travis/.gimme/versions/go1.7.linux.amd64/bin:/home/travis/.local/bin:/opt/pyenv/bin:/opt/python/2.7.12/bin:/opt/python/3.5.2/bin:/opt/python/2.6.9/bin:/opt/python/3.2.6/bin:/opt/python/3.3.6/bin:/opt/python/3.4.4/bin:/opt/python/pypy-5.4.1/bin:/opt/python/pypy3-2.4.0/bin:/usr/local/phantomjs/bin:/usr/local/phantomjs:/home/travis/perl5/perlbrew/bin:/home/travis/.nvm/versions/node/v4.1.2/bin:/usr/local/maven-3.1.1/bin:/home/travis/.kiex/elixirs/elixir-1.0.4/bin:/home/travis/.kiex/bin:/usr/local/gradle/bin:/usr/local/clang-3.5.0/bin:/home/travis/.rvm/gems/ruby-2.3.1/bin:/home/travis/.rvm/gems/ruby-2.3.1@global/bin:/home/travis/.rvm/rubies/ruby-2.3.1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/lib/jvm/java-9-oracle/bin:/usr/lib/jvm/java-9-oracle/db/bin:/home/travis/.phpenv/bin:/home/travis/.rvm/bin:/home/travis/.lua:/home/travis/.local/bin:/home/travis/build/tboox/xmake/install/luarocks/bin

$ sudo sh -c "xmake --root lua versioninfo"
sh: 1: xmake: not found

ghost · 2017-05-24T11:56:13Z

@waruqi The problem is funny: double quote will expand the vars inside 😺

$ sudo sh -c 'echo $PATH'   
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
$ sudo sh -c "echo $PATH"
/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/home/ts/.local/bin

waruqi · 2017-05-25T00:57:40Z

Did you deal with PATH with spaces and quotes? For example PATH=/home/awd/i am space:/home/awd/i'm quote?

I have fixed it.

waruqi · 2017-05-25T02:44:37Z

core/src/xmake/machine.c

+            lua_pushstring(impl -> lua, data);
+            lua_setglobal(impl -> lua, "_EXECUTABLE_PATH");
+
+            if (!ok)
            {
                // get the directory
                while (size-- > 0)
                {


I don't think it's necessary to write the following code three times.

while (size-- > 0) { if (data[size] == '/') { data[size] = '\0'; break; } }

I think you can use this implementation in dev to replace it directly. 😸

waruqi · 2017-05-25T02:47:04Z

xmake/core/_xmake_main.lua

 xmake._PROJECT_DIR      = _PROJECT_DIR
 xmake._CORE_DIR         = _PROGRAM_DIR .. "/core"
 xmake._TOOLS_DIR        = _PROGRAM_DIR .. "/tools"
 xmake._TEMPLATES_DIR    = _PROGRAM_DIR .. "/templates"
 xmake._PROJECT_FILE     = "xmake.lua"
+xmake._EXECUTABLE_PATH  = _EXECUTABLE_PATH


I think it's enough to use xmake._PROGRAM_FILE = _PROGRAM_FILE, There's no need to add a redundant variable

ghost · 2017-05-25T02:58:08Z

Done

waruqi · 2017-05-25T03:03:39Z

xmake/modules/privilege/sudo.lua

    -- run it with administrator permission and preserve parent environment
-    runner(program .. " PATH=\"" .. os.getenv("PATH") .. "\" " .. cmd, ...)
+    runner(program .. " env PATH=\"" .. os.getenv("PATH") .. "\" " .. cmd, ...)


The effect that do not add env seems to be the same, what is the difference?

$ ls ~/awd/build awd $ sudo PATH=$HOME/awd/build:$PATH awd sudo: awd: command not found $ sudo env PATH=$HOME/awd/build:$PATH awd hello world!

And it makes the build pass

waruqi · 2017-05-25T04:58:11Z

makefile

@@ -61,15 +61,17 @@ install:
 	@# install the xmake directory
 	@cp -r xmake/* $(xmake_dir_install)
 	@# make the xmake loader
+ifneq ($(PLAT),linux)


What's this? Although we can get the executable path on linux, macOS and windows now. But maybe we cannot get it successfully on some linux distributions. So I think we still need export XMAKE_PROGRAM_DIR=/xxx

This reverts commit 64e1e79.

This reverts commit 4fafe79.

waruqi · 2017-05-25T05:13:41Z

Great! 😄

waruqi · 2017-05-25T05:37:29Z

@titansnow Can you help me to improve get.sh to uninstall xmake? Thanks! 😄

for example:

$ ./scripts/get.sh __uninstall__

add tests for install & uninstall (cherry picked from commit 0c98817)

ghost · 2017-05-25T05:46:21Z

ok 👌 I'm also going to add a arg to specify install prefix

ghost · 2017-05-26T02:53:50Z

See 8ffb52a

I have impled __uninstall__ and prefix specification

$ scripts/get.sh __uninstall__
$ env prefix=/usr scripts/get.sh

waruqi · 2017-05-26T03:35:00Z

@titansnow 👍

+    # uninstall
+    makefile=$(remote_get_content https://github.com/tboox/xmake/raw/master/makefile)
+    while which xmake >/dev/null 2>&1

I think we can check makefile in the current directory first to faster uninstalling. for example:

$ cd xmake
$ ./scripts/get.sh __uninstall__

ghost · 2017-05-26T06:03:39Z

But how could we know the makefile found in local is xmake's not other's?

And the size of makefile is tiny so I think it doesn't trouble

waruqi · 2017-05-26T06:17:02Z

@titansnow Ok. 👌 Can you create a new pr for this commit?

ghost · 2017-05-26T06:35:07Z

Matte, I have a plan of remote rolling pre-build on installation on Windows. That is, the install script get pre-build binary from appveyor rolling build so that no need to build locally to get newest

waruqi · 2017-05-26T06:52:57Z

Good idea! 👍 But how can you get pre-build binary file from appveyor?

ghost · 2017-05-26T09:02:46Z

You could have a look on that branch

waruqi · 2017-05-26T09:28:09Z

@titansnow Ok. 👍 😄

ruihe774 added 6 commits May 23, 2017 18:23

add tests for xmake (un)install

c536607

do not test install on windows

9e014f7

use $(xmake) instead of xmake to fix cnf

f2e0d82

add xmake._EXECUTABLE_PATH to fix $(xmake)

550e0a9

$(xmake) is set to join(_PROGRAM_DIR, 'xmake') that is wrong when XMAKE_PROGRAM_DIR is set to another program dir (like developing dir) with no executable so use system-special ways to get absolution path of executable file always

fix tests

36a48f2

fix build on macos

eca531f

ruihe774 added 2 commits May 24, 2017 06:54

sudo luarocks install

3ddda43

to fix build on macos `sudo luarocks install` will install to global package tree that running as all users could find

Revert "use $(xmake) instead of xmake to fix cnf"

7e750ae

This reverts commit f2e0d82.

waruqi and others added 2 commits May 24, 2017 07:23

add os.addenv and improve os.setenv

31a7bbe

add xmake to path

89e2cc7

fix build by using sudo $(xmake)

962b99c

ruihe774 added 5 commits May 25, 2017 09:17

fix XMAKE_PROGRAM_DIR finding

1f93705

Merge branch 'dev' into installtest

c55e08a

fix lua version on macos

6f37771

reload bash profile

33826d1

do not directly install on macos

64e1e79

waruqi reviewed May 25, 2017

View reviewed changes

use implement in dev

bbed6a5

waruqi reviewed May 25, 2017

View reviewed changes

Merge branch 'dev' into installtest

abb1d57

waruqi reviewed May 25, 2017

View reviewed changes

ruihe774 added 2 commits May 25, 2017 13:09

Revert "do not directly install on macos"

ff1ba70

This reverts commit 64e1e79.

Revert "use link on supported os in installation"

67a5ad7

This reverts commit 4fafe79.

waruqi merged commit 0c98817 into xmake-io:dev May 25, 2017

ghost deleted the installtest branch May 25, 2017 05:19

waruqi added a commit that referenced this pull request May 25, 2017

Merge pull request #115 from TitanSnow/installtest

487ad75

add tests for install & uninstall (cherry picked from commit 0c98817)

ghost mentioned this pull request May 26, 2017

getter improve again #119

Merged

add tests for install & uninstall #115

add tests for install & uninstall #115

Conversation

ghost commented May 23, 2017 • edited by ghost

waruqi commented May 23, 2017

codecov bot commented May 23, 2017 • edited

Codecov Report

ghost commented May 23, 2017

ghost commented May 23, 2017

ghost commented May 24, 2017

waruqi commented May 24, 2017

ghost commented May 24, 2017 • edited by ghost

waruqi commented May 24, 2017 • edited

ghost commented May 24, 2017 • edited by ghost

waruqi commented May 24, 2017 • edited

waruqi commented May 24, 2017

ghost commented May 24, 2017

waruqi commented May 24, 2017

ghost commented May 24, 2017

waruqi commented May 24, 2017

ghost commented May 24, 2017

waruqi commented May 24, 2017

waruqi commented May 24, 2017 • edited

ghost commented May 24, 2017

waruqi commented May 25, 2017

waruqi May 25, 2017

Choose a reason for hiding this comment

waruqi May 25, 2017

Choose a reason for hiding this comment

waruqi May 25, 2017

Choose a reason for hiding this comment

ghost commented May 25, 2017

waruqi May 25, 2017

Choose a reason for hiding this comment

ghost May 25, 2017

Choose a reason for hiding this comment

waruqi May 25, 2017 • edited

Choose a reason for hiding this comment

waruqi commented May 25, 2017

waruqi commented May 25, 2017

ghost commented May 25, 2017

ghost commented May 26, 2017

waruqi commented May 26, 2017

ghost commented May 26, 2017 • edited by ghost

waruqi commented May 26, 2017

ghost commented May 26, 2017

waruqi commented May 26, 2017

ghost commented May 26, 2017

waruqi commented May 26, 2017

ghost commented May 23, 2017 •

edited by ghost

codecov bot commented May 23, 2017 •

edited

ghost commented May 24, 2017 •

edited by ghost

waruqi commented May 24, 2017 •

edited

ghost commented May 24, 2017 •

edited by ghost

waruqi commented May 24, 2017 •

edited

waruqi commented May 24, 2017 •

edited

waruqi May 25, 2017 •

edited

ghost commented May 26, 2017 •

edited by ghost