Skip to content

Commit e26cec5

Browse files
khvzakkhvzak
committed
Drop 'feature(link_args)' (removed from nightly). Don't run tests for LuaJIT 2.0.5
1 parent 0bd36b4 commit e26cec5

File tree

16 files changed

+0
-200
lines changed

16 files changed

+0
-200
lines changed

‎.github/workflows/main.yml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ jobs:
123123
target: ${{ matrix.target }}
124124
override: true
125125
- name: Run ${{ matrix.lua }} tests
126-
if: ${{ matrix.os != 'macos-latest' || matrix.lua != 'luajit' }}
127126
run: |
128127
cargo test --release --features "${{ matrix.lua }} vendored"
129128
cargo test --release --features "${{ matrix.lua }} vendored async send serialize"
@@ -135,27 +134,6 @@ jobs:
135134
TRYBUILD=overwrite cargo test --release --features "${{ matrix.lua }} vendored async send serialize" -- --ignored
136135
shell: bash
137136

138-
test_luajit_macos:
139-
name: Test LuaJIT on macOS
140-
runs-on: macos-latest
141-
needs: build
142-
steps:
143-
- uses: actions/checkout@v2
144-
- uses: actions-rs/toolchain@v1
145-
with:
146-
toolchain: nightly
147-
target: x86_64-apple-darwin
148-
override: true
149-
- name: Run LuaJIT 2.0.5 tests
150-
run: |
151-
brew install luajit
152-
cargo test --tests --release --features "luajit async send serialize" -- --test-threads=1
153-
shell: bash
154-
- name: Run LuaJIT vendored tests
155-
run: |
156-
cargo test --release --features "luajit vendored async send serialize"
157-
shell: bash
158-
159137
test_modules:
160138
name: Test modules
161139
runs-on: ${{ matrix.os }}

‎benches/benchmark.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
142
use std::time::Duration;
153
use tokio::runtime::Runtime;

‎tests/async.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
#![cfg(feature = "async")]
2-
#![cfg_attr(
3-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
4-
feature(link_args)
5-
)]
6-
7-
#[cfg_attr(
8-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
9-
link_args = "-pagezero_size 10000 -image_base 100000000",
10-
allow(unused_attributes)
11-
)]
12-
extern "system" {}
132

143
use std::cell::Cell;
154
use std::rc::Rc;

‎tests/byte_string.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use bstr::{BStr, BString};
142
use mlua::{Lua, Result};
153

‎tests/function.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use mlua::{Function, Lua, Result, String};
142

153
#[test]

‎tests/hooks.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::cell::RefCell;
142
use std::ops::Deref;
153
use std::str;

‎tests/memory.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::sync::Arc;
142

153
use mlua::{Lua, Result, UserData};

‎tests/scope.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::cell::Cell;
142
use std::rc::Rc;
153

‎tests/serde.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
#![cfg(feature = "serialize")]
2-
#![cfg_attr(
3-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
4-
feature(link_args)
5-
)]
6-
7-
#[cfg_attr(
8-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
9-
link_args = "-pagezero_size 10000 -image_base 100000000",
10-
allow(unused_attributes)
11-
)]
12-
extern "system" {}
132

143
use mlua::{Error, Lua, LuaSerdeExt, Result as LuaResult, UserData, Value};
154
use serde::{Deserialize, Serialize};

‎tests/string.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::borrow::Cow;
142

153
use mlua::{Lua, Result, String};

‎tests/table.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use mlua::{Lua, Nil, Result, Table, TableExt, Value};
142

153
#[test]

‎tests/tests.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::iter::FromIterator;
142
use std::panic::{catch_unwind, AssertUnwindSafe};
153
use std::sync::Arc;

‎tests/thread.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::panic::catch_unwind;
142

153
use mlua::{Error, Function, Lua, Result, Thread, ThreadStatus};

‎tests/types.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::os::raw::c_void;
142

153
use mlua::{Function, LightUserData, Lua, Result};

‎tests/userdata.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use std::sync::Arc;
142

153
#[cfg(feature = "lua54")]

‎tests/value.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
#![cfg_attr(
2-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
3-
feature(link_args)
4-
)]
5-
6-
#[cfg_attr(
7-
all(feature = "luajit", target_os = "macos", target_arch = "x86_64"),
8-
link_args = "-pagezero_size 10000 -image_base 100000000",
9-
allow(unused_attributes)
10-
)]
11-
extern "system" {}
12-
131
use mlua::{Lua, Result, Value};
142

153
#[test]

0 commit comments

Comments
 (0)