Overview
Comment: | Added check for [include ...#{getenv USER}] which apparently wasn't working |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
ebcffccebc61129e1a4929bc02118e74 |
User & Date: | matt on 2013-03-07 00:09:26 |
Other Links: | branch diff | manifest | tags |
Context
2013-03-07
| ||
12:33 | Removed dependency on realpath in Makefile, added support for deprecated itempatt check-in: b7455e07b8 user: mrwellan tags: dev | |
00:09 | Added check for [include ...#{getenv USER}] which apparently wasn't working check-in: ebcffccebc user: matt tags: dev | |
2013-03-06
| ||
15:38 | Merged network-only-transport and bumped version to v1.53 check-in: 962322e080 user: mrwellan tags: trunk, v1.53 | |
Changes
Modified db.scm from [5efd80d4e8] to [97544c7725].
︙ | ︙ | |||
965 966 967 968 969 970 971 972 973 974 975 976 977 978 | (define (cdb:test-set-log! serverdat test-id logf) (if (string? logf)(cdb:client-call serverdat 'test-set-log #f *default-numtries* logf test-id))) ;;====================================================================== ;; Misc. test related queries ;;====================================================================== (define (db:test-get-paths-matching db keynames target fnamepatt #!key (res '())) (let ((paths-from-db (cdb:remote-run db:test-get-paths-matching-keynames-target db keynames target res))) (if fnamepatt (apply append (map (lambda (p) (glob (conc p "/" fnamepatt))) paths-from-db)) | > | 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 | (define (cdb:test-set-log! serverdat test-id logf) (if (string? logf)(cdb:client-call serverdat 'test-set-log #f *default-numtries* logf test-id))) ;;====================================================================== ;; Misc. test related queries ;;====================================================================== ;; MUST BE CALLED local! (define (db:test-get-paths-matching db keynames target fnamepatt #!key (res '())) (let ((paths-from-db (cdb:remote-run db:test-get-paths-matching-keynames-target db keynames target res))) (if fnamepatt (apply append (map (lambda (p) (glob (conc p "/" fnamepatt))) paths-from-db)) |
︙ | ︙ |
Modified launch.scm from [6c999e60ff] to [ff2bbcc88b].
︙ | ︙ | |||
80 81 82 83 84 85 86 87 88 89 90 91 92 93 | runscript ;; use unadultered if contains slashes (let ((fulln (conc testpath "/" runscript))) (if (and (file-exists? fulln) (file-execute-access? fulln)) fulln runscript))))) ;; assume it is on the path (rollup-status 0)) (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name)) ;; Setup the *runremote* global var (if *runremote* (debug:print 2 "ERROR: I'm not expecting *runremote* to be set at this time")) ;; (set! *runremote* runremote) (set! *transport-type* (string->symbol transport)) (set! keys (cdb:remote-run db:get-keys #f)) (set! keyvals (if run-id (cdb:remote-run db:get-key-vals #f run-id) #f)) | > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | runscript ;; use unadultered if contains slashes (let ((fulln (conc testpath "/" runscript))) (if (and (file-exists? fulln) (file-execute-access? fulln)) fulln runscript))))) ;; assume it is on the path (rollup-status 0)) (change-directory top-path) (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name)) ;; Setup the *runremote* global var (if *runremote* (debug:print 2 "ERROR: I'm not expecting *runremote* to be set at this time")) ;; (set! *runremote* runremote) (set! *transport-type* (string->symbol transport)) (set! keys (cdb:remote-run db:get-keys #f)) (set! keyvals (if run-id (cdb:remote-run db:get-key-vals #f run-id) #f)) |
︙ | ︙ | |||
107 108 109 110 111 112 113 | (setenv "MT_TEST_RUN_DIR" work-area) (setenv "MT_TEST_NAME" test-name) (setenv "MT_ITEM_INFO" (conc itemdat)) (setenv "MT_RUNNAME" runname) (setenv "MT_MEGATEST" megatest) (setenv "MT_TARGET" target) (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path))) | | | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 | (setenv "MT_TEST_RUN_DIR" work-area) (setenv "MT_TEST_NAME" test-name) (setenv "MT_ITEM_INFO" (conc itemdat)) (setenv "MT_RUNNAME" runname) (setenv "MT_MEGATEST" megatest) (setenv "MT_TARGET" target) (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path))) ;; (change-directory top-path) (if (not (setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") ;; (sqlite3:finalize! db) ;; (sqlite3:finalize! tdb) (exit 1))) ;; Can setup as client for server mode now |
︙ | ︙ |
Modified tests/fullrun/runconfigs.config from [81808b3f0a] to [86fe11ce8c].
1 2 3 4 5 6 7 8 | [include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config] WACKYVAR0 #{get ubuntu/nfs/none CURRENT} WACKYVAR1 #{scheme (args:get-arg "-target")} [default/ubuntu/nfs] WACKYVAR2 #{runconfigs-get CURRENT} | > > > | 1 2 3 4 5 6 7 8 9 10 11 | [include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config] # #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/config/$USER.config} [include ./config/#{getenv USER}.config] WACKYVAR0 #{get ubuntu/nfs/none CURRENT} WACKYVAR1 #{scheme (args:get-arg "-target")} [default/ubuntu/nfs] WACKYVAR2 #{runconfigs-get CURRENT} |
︙ | ︙ |
Modified tests/fullrun/tests/test_mt_vars/testconfig from [ebbf948a4d] to [a0c61adcaf].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | bogousnotset bogousnotset.sh # ALT_VAR should NOT be set altvarnotset altvarnotset.sh # EMPTY_VAR should be an empty string empty_var empty_var.sh # test-path and test-file test-path test-path-file.sh [requirements] waiton runfirst priority 0 | > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | bogousnotset bogousnotset.sh # ALT_VAR should NOT be set altvarnotset altvarnotset.sh # EMPTY_VAR should be an empty string empty_var empty_var.sh # VACKYVAR should be set to a path vackyvar vackyvar.sh # test-path and test-file test-path test-path-file.sh [requirements] waiton runfirst priority 0 |
︙ | ︙ |
Added tests/fullrun/tests/test_mt_vars/vackyvar.sh version [48a1b07c71].
> > > | 1 2 3 | #!/usr/bin/env bash grep VACKYVAR megatest.sh | grep fullrun |