aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt28
-rw-r--r--src/all_types.hpp1
-rw-r--r--src/analyze.cpp9
-rw-r--r--src/codegen.cpp12
-rw-r--r--src/ir.cpp5
-rw-r--r--src/link.cpp8
-rw-r--r--std/c/index.zig10
-rw-r--r--std/debug.zig2
-rw-r--r--std/index.zig15
-rw-r--r--std/io.zig8
-rw-r--r--std/mem.zig2
-rw-r--r--std/net.zig4
-rw-r--r--std/os/darwin.zig (renamed from std/darwin.zig)0
-rw-r--r--std/os/darwin_x86_64.zig (renamed from std/darwin_x86_64.zig)0
-rw-r--r--std/os/errno.zig (renamed from std/errno.zig)0
-rw-r--r--std/os/index.zig (renamed from std/os.zig)16
-rw-r--r--std/os/linux.zig (renamed from std/linux.zig)0
-rw-r--r--std/os/linux_i386.zig (renamed from std/linux_i386.zig)0
-rw-r--r--std/os/linux_x86_64.zig (renamed from std/linux_x86_64.zig)0
-rw-r--r--std/os/windows.zig (renamed from std/windows.zig)0
-rw-r--r--std/special/bootstrap.zig (renamed from std/bootstrap.zig)8
-rw-r--r--std/special/builtin.zig (renamed from std/builtin.zig)0
-rw-r--r--std/special/compiler_rt.zig (renamed from std/compiler_rt.zig)0
-rw-r--r--std/special/panic.zig (renamed from std/panic.zig)0
-rw-r--r--std/special/test_runner.zig (renamed from std/test_runner.zig)0
-rw-r--r--std/target.zig (renamed from std/build.zig)0
-rw-r--r--test/cases/import.zig2
-rw-r--r--test/cases/namespace_depends_on_compile_var/index.zig4
-rw-r--r--test/cases/pub_enum/index.zig2
-rw-r--r--test/run_tests.cpp3
30 files changed, 67 insertions, 72 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1306d732b..f891cfad0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,41 +201,41 @@ install(TARGETS zig DESTINATION bin)
install(FILES ${C_HEADERS} DESTINATION ${C_HEADERS_DEST})
-install(FILES "${CMAKE_SOURCE_DIR}/std/bootstrap.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/build.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/builtin.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/c/darwin.zig" DESTINATION "${ZIG_STD_DEST}/c")
install(FILES "${CMAKE_SOURCE_DIR}/std/c/index.zig" DESTINATION "${ZIG_STD_DEST}/c")
install(FILES "${CMAKE_SOURCE_DIR}/std/c/linux.zig" DESTINATION "${ZIG_STD_DEST}/c")
install(FILES "${CMAKE_SOURCE_DIR}/std/c/windows.zig" DESTINATION "${ZIG_STD_DEST}/c")
-install(FILES "${CMAKE_SOURCE_DIR}/std/compiler_rt.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/cstr.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/darwin.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/darwin_x86_64.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/debug.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/dwarf.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/elf.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/empty.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/endian.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/errno.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/fmt.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/hash_map.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/index.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/io.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/linux.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/linux_i386.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/linux_x86_64.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/list.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/math.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/mem.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/net.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/os.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/panic.zig" DESTINATION "${ZIG_STD_DEST}")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/darwin.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/darwin_x86_64.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/errno.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/index.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux_i386.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/linux_x86_64.zig" DESTINATION "${ZIG_STD_DEST}/os")
+install(FILES "${CMAKE_SOURCE_DIR}/std/os/windows.zig" DESTINATION "${ZIG_STD_DEST}/os")
install(FILES "${CMAKE_SOURCE_DIR}/std/rand.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/rand_test.zig" DESTINATION "${ZIG_STD_DEST}")
install(FILES "${CMAKE_SOURCE_DIR}/std/sort.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/test_runner.zig" DESTINATION "${ZIG_STD_DEST}")
-install(FILES "${CMAKE_SOURCE_DIR}/std/windows.zig" DESTINATION "${ZIG_STD_DEST}")
+install(FILES "${CMAKE_SOURCE_DIR}/std/special/bootstrap.zig" DESTINATION "${ZIG_STD_DEST}/special")
+install(FILES "${CMAKE_SOURCE_DIR}/std/special/builtin.zig" DESTINATION "${ZIG_STD_DEST}/special")
+install(FILES "${CMAKE_SOURCE_DIR}/std/special/compiler_rt.zig" DESTINATION "${ZIG_STD_DEST}/special")
+install(FILES "${CMAKE_SOURCE_DIR}/std/special/panic.zig" DESTINATION "${ZIG_STD_DEST}/special")
+install(FILES "${CMAKE_SOURCE_DIR}/std/special/test_runner.zig" DESTINATION "${ZIG_STD_DEST}/special")
+install(FILES "${CMAKE_SOURCE_DIR}/std/target.zig" DESTINATION "${ZIG_STD_DEST}")
add_executable(run_tests ${TEST_SOURCES})
target_link_libraries(run_tests)
diff --git a/src/all_types.hpp b/src/all_types.hpp
index a244e9abe0..732381b2d0 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -1362,6 +1362,7 @@ struct CodeGen {
Buf *libc_static_lib_dir;
Buf *libc_include_dir;
Buf *zig_std_dir;
+ Buf *zig_std_special_dir;
Buf *dynamic_linker;
Buf *ar_path;
Buf triple_str;
diff --git a/src/analyze.cpp b/src/analyze.cpp
index 1ba430be15..380e384644 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -2874,11 +2874,8 @@ void preview_use_decl(CodeGen *g, AstNode *node) {
ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package,
Buf *abs_full_path, Buf *src_dirname, Buf *src_basename, Buf *source_code)
{
- Buf *full_path = buf_alloc();
- os_path_join(src_dirname, src_basename, full_path);
-
if (g->verbose) {
- fprintf(stderr, "\nOriginal Source (%s):\n", buf_ptr(full_path));
+ fprintf(stderr, "\nOriginal Source (%s):\n", buf_ptr(abs_full_path));
fprintf(stderr, "----------------\n");
fprintf(stderr, "%s\n", buf_ptr(source_code));
@@ -2890,7 +2887,7 @@ ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package,
tokenize(source_code, &tokenization);
if (tokenization.err) {
- ErrorMsg *err = err_msg_create_with_line(full_path, tokenization.err_line, tokenization.err_column,
+ ErrorMsg *err = err_msg_create_with_line(abs_full_path, tokenization.err_line, tokenization.err_column,
source_code, tokenization.line_offsets, tokenization.err);
print_err_msg(err, g->err_color);
@@ -2908,7 +2905,7 @@ ImportTableEntry *add_source_file(CodeGen *g, PackageTableEntry *package,
import_entry->package = package;
import_entry->source_code = source_code;
import_entry->line_offsets = tokenization.line_offsets;
- import_entry->path = full_path;
+ import_entry->path = abs_full_path;
import_entry->root = ast_parse(source_code, tokenization.tokens, import_entry, g->err_color,
&g->next_node_index);
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 5dea908a11..4a99a543b7 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -80,6 +80,9 @@ CodeGen *codegen_create(Buf *root_source_dir, const ZigTarget *target) {
g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);
g->zig_std_dir = buf_create_from_str(ZIG_STD_DIR);
+ g->zig_std_special_dir = buf_alloc();
+ os_path_join(g->zig_std_dir, buf_sprintf("special"), g->zig_std_special_dir);
+
if (target) {
// cross compiling, so we can't rely on all the configured stuff since
@@ -4237,10 +4240,9 @@ void codegen_parseh(CodeGen *g, Buf *src_dirname, Buf *src_basename, Buf *source
}
static ImportTableEntry *add_special_code(CodeGen *g, PackageTableEntry *package, const char *basename) {
- Buf *std_dir = g->zig_std_dir;
Buf *code_basename = buf_create_from_str(basename);
Buf path_to_code_src = BUF_INIT;
- os_path_join(std_dir, code_basename, &path_to_code_src);
+ os_path_join(g->zig_std_special_dir, code_basename, &path_to_code_src);
Buf *abs_full_path = buf_alloc();
int err;
if ((err = os_path_real(&path_to_code_src, abs_full_path))) {
@@ -4251,18 +4253,18 @@ static ImportTableEntry *add_special_code(CodeGen *g, PackageTableEntry *package
zig_panic("unable to open '%s': %s", buf_ptr(&path_to_code_src), err_str(err));
}
- return add_source_file(g, package, abs_full_path, std_dir, code_basename, import_code);
+ return add_source_file(g, package, abs_full_path, g->zig_std_special_dir, code_basename, import_code);
}
static PackageTableEntry *create_bootstrap_pkg(CodeGen *g) {
- PackageTableEntry *package = new_package(buf_ptr(g->zig_std_dir), "");
+ PackageTableEntry *package = new_package(buf_ptr(g->zig_std_special_dir), "");
package->package_table.put(buf_create_from_str("std"), g->std_package);
package->package_table.put(buf_create_from_str("@root"), g->root_package);
return package;
}
static PackageTableEntry *create_panic_pkg(CodeGen *g) {
- PackageTableEntry *package = new_package(buf_ptr(g->zig_std_dir), "");
+ PackageTableEntry *package = new_package(buf_ptr(g->zig_std_special_dir), "");
package->package_table.put(buf_create_from_str("std"), g->std_package);
return package;
}
diff --git a/src/ir.cpp b/src/ir.cpp
index 14fa780a40..9619ffd8ba 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -10385,7 +10385,10 @@ static TypeTableEntry *ir_analyze_instruction_import(IrAnalyze *ira, IrInstructi
// try it as a filename
target_package = import->package;
import_target_path = import_target_str;
- search_dir = &import->package->root_src_dir;
+
+ // search relative to importing file
+ search_dir = buf_alloc();
+ os_path_dirname(import->path, search_dir);
}
Buf full_path = BUF_INIT;
diff --git a/src/link.cpp b/src/link.cpp
index d0af76a47d..faf9fd26e0 100644
--- a/src/link.cpp
+++ b/src/link.cpp
@@ -42,10 +42,9 @@ static const char *get_o_file_extension(CodeGen *g) {
static Buf *build_o(CodeGen *parent_gen, const char *oname) {
Buf *source_basename = buf_sprintf("%s.zig", oname);
- Buf *std_dir_path = parent_gen->zig_std_dir;
ZigTarget *child_target = parent_gen->is_native_target ? nullptr : &parent_gen->zig_target;
- CodeGen *child_gen = codegen_create(std_dir_path, child_target);
+ CodeGen *child_gen = codegen_create(parent_gen->zig_std_special_dir, child_target);
child_gen->link_libc = parent_gen->link_libc;
child_gen->link_libs.resize(parent_gen->link_libs.length);
@@ -70,13 +69,14 @@ static Buf *build_o(CodeGen *parent_gen, const char *oname) {
codegen_set_mios_version_min(child_gen, parent_gen->mios_version_min);
Buf *full_path = buf_alloc();
- os_path_join(std_dir_path, source_basename, full_path);
+ os_path_join(parent_gen->zig_std_special_dir, source_basename, full_path);
+
Buf source_code = BUF_INIT;
if (os_fetch_file_path(full_path, &source_code)) {
zig_panic("unable to fetch file: %s\n", buf_ptr(full_path));
}
- codegen_add_root_code(child_gen, std_dir_path, source_basename, &source_code);
+ codegen_add_root_code(child_gen, parent_gen->zig_std_special_dir, source_basename, &source_code);
const char *o_ext = get_o_file_extension(child_gen);
Buf *o_out = buf_sprintf("%s%s", oname, o_ext);
codegen_link(child_gen, buf_ptr(o_out));
diff --git a/std/c/index.zig b/std/c/index.zig
index 05ef9e4384..c8aab299a4 100644
--- a/std/c/index.zig
+++ b/std/c/index.zig
@@ -1,13 +1,13 @@
-pub use @import("errno.zig");
+pub use @import("../os/errno.zig");
pub use switch(@compileVar("os")) {
- Os.linux => @import("c/linux.zig"),
- Os.windows => @import("c/windows.zig"),
- Os.darwin, Os.macosx, Os.ios => @import("c/darwin.zig"),
+ Os.linux => @import("linux.zig"),
+ Os.windows => @import("windows.zig"),
+ Os.darwin, Os.macosx, Os.ios => @import("darwin.zig"),
else => empty_import,
};
pub extern fn abort() -> noreturn;
-const empty_import = @import("empty.zig");
+const empty_import = @import("../empty.zig");
diff --git a/std/debug.zig b/std/debug.zig
index 6a469c3c40..2fff730a93 100644
--- a/std/debug.zig
+++ b/std/debug.zig
@@ -1,6 +1,6 @@
const mem = @import("mem.zig");
const io = @import("io.zig");
-const os = @import("os.zig");
+const os = @import("os/index.zig");
const elf = @import("elf.zig");
const DW = @import("dwarf.zig");
const List = @import("list.zig").List;
diff --git a/std/index.zig b/std/index.zig
index 0a0b9557ad..626a3749f7 100644
--- a/std/index.zig
+++ b/std/index.zig
@@ -1,6 +1,7 @@
-pub const build = @import("build.zig");
+pub const c = @import("c/index.zig");
pub const cstr = @import("cstr.zig");
pub const debug = @import("debug.zig");
+pub const empty_import = @import("empty.zig");
pub const fmt = @import("fmt.zig");
pub const hash_map = @import("hash_map.zig");
pub const io = @import("io.zig");
@@ -8,15 +9,7 @@ pub const list = @import("list.zig");
pub const math = @import("math.zig");
pub const mem = @import("mem.zig");
pub const net = @import("net.zig");
-pub const os = @import("os.zig");
+pub const os = @import("os/index.zig");
pub const rand = @import("rand.zig");
pub const sort = @import("sort.zig");
-pub const linux = switch(@compileVar("os")) {
- Os.linux => @import("linux.zig"),
- else => empty_import,
-};
-pub const darwin = switch(@compileVar("os")) {
- Os.darwin => @import("darwin.zig"),
- else => empty_import,
-};
-pub const empty_import = @import("empty.zig");
+pub const target = @import("target.zig");
diff --git a/std/io.zig b/std/io.zig
index 50733c9e13..109ed4072e 100644
--- a/std/io.zig
+++ b/std/io.zig
@@ -1,14 +1,14 @@
const system = switch(@compileVar("os")) {
- Os.linux => @import("linux.zig"),
- Os.darwin => @import("darwin.zig"),
+ Os.linux => @import("os/linux.zig"),
+ Os.darwin => @import("os/darwin.zig"),
else => @compileError("Unsupported OS"),
};
-const errno = @import("errno.zig");
+const errno = @import("os/errno.zig");
const math = @import("math.zig");
const debug = @import("debug.zig");
const assert = debug.assert;
-const os = @import("os.zig");
+const os = @import("os/index.zig");
const mem = @import("mem.zig");
const Buffer0 = @import("cstr.zig").Buffer0;
const fmt = @import("fmt.zig");
diff --git a/std/mem.zig b/std/mem.zig
index c67cf11db6..f374e40cf4 100644
--- a/std/mem.zig
+++ b/std/mem.zig
@@ -1,6 +1,6 @@
const assert = @import("debug.zig").assert;
const math = @import("math.zig");
-const os = @import("os.zig");
+const os = @import("os/index.zig");
const io = @import("io.zig");
pub const Cmp = math.Cmp;
diff --git a/std/net.zig b/std/net.zig
index e1c8bf5d3f..280484c80c 100644
--- a/std/net.zig
+++ b/std/net.zig
@@ -1,5 +1,5 @@
-const linux = @import("linux.zig");
-const errno = @import("errno.zig");
+const linux = @import("os/linux.zig");
+const errno = @import("os/errno.zig");
const assert = @import("debug.zig").assert;
const endian = @import("endian.zig");
diff --git a/std/darwin.zig b/std/os/darwin.zig
index 647fee40e2..647fee40e2 100644
--- a/std/darwin.zig
+++ b/std/os/darwin.zig
diff --git a/std/darwin_x86_64.zig b/std/os/darwin_x86_64.zig
index ea6cc5a37a..ea6cc5a37a 100644
--- a/std/darwin_x86_64.zig
+++ b/std/os/darwin_x86_64.zig
diff --git a/std/errno.zig b/std/os/errno.zig
index 6f50b50225..6f50b50225 100644
--- a/std/errno.zig
+++ b/std/os/errno.zig
diff --git a/std/os.zig b/std/os/index.zig
index 68a52f5ff1..63e74924fa 100644
--- a/std/os.zig
+++ b/std/os/index.zig
@@ -1,12 +1,16 @@
-const posix = switch(@compileVar("os")) {
- Os.linux => @import("linux.zig"),
- Os.darwin, Os.macosx, Os.ios => @import("darwin.zig"),
+pub const windows = @import("windows.zig");
+pub const darwin = @import("darwin.zig");
+pub const linux = @import("linux.zig");
+pub const posix = switch(@compileVar("os")) {
+ Os.linux => linux,
+ Os.darwin, Os.macosx, Os.ios => darwin,
+ Os.windows => windows,
else => @compileError("Unsupported OS"),
};
-const windows = @import("windows.zig");
+
const errno = @import("errno.zig");
-const linking_libc = @import("build.zig").linking_libc;
-const c = @import("c/index.zig");
+const linking_libc = @import("../target.zig").linking_libc;
+const c = @import("../c/index.zig");
error Unexpected;
diff --git a/std/linux.zig b/std/os/linux.zig
index be86136dee..be86136dee 100644
--- a/std/linux.zig
+++ b/std/os/linux.zig
diff --git a/std/linux_i386.zig b/std/os/linux_i386.zig
index 218043307e..218043307e 100644
--- a/std/linux_i386.zig
+++ b/std/os/linux_i386.zig
diff --git a/std/linux_x86_64.zig b/std/os/linux_x86_64.zig
index 0f8f163ce2..0f8f163ce2 100644
--- a/std/linux_x86_64.zig
+++ b/std/os/linux_x86_64.zig
diff --git a/std/windows.zig b/std/os/windows.zig
index f713f61abe..f713f61abe 100644
--- a/std/windows.zig
+++ b/std/os/windows.zig
diff --git a/std/bootstrap.zig b/std/special/bootstrap.zig
index e4e844b312..c9a36a0703 100644
--- a/std/bootstrap.zig
+++ b/std/special/bootstrap.zig
@@ -4,14 +4,10 @@
const root = @import("@root");
const std = @import("std");
-const want_main_symbol = std.build.linking_libc;
+const want_main_symbol = std.target.linking_libc;
const want_start_symbol = !want_main_symbol;
-const exit = switch(@compileVar("os")) {
- Os.linux => std.linux.exit,
- Os.darwin => std.darwin.exit,
- else => @compileError("Unsupported OS"),
-};
+const exit = std.os.posix.exit;
var argc: usize = undefined;
var argv: &&u8 = undefined;
diff --git a/std/builtin.zig b/std/special/builtin.zig
index 136cbd9da4..136cbd9da4 100644
--- a/std/builtin.zig
+++ b/std/special/builtin.zig
diff --git a/std/compiler_rt.zig b/std/special/compiler_rt.zig
index f6e4c021d1..f6e4c021d1 100644
--- a/std/compiler_rt.zig
+++ b/std/special/compiler_rt.zig
diff --git a/std/panic.zig b/std/special/panic.zig
index 9b58a4d9c8..9b58a4d9c8 100644
--- a/std/panic.zig
+++ b/std/special/panic.zig
diff --git a/std/test_runner.zig b/std/special/test_runner.zig
index f494801671..f494801671 100644
--- a/std/test_runner.zig
+++ b/std/special/test_runner.zig
diff --git a/std/build.zig b/std/target.zig
index f6b6f7177d..f6b6f7177d 100644
--- a/std/build.zig
+++ b/std/target.zig
diff --git a/test/cases/import.zig b/test/cases/import.zig
index b5bbbc2114..d931d836b8 100644
--- a/test/cases/import.zig
+++ b/test/cases/import.zig
@@ -1,5 +1,5 @@
const assert = @import("std").debug.assert;
-const a_namespace = @import("cases/import/a_namespace.zig");
+const a_namespace = @import("import/a_namespace.zig");
test "callFnViaNamespaceLookup" {
assert(a_namespace.foo() == 1234);
diff --git a/test/cases/namespace_depends_on_compile_var/index.zig b/test/cases/namespace_depends_on_compile_var/index.zig
index 8c57d21946..aa0748e078 100644
--- a/test/cases/namespace_depends_on_compile_var/index.zig
+++ b/test/cases/namespace_depends_on_compile_var/index.zig
@@ -8,6 +8,6 @@ test "namespaceDependsOnCompileVar" {
}
}
const some_namespace = switch(@compileVar("os")) {
- Os.linux => @import("cases/namespace_depends_on_compile_var/a.zig"),
- else => @import("cases/namespace_depends_on_compile_var/b.zig"),
+ Os.linux => @import("a.zig"),
+ else => @import("b.zig"),
};
diff --git a/test/cases/pub_enum/index.zig b/test/cases/pub_enum/index.zig
index 4935f210ba..a5600f6de1 100644
--- a/test/cases/pub_enum/index.zig
+++ b/test/cases/pub_enum/index.zig
@@ -1,4 +1,4 @@
-const other = @import("cases/pub_enum/other.zig");
+const other = @import("other.zig");
const assert = @import("std").debug.assert;
test "pubEnum" {
diff --git a/test/run_tests.cpp b/test/run_tests.cpp
index 8256881fea..8f5acab6d7 100644
--- a/test/run_tests.cpp
+++ b/test/run_tests.cpp
@@ -1254,8 +1254,7 @@ export fn entry() -> usize { @sizeOf(@typeOf(seventh_fib_number)) }
const resource = @embedFile("bogus.txt");
export fn entry() -> usize { @sizeOf(@typeOf(resource)) }
- )SOURCE", 1, ".tmp_source.zig:2:29: error: unable to find './bogus.txt'");
-
+ )SOURCE", 2, ".tmp_source.zig:2:29: error: unable to find '", "/bogus.txt'");
add_compile_fail_case("non-const expression in struct literal outside function", R"SOURCE(
const Foo = struct {
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-27 22:03:11 +0000